From 1a45c6fe9ea814e432cf90c0169be9b7d991a266 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 10 十二月 2024 13:51:00 +0800
Subject: [PATCH] 1. 新增 BaseExcel.kt 和 BaseTemplate.kt 的 toObject输出到对象方法 2. 新增 BaseTemplate 是否执行的状态属性 3. 在cn.flightfeather.supervision.business.report.bean包下新增 BaseTemplateResult.kt 结果对象抽象类 以及 ProAnalysisSummaryResult.kt 和 ProDetailSummaryResult.kt 对应实现：问题整改动态跟踪和分街镇问题整改分析的中间结果对象 注：除了问题整改动态跟踪和分街镇问题整改分析其他的汇总表对象中都没有对应中间结果对象，因此这里还有报错信息
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt
index e3e3a5d..c872fee 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.supervision.lightshare.service
-import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
+import cn.flightfeather.supervision.domain.ds1.entity.*
import cn.flightfeather.supervision.lightshare.vo.*
import org.springframework.web.multipart.MultipartFile
@@ -17,17 +17,17 @@
fun setDeleteStatus(id: String): BaseResponse<Int>
- fun findBySubtaskId(subTaskID: String): List<ProblemlistVo>
+ fun findBySubtaskId(subTaskID: String): List<ProblemListVo>
- fun findByInspectionID(inspectionID: String): List<ProblemlistVo>
+ fun findByInspectionID(inspectionID: String): List<ProblemListVo>
- fun addProblem(problemlistVo: ProblemlistVo)
+ fun addProblem(problemlistVo: ProblemListVo)
- fun findByID(id: String): ProblemlistVo
+ fun findByID(id: String): ProblemListVo
- fun getByArea(areaVo: AreaVo):List<ProblemlistVo>
+ fun getByArea(areaVo: AreaVo):List<ProblemListVo>
- fun getByTopTask(tguid: String): List<ProblemlistVo>
+ fun getByTopTask(tguid: String): List<ProblemListVo>
fun getStatisticalResult(areaVo: AreaVo):List<StatisticsVo>
@@ -35,11 +35,27 @@
fun getChargeResult(areaVo: AreaVo): ChargeInfoVo
- fun getProblemByScene(sceneId: String, date: String):List<ProblemlistVo>
+ fun getProblemByScene(sceneId: String, date: String):List<ProblemListVo>
fun findMonthProblemById(taskId:String, sceneId:Int?):List<MonthProblemVo>
fun check(pId: String, action: Byte, remark: String, userId: String, userName: String): BaseResponse<String>
fun newProblem(problem: String, files: Array<MultipartFile>): BaseResponse<String>
+
+ fun updateProblem(problem: ProblemListVo, deleteImg: List<String>, files: Array<MultipartFile>): String
+
+ fun changeProblem(problemId: String, files: Array<MultipartFile>): BaseResponse<String>
+
+ /**
+ * 鏇存柊鏁存敼
+ */
+ fun updateChange(problemId: String, deleteImg: List<String>, files: Array<MultipartFile>): String
+
+ fun getBySubTask(stGuid: String, all:Boolean?): List<ProblemListVo>
+
+ fun getSceneByProType(areaVo: AreaVo, pType:String):List<Subtask?>
+
+ fun getSceneProSummary(areaVo: AreaVo, sortBy: String, page: Int, per_page: Int): Pair<DataHead?,
+ List<SceneProblemSummary>?>
}
\ No newline at end of file
--
Gitblit v1.9.3