From 39e208b6b0482a25c77e53590087c02d9d937563 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 20 七月 2022 09:04:48 +0800
Subject: [PATCH] 1. 巡查汇总报告功能编写完成

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt |   47 +++++++++++++++++++++++++++--------------------
 1 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt
index 647b09e..1025cf9 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt
@@ -9,6 +9,9 @@
 import cn.flightfeather.supervision.common.utils.*
 import cn.flightfeather.supervision.domain.ds1.entity.*
 import cn.flightfeather.supervision.domain.ds1.mapper.*
+import cn.flightfeather.supervision.domain.ds2.mapper.LedgerRecordMapper
+import cn.flightfeather.supervision.domain.ds2.mapper.LedgerSubTypeMapper
+import cn.flightfeather.supervision.domain.ds2.mapper.UserMapMapper
 import cn.flightfeather.supervision.lightshare.service.SearchService
 import cn.flightfeather.supervision.lightshare.vo.*
 import com.github.pagehelper.PageHelper
@@ -28,25 +31,28 @@
  */
 @Service
 class SearchServiceImpl(
-    val userinfoMapper: UserinfoMapper,
-    val subtaskMapper: SubtaskMapper,
-    val scenseMapper: ScenseMapper,
-    val sceneConstructionSiteMapper: SceneConstructionSiteMapper,
-    val sceneMixingPlantMapper: SceneMixingPlantMapper,
-    val sceneStorageYardMapper: SceneStorageYardMapper,
-    val sceneWharfMapper: SceneWharfMapper,
-    val problemlistMapper: ProblemlistMapper,
-    val problemtypeMapper: ProblemtypeMapper,
-    val townMapper: TownMapper,
-    val mediafileMapper: MediafileMapper,
-    val scoreMapper: ScoreMapper,
-    val inspectionMapper: InspectionMapper,
-    val taskMapper: TaskMapper,
-    val monitorobjectversionMapper: MonitorobjectversionMapper,
-    val evaluationruleMapper: EvaluationruleMapper,
-    val evaluationsubruleMapper: EvaluationsubruleMapper2,
-    val evaluationMapper: EvaluationMapper,
-    val itemevaluationMapper: ItemevaluationMapper
+        val userinfoMapper: UserinfoMapper,
+        val subtaskMapper: SubtaskMapper,
+        val scenseMapper: ScenseMapper,
+        val sceneConstructionSiteMapper: SceneConstructionSiteMapper,
+        val sceneMixingPlantMapper: SceneMixingPlantMapper,
+        val sceneStorageYardMapper: SceneStorageYardMapper,
+        val sceneWharfMapper: SceneWharfMapper,
+        val problemlistMapper: ProblemlistMapper,
+        val problemtypeMapper: ProblemtypeMapper,
+        val townMapper: TownMapper,
+        val mediafileMapper: MediafileMapper,
+        val scoreMapper: ScoreMapper,
+        val inspectionMapper: InspectionMapper,
+        val taskMapper: TaskMapper,
+        val monitorobjectversionMapper: MonitorobjectversionMapper,
+        val evaluationruleMapper: EvaluationruleMapper,
+        val evaluationsubruleMapper: EvaluationsubruleMapper2,
+        val evaluationMapper: EvaluationMapper,
+        val itemevaluationMapper: ItemevaluationMapper,
+        val ledgerSubTypeMapper: LedgerSubTypeMapper,
+        val ledgerRecordMapper: LedgerRecordMapper,
+        val userMapMapper: UserMapMapper,
 ) : SearchService {
 
     private val dateUtil = DateUtil()
@@ -63,7 +69,8 @@
             sceneStorageYardMapper,
             sceneWharfMapper,
             taskMapper,
-            evaluationruleMapper, evaluationsubruleMapper, evaluationMapper, itemevaluationMapper
+            evaluationruleMapper, evaluationsubruleMapper, evaluationMapper, itemevaluationMapper,
+                ledgerSubTypeMapper, ledgerRecordMapper, userinfoMapper, userMapMapper, townMapper
         )
         val dataSource = DataSource(config, dbMapper)
         val t = when (mode) {

--
Gitblit v1.9.3