From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 17 十二月 2024 11:41:00 +0800 Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ProblemlistService.kt | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 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 5aff8f1..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,7 +1,6 @@ package cn.flightfeather.supervision.lightshare.service -import cn.flightfeather.supervision.domain.ds1.entity.Problemlist -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,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> @@ -36,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> @@ -44,9 +43,16 @@ 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 getBySubTask(stGuid: String, all:Boolean?): List<ProblemlistVo> + /** + * 鏇存柊鏁存敼 + */ + 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?> -- Gitblit v1.9.3