From 2302c9f0336f7ae4acae0583412ddc396645a0ed Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 22 十二月 2025 17:22:31 +0800
Subject: [PATCH] 2025.12.22 巡查任务统计相关功能修改
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 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 a3731a9..f61a1bd 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt
@@ -1,9 +1,6 @@
package cn.flightfeather.supervision.lightshare.service
-import cn.flightfeather.supervision.domain.ds1.entity.Inspection
-import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
-import cn.flightfeather.supervision.domain.ds1.entity.Scense
-import cn.flightfeather.supervision.domain.ds1.entity.Subtask
+import cn.flightfeather.supervision.domain.ds1.entity.*
import cn.flightfeather.supervision.lightshare.vo.*
import org.springframework.web.multipart.MultipartFile
@@ -18,7 +15,7 @@
fun delete(id: String): Int
- fun setDeleteStatus(id: String): BaseResponse<Int>
+ fun setDeleteStatus(id: String): Int
fun findBySubtaskId(subTaskID: String): List<ProblemListVo>
@@ -40,28 +37,26 @@
fun getProblemByScene(sceneId: String, date: String):List<ProblemListVo>
+ fun getBySceneMonth(sceneId: String, year: Int?, month: Int?):Pair<List<SubtaskVo>, 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 check(pId: String, action: Byte, remark: String, userId: String, userName: String): String
- fun newProblem(problem: String, files: Array<MultipartFile>): BaseResponse<String>
+ fun newProblem(problem: String, files: Array<MultipartFile>): String
fun updateProblem(problem: ProblemListVo, deleteImg: List<String>, files: Array<MultipartFile>): String
- /**
- * 淇濆瓨闂鍥剧墖
- */
- fun saveProFile(
- problemlist: Problemlist, inspection: Inspection,
- scene: Scense, files: Array<MultipartFile>,
- ): Int
+ fun changeProblem(problemId: 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>?>
+ fun getSceneProSummary(areaVo: AreaVo, page: Int, per_page: Int): Pair<DataHead?, List<SceneProblemSummary>?>
}
\ No newline at end of file
--
Gitblit v1.9.3