Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseEngineeringController.java

@@ -81,7 +81,7 @@ public class DfSuperviseEngineeringController {
      */
     @PostMapping("/total")
     @ApiOperation("监督检查任务统计分析")
-    public Response<DfSuperviseProblemTotalDto> countTotal(@RequestBody SearchParam<DfSuperviseProblemListDto> sp) {
+    public Response<DfSuperviseProblemTotalDto> countTotal(@RequestBody DfSuperviseProblemListDto dto) {
-        return Response.ok(superviseEngineeringService.countTotal(sp));
+        return Response.ok(superviseEngineeringService.countTotal(dto));
     }
 }

shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java

@@ -22,19 +22,19 @@ public class DfDangerousTaskItemRel extends SyBaseEntity {
     /**
      * 监督检查任务ID
      */
-    @ApiModelProperty(value = "监督检查任务ID")
+    @ApiModelProperty(value = "任务ID")
     private String taskId;
 
     /**
-     * 监督检查办法项目ID
+     * 项目ID
      */
-    @ApiModelProperty("监督检查办法项目ID")
+    @ApiModelProperty("项目ID")
     private String projectId;
 
     /**
      * 监督检查办法项目内容ID
      */
-    @ApiModelProperty("监督检查办法项目内容ID")
+    @ApiModelProperty("项目内容ID")
     private String projectItemId;
 
     /**

shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskProjectRel.java

@@ -20,15 +20,15 @@ public class DfDangerousTaskProjectRel extends SyBaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 监督检查任务ID
+     * 任务ID
      */
-    @ApiModelProperty(value = "监督检查任务ID")
+    @ApiModelProperty(value = "任务ID")
     private String taskId;
 
     /**
-     * 监督检查办法项目ID
+     * 项目ID
      */
-    @ApiModelProperty(value = "监督检查办法项目ID")
+    @ApiModelProperty(value = "项目ID")
     private String projectId;
 
     /**

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousParamDto.java

@@ -70,7 +70,7 @@ public class DfDangerousParamDto {
         /**
          * 项目内容ID
          */
-        @ApiModelProperty("监督检查办法项目内容ID")
+        @ApiModelProperty("项目内容ID")
         private String projectItemId;
 
         /**

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDetailDto.java

@@ -14,7 +14,7 @@ public class DfDangerousTaskDetailDto extends DfDangerousTaskDto{
      * 问题描述列表
      */
     @ApiModelProperty(value = "问题描述列表")
-    private List<DfSuperviseEngineeringDto> engineeringList;
+    private List<DfDangerousTaskProjectRelDto> engineeringList;
 
     /**
      * 问题列表

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskProjectRelDto.java

@@ -17,15 +17,15 @@ public class DfDangerousTaskProjectRelDto{
     private String id;
 
     /**
-     * 监督检查任务ID
+     * 任务ID
      */
-    @ApiModelProperty(value = "监督检查任务ID")
+    @ApiModelProperty(value = "任务ID")
     private String taskId;
 
     /**
-     * 监督检查办法项目ID
+     * 项目ID
      */
-    @ApiModelProperty(value = "监督检查办法项目ID")
+    @ApiModelProperty(value = "项目ID")
     private String projectId;
 
     /**

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java

@@ -25,22 +25,22 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
             "SELECT  rw.id, rw.NAME, rw.GROUP_ID as groupId, rw.DIKE_CODE as dikeCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime, " +
             "df.dike_name as dikeName, df.river_location as riverLocation,  gl.engineering_management_unit as engineeringManagementUnit, df.adcd_start as adcdStart, df.adcd_end as adcdEnd , fz.name as groupName  " +
             "FROM bs_sgc_df_bxgcrw rw " +
-            "LEFT JOIN bs_sgc_df_gcda df  ON df.dike_code = da.dike_code " +
+            "LEFT JOIN bs_sgc_df_gcda df  ON df.dike_code = rw.dike_code " +
-            "LEFT JOIN bs_sgc_df_gcgl gl  ON rw.dike_code = gl.dike_code " +
+            "LEFT JOIN bs_sgc_df_gcgl gl  ON gl.dike_code = rw.dike_code " +
             "LEFT JOIN bs_sgc_df_bxgcfz fz  ON rw.group_id = fz.id " +
             "WHERE df.expr_date is null  " +
             "AND gl.expr_date is null " +
-            "<if test='dfProject.dikeName != null and dfProject.dikeName != \"\"'>" +
+            "<if test='dto.dikeName != null and dto.dikeName != \"\"'>" +
-            "AND df.dike_name LIKE CONCAT('%', #{dfProject.dikeName}, '%') " +
+            "AND df.dike_name LIKE CONCAT('%', #{dto.dikeName}, '%') " +
             "</if>" +
-            "<if test='dfProject.dikeGrad != null and dfProject.dikeGrad != \"\"'>" +
+            "<if test='dto.dikeGrad != null and dto.dikeGrad != \"\"'>" +
-            "AND df.dike_grad = #{dfProject.dikeGrad} " +
+            "AND df.dike_grad = #{dto.dikeGrad} " +
             "</if>" +
-            "<if test='dfProject.adcdStart != null and dfProject.adcdStart != \"\"'>" +
+            "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
-            "AND df.adcd_start = #{dfProject.adcdStart} " +
+            "AND df.adcd_start = #{dto.adcdStart} " +
             "</if>" +
-            "<if test='dfProject.adcdEnd != null and dfProject.adcdEnd != \"\"'>" +
+            "<if test='dto.adcdEnd != null and dto.adcdEnd != \"\"'>" +
-            "AND df.adcd_end = #{dfProject.adcdEnd} " +
+            "AND df.adcd_end = #{dto.adcdEnd} " +
             "</if>" +
             "<if test='dto.engineeringManagementUnit != null and dto.engineeringManagementUnit != \"\"'>" +
             "AND gl.engineering_management_unit like concat('%', #{dto.engineeringManagementUnit}, '%')  " +

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java

@@ -124,7 +124,7 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
                         WHERE("xx.river_location = #{dto.riverLocation}");
                     }
                     if (StringUtils.isNotBlank(dto.getDikeType())) {
-                        WHERE("xx.dike_type = #{dto.dikeType}");
+                        WHERE("FIND_IN_SET(#{dto.dikeType} , REPLACE(REPLACE(REPLACE(xx.dike_type, '[', ''), ']', ''), '\"', ''))");
                     }
                     // 行政区划
                     if (StringUtils.isNotBlank(dto.getAdcd())) {
@@ -150,6 +150,9 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
             "<if test='dto.taskId != null and dto.taskId != \"\"'>" +
             "AND wt.task_id = #{dto.taskId} " +
             "</if>" +
+            "<if test='dto.id != null and dto.id != \"\"'>" +
+            "AND wt.id = #{dto.id} " +
+            "</if>" +
             "</script>")
     List<DfSuperviseProblemDto> selectByListParam(@Param("dto") DfSuperviseProblemDto dto);
 

shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java

@@ -132,7 +132,7 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
       // 1.1 获取堤防任务问题描述列表
         List<DfDangerousTaskProjectRel> relList = projectRelMapper.selectList(Wrappers.<DfDangerousTaskProjectRel>lambdaQuery()
                 .eq(DfDangerousTaskProjectRel::getTaskId, taskId));
-        dto.setEngineeringList(BeanCopyUtils.copyList(relList, DfSuperviseEngineeringDto.class));
+        dto.setEngineeringList(BeanCopyUtils.copyList(relList, DfDangerousTaskProjectRelDto.class));
 
         DfDangerousTaskItemRelDto relDto=  new DfDangerousTaskItemRelDto();
         relDto.setTaskId(taskId);

shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java

@@ -170,13 +170,18 @@ public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngine
     public DfSuperviseProblemDetailDto getDetailByProblemId(String id) {
         DfSuperviseProblemDetailDto dto = new DfSuperviseProblemDetailDto();
         // 获取问题信息
-        DfSuperviseProblem problem = getProblemDetailById(id);
+        DfSuperviseProblemDto dtoProblem = new DfSuperviseProblemDto();
-        dto.setProblemDto(BeanCopyUtils.copy(problem, DfSuperviseProblemDto.class));
+        dtoProblem.setId(id);
+        List<DfSuperviseProblemDto> problemList = problemMapper.selectByListParam(dtoProblem);
+        if (problemList.size() == 0) {
+            throw new SzException("问题信息不存在，请确认id值是否正确");
+        }
+        DfSuperviseProblemDto problem = problemList.get(0);
+        dto.setProblemDto(problem);
 
         // 获取问题描述
-        DfSuperviseEngineering engineering = this.getOne(Wrappers.<DfSuperviseEngineering>lambdaQuery()
+        DfSuperviseEngineering engineering = this.getOne(Wrappers.<DfSuperviseEngineering>lambdaQuery().eq(DfSuperviseEngineering::getTaskId, problem.getTaskId())
-                .eq(DfSuperviseEngineering::getTaskId, problem.getTaskId()).
+                .eq(DfSuperviseEngineering::getProjectId, problem.getProjectId()));
-                eq(DfSuperviseEngineering::getProjectId, problem.getProjectId()));
         dto.setProblemDescribe(engineering.getProblemDescribe());
         dto.setSiteSituationRecords(engineering.getSiteSituationRecords());
 
@@ -197,7 +202,7 @@ public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngine
     }
 
 
-    public DfSuperviseProblemTotalDto countTotal(SearchParam<DfSuperviseProblemListDto> sp) {
+    public DfSuperviseProblemTotalDto countTotal(DfSuperviseProblemListDto dto) {
-        return problemMapper.countProblemTotal(sp.getData());
+        return problemMapper.countProblemTotal(dto);
     }
 }

shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseEngineeringController.java

@@ -81,7 +81,7 @@ public class SzSuperviseEngineeringController {
      */
     @PostMapping("/total")
     @ApiOperation("监督检查任务统计分析")
-    public Response<SzSuperviseProblemTotalDto> countTotal(@RequestBody SearchParam<SzSuperviseProblemListDto> sp) {
+    public Response<SzSuperviseProblemTotalDto> countTotal(@RequestBody SzSuperviseProblemListDto dto) {
-        return Response.ok(superviseEngineeringService.countTotal(sp));
+        return Response.ok(superviseEngineeringService.countTotal(dto));
     }
 }

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java

@@ -123,7 +123,7 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
                     // todo 所属流域
                     // 工程类型
                     if(StringUtils.isNotEmpty(dto.getWagaType())){
-                        WHERE("xx.WAGA_TYPE = #{dto.wagaType}");
+                        WHERE("FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(xx.WAGA_TYPE, '[', ''), ']', ''), '\"', ''))");
                     }
                     // 行政区划
                     if (StringUtils.isNotBlank(dto.getAdcd())) {
@@ -150,6 +150,9 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
             "<if test='dto.taskId != null and dto.taskId != \"\"'>" +
             "AND wt.task_id = #{dto.taskId} " +
             "</if>" +
+            "<if test='dto.id != null and dto.id != \"\"'>" +
+            "AND wt.id = #{dto.id} " +
+            "</if>" +
             "</script>")
     List<SzSuperviseProblemDto> selectByListParam(@Param("dto") SzSuperviseProblemDto dto);
 }

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java

@@ -170,12 +170,17 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
     public SzSuperviseProblemDetailDto getDetailByProblemId(String id) {
         SzSuperviseProblemDetailDto dto = new SzSuperviseProblemDetailDto();
         // 获取问题信息
-        SzSuperviseProblem problem = getProblemDetailById(id);
+        SzSuperviseProblemDto dtoProblem = new SzSuperviseProblemDto();
-        dto.setProblemDto(BeanCopyUtils.copy(problem, SzSuperviseProblemDto.class));
+        dtoProblem.setId(id);
+        List<SzSuperviseProblemDto> problemList = problemMapper.selectByListParam(dtoProblem);
+        if (problemList.size() == 0) {
+            throw new SzException("问题信息不存在，请确认id值是否正确");
+        }
+        SzSuperviseProblemDto problem = problemList.get(0);
+        dto.setProblemDto(problem);
 
         // 获取问题描述
-        SzSuperviseEngineering engineering = this.getOne(Wrappers.<SzSuperviseEngineering>lambdaQuery()
+        SzSuperviseEngineering engineering = this.getOne(Wrappers.<SzSuperviseEngineering>lambdaQuery().eq(SzSuperviseEngineering::getTaskId, problem.getTaskId()).
-                .eq(SzSuperviseEngineering::getTaskId, problem.getTaskId()).
                 eq(SzSuperviseEngineering::getProjectId, problem.getProjectId()));
         dto.setProblemDescribe(engineering.getProblemDescribe());
         dto.setSiteSituationRecords(engineering.getSiteSituationRecords());
@@ -197,7 +202,7 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
     }
 
 
-    public SzSuperviseProblemTotalDto countTotal(SearchParam<SzSuperviseProblemListDto> sp) {
+    public SzSuperviseProblemTotalDto countTotal(SzSuperviseProblemListDto dto) {
-        return problemMapper.countProblemTotal(sp.getData());
+        return problemMapper.countProblemTotal(dto);
     }
 }