From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 31 十二月 2024 10:13:35 +0800 Subject: [PATCH] 1. 环信码生成时,如果在线场景当期没有评估(未巡查)结果,则延用历史最新一次的结果; 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt | 29 +++++++++++++++++++++-------- 1 files changed, 21 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 400cb81..dc869c1 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,7 +35,7 @@ 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> @@ -43,5 +43,18 @@ 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, page: Int, per_page: Int): Pair<DataHead?, List<SceneProblemSummary>?> } \ No newline at end of file -- Gitblit v1.9.3