From f22c4b9230808fed4fec80c435eccb4c833349a0 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 21 十月 2022 18:36:38 +0800
Subject: [PATCH] 2022.10.21 1.环境守法小程序后台功能首发版本完成
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 f05ae65..76a8350 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>()
@@ -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(
@@ -387,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 {
@@ -419,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