From 23bd719cebe5feeff4e48fde925b0b39755eea93 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 15 十一月 2022 10:59:50 +0800
Subject: [PATCH] 2022.11.15
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt
index 5aa39e2..c9521ac 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt
@@ -60,6 +60,7 @@
if (sceneType != SceneType.NoType.value) {
createCriteria().andEqualTo("lScenetype", sceneType)
}
+ orderBy("lTypeid")
})
val records = getLedgerRecords(userId, null, sceneType, time)
val resultList = mutableListOf<LedgerSubTypeVo>()
@@ -106,8 +107,8 @@
return result
}
- val startDate = DateUtil().StringToDate(startTime)
- val endDate = DateUtil().StringToDate(endTime)
+ val startDate = DateUtil.StringToDate(startTime)
+ val endDate = DateUtil.StringToDate(endTime)
val cal = Calendar.getInstance().apply { time = startDate }
val year = cal.get(Calendar.YEAR)
val month = cal.get(Calendar.MONTH) + 1
@@ -170,8 +171,19 @@
}
- override fun getLedgerDetail2(userId: String, ledgerSubTypeId: Int?, sceneType: Int, time: String): List<LedgerVo> {
- val records = getLedgerRecords(userId, ledgerSubTypeId, sceneType, time)
+ override fun getLedgerDetail2(userId: String, ledgerSubTypeId: Int?, sceneType: Int, time: String?): List<LedgerVo> {
+ val records = if (time != null) {
+ getLedgerRecords(userId, ledgerSubTypeId, sceneType, time)
+ } else {
+ // FIXME: 2022/10/13 鏆傛椂鍙敮鎸乴edgerSubTypeId涓嶄负null鐨勬儏鍐�
+ if (ledgerSubTypeId == null) return emptyList()
+ PageHelper.startPage<LedgerRecord>(1, 1)
+ ledgerRecordMapper.selectByExample(Example(LedgerRecord::class.java).apply {
+ createCriteria().andEqualTo("lrSubmitid", userId)
+ .andEqualTo("lsSubtypeid", ledgerSubTypeId)
+ orderBy("lrSubmitdate").desc()
+ })
+ }
val result = ArrayList<LedgerVo>()
records.forEach {
val media = ledgerMediaFileMapper.selectByExample(
@@ -215,41 +227,22 @@
val ledgerVos = mapper.readValue<List<LedgerVo>>(ledgerVoList, object :TypeReference<List<LedgerVo>>(){})
ledgerVos.forEach {
+ it.id = it.id ?: UUIDGenerator.generate16ShortUUID()
+ it.fileType = it.fileType ?: 1
+
val userInfo = userinfoMapper.selectByPrimaryKey(userId)
+ userInfo.extension2?.toInt()?.let {s-> it.sceneType = s }
+
val today = Calendar.getInstance().apply { time = Date() }
.get(Calendar.DAY_OF_MONTH)
- val cal = Calendar.getInstance().apply { time = it.updateDate }
+ val cal = Calendar.getInstance().apply { time = it.updateDate ?: Date() }
val updateYear = cal.get(Calendar.YEAR)
val updateMonth = cal.get(Calendar.MONTH) + 1
val updateDay = cal.get(Calendar.DAY_OF_MONTH)
- //鐢熸垚鍙拌处鏇存柊璁板綍
- val ledgerRecord = LedgerRecord().apply {
- lrGuid = it.id
- lsSubtypeid = it.ledgerSubTypeId
- lsSubtypename = it.ledgerName
- lrYear = updateYear
- lrMonth = updateMonth.toByte()
- lrDay = updateDay.toByte()
- lrEasubmitkind = it.fileType?.toByte() ?: 1
- lrSubmitid = userId
- lrSubmitname = userInfo?.acountname ?: ""
- lrIssubmitontime = today <= 10
- lrSubmitdate = Date()
- lrUpdatetype = it.updateType
- lrExtension1 = it.sceneType.toString()
- }
-
- //妫�鏌ユ暟鎹簱鏄惁宸叉湁璁板綍锛岄�夋嫨鎻掑叆鎴栨洿鏂�
- val tmp = ledgerRecordMapper.selectByPrimaryKey(ledgerRecord.lrGuid)
- if (tmp == null || tmp.lrGuid == null) {
- ledgerRecordMapper.insert(ledgerRecord)
- } else {
- ledgerRecordMapper.updateByPrimaryKey(ledgerRecord)
- }
//瀵规瘡寮犲浘鐗囩敓鎴愮浉搴旂殑璺緞骞朵繚瀛�
var picPath = ""
- val time = DateUtil().DateToString(Date(), DateUtil.DateStyle.YYYY_MM)
+ val time = DateUtil.DateToString(Date(), DateUtil.DateStyle.YYYY_MM)
files.forEach {file->
val fileName = file.originalFilename
//TODO 姝ゅ鐨勬枃浠惰矾寰勯渶瑕佷慨鏀逛负鍔ㄦ�侀厤缃�
@@ -262,7 +255,7 @@
}
try {
//璋冪敤鏂囦欢淇濆瓨鏂规硶
- FileUtil().uploadFile(file.bytes, basePath + path, fileName!!)
+ FileUtil.uploadFile(file.bytes, basePath + path, fileName!!)
} catch (e: Exception) {
e.printStackTrace()
}
@@ -292,6 +285,31 @@
//鎻掑叆鏂扮殑澶氬獟浣撴枃浠惰褰曟暟鎹�
ledgerMediaFileMapper.insert(ledgerMedia)
+
+ //鐢熸垚鍙拌处鏇存柊璁板綍
+ val ledgerRecord = LedgerRecord().apply {
+ lrGuid = it.id
+ lsSubtypeid = it.ledgerSubTypeId
+ lsSubtypename = it.ledgerName
+ lrYear = updateYear
+ lrMonth = updateMonth.toByte()
+ lrDay = updateDay.toByte()
+ lrEasubmitkind = it.fileType?.toByte() ?: 1
+ lrSubmitid = userId
+ lrSubmitname = userInfo?.acountname ?: ""
+ lrIssubmitontime = today <= 10
+ lrSubmitdate = Date()
+ lrUpdatetype = it.updateType
+ lrExtension1 = it.sceneType.toString()
+ }
+
+ //妫�鏌ユ暟鎹簱鏄惁宸叉湁璁板綍锛岄�夋嫨鎻掑叆鎴栨洿鏂�
+ val tmp = ledgerRecordMapper.selectByPrimaryKey(ledgerRecord.lrGuid)
+ if (tmp == null || tmp.lrGuid == null) {
+ ledgerRecordMapper.insert(ledgerRecord)
+ } else {
+ ledgerRecordMapper.updateByPrimaryKey(ledgerRecord)
+ }
return true
}
@@ -335,7 +353,7 @@
return emptyList()
}
- private fun getLedgerRecords(userId: String, ledgerSubTypeId: Int?, sceneType: Int, time: String): List<LedgerRecord> {
+ override fun getLedgerRecords(userId: String, ledgerSubTypeId: Int?, sceneType: Int, time: String): List<LedgerRecord> {
val ledgerSubTypes = ledgerSubTypeMapper.selectByExample(Example(LedgerSubType::class.java).apply {
if (ledgerSubTypeId != null) {
createCriteria().andEqualTo("lsSubtypeid", ledgerSubTypeId)
@@ -343,7 +361,7 @@
createCriteria().andEqualTo("lScenetype", sceneType)
}
})
- val c = Calendar.getInstance().apply { this.time = DateUtil().StringToDate(time) }
+ val c = Calendar.getInstance().apply { this.time = DateUtil.StringToDate(time) }
val year = c.get(Calendar.YEAR)
val month = c.get(Calendar.MONTH) + 1
val map = mutableMapOf<Int, MutableList<Int>>()
@@ -381,6 +399,7 @@
override fun copyLedger(userId: String, time: String, copyLedgerList: List<CopyLedgerVo>): BaseResponse<String> {
val year = time.split("-")[0]
val month = time.split("-")[1]
+ val date = DateUtil.StringToDate(time, DateUtil.DateStyle.YYYY_MM)
copyLedgerList.forEach {
//鍘婚噸鍒ゆ柇
val r = ledgerRecordMapper.selectByExample(Example(LedgerRecord::class.java).apply {
@@ -413,7 +432,7 @@
lr.lrYear = year.toInt()
lr.lrMonth = month.toByte()
lr.lrIssubmitontime = true
- lr.lrSubmitdate = Date()
+ lr.lrSubmitdate = date
lr.lrExtension2 = "copy"//琛ㄦ槑鏄鍒剁殑鍙拌处
ledgerRecordMapper.insert(lr)
--
Gitblit v1.9.3