From be786338168a2e32f909772f84a5dd3b0ffff86b Mon Sep 17 00:00:00 2001 From: huangrenya Date: Thu, 14 Mar 2024 15:35:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E7=97=85=E9=99=A9=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B-=E5=A0=A4=E9=98=B2/=E6=B0=B4=E9=97=B8-=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6&=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=82=E6=95=B0=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DfSuperviseEngineeringController.java | 4 ++-- .../df/mapper/DfSuperviseProblemMapper.java | 5 ++++- .../DfSuperviseEngineeringService.java | 19 ++++++++++++------- .../SzSuperviseEngineeringController.java | 4 ++-- .../sz/mapper/SzSuperviseProblemMapper.java | 5 ++++- .../SzSuperviseEngineeringService.java | 17 +++++++++++------ 6 files changed, 35 insertions(+), 19 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseEngineeringController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseEngineeringController.java index 368bd4d8..7537eaf3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseEngineeringController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseEngineeringController.java @@ -81,7 +81,7 @@ public class DfSuperviseEngineeringController { */ @PostMapping("/total") @ApiOperation("监督检查任务统计分析") - public Response countTotal(@RequestBody SearchParam sp) { - return Response.ok(superviseEngineeringService.countTotal(sp)); + public Response countTotal(@RequestBody DfSuperviseProblemListDto dto) { + return Response.ok(superviseEngineeringService.countTotal(dto)); } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java index c485bcfd..8d63c45d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java @@ -124,7 +124,7 @@ public interface DfSuperviseProblemMapper extends BaseMapper 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 "" + "AND wt.task_id = #{dto.taskId} " + "" + + "" + + "AND wt.id = #{dto.id} " + + "" + "") List selectByListParam(@Param("dto") DfSuperviseProblemDto dto); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java index a8181bcd..84ad7ed0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java @@ -170,13 +170,18 @@ public class DfSuperviseEngineeringService extends BaseService 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.lambdaQuery() - .eq(DfSuperviseEngineering::getTaskId, problem.getTaskId()). - eq(DfSuperviseEngineering::getProjectId, problem.getProjectId())); + DfSuperviseEngineering engineering = this.getOne(Wrappers.lambdaQuery().eq(DfSuperviseEngineering::getTaskId, problem.getTaskId()) + .eq(DfSuperviseEngineering::getProjectId, problem.getProjectId())); dto.setProblemDescribe(engineering.getProblemDescribe()); dto.setSiteSituationRecords(engineering.getSiteSituationRecords()); @@ -197,7 +202,7 @@ public class DfSuperviseEngineeringService extends BaseService sp) { - return problemMapper.countProblemTotal(sp.getData()); + public DfSuperviseProblemTotalDto countTotal(DfSuperviseProblemListDto dto) { + return problemMapper.countProblemTotal(dto); } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseEngineeringController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseEngineeringController.java index 29d755ef..fe3b7646 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseEngineeringController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseEngineeringController.java @@ -81,7 +81,7 @@ public class SzSuperviseEngineeringController { */ @PostMapping("/total") @ApiOperation("监督检查任务统计分析") - public Response countTotal(@RequestBody SearchParam sp) { - return Response.ok(superviseEngineeringService.countTotal(sp)); + public Response countTotal(@RequestBody SzSuperviseProblemListDto dto) { + return Response.ok(superviseEngineeringService.countTotal(dto)); } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java index ff3e1812..b16f1c7e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java @@ -123,7 +123,7 @@ public interface SzSuperviseProblemMapper extends BaseMapper // 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 "" + "AND wt.task_id = #{dto.taskId} " + "" + + "" + + "AND wt.id = #{dto.id} " + + "" + "") List selectByListParam(@Param("dto") SzSuperviseProblemDto dto); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java index a27ece72..5ec92f9d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java @@ -170,12 +170,17 @@ public class SzSuperviseEngineeringService extends BaseService 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.lambdaQuery() - .eq(SzSuperviseEngineering::getTaskId, problem.getTaskId()). + SzSuperviseEngineering engineering = this.getOne(Wrappers.lambdaQuery().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 sp) { - return problemMapper.countProblemTotal(sp.getData()); + public SzSuperviseProblemTotalDto countTotal(SzSuperviseProblemListDto dto) { + return problemMapper.countProblemTotal(dto); } } From 26913eeb77e03dce855f9de435e20f8cb32d000d Mon Sep 17 00:00:00 2001 From: huangrenya Date: Thu, 14 Mar 2024 15:36:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E7=97=85=E9=99=A9=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B-=E5=A0=A4=E9=98=B2-=E4=BF=AE=E6=94=B9=E6=B3=A8?= =?UTF-8?q?=E9=87=8A&=E4=BF=AE=E5=A4=8Dsql=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/domain/DfDangerousTaskItemRel.java | 8 ++++---- .../df/domain/DfDangerousTaskProjectRel.java | 8 ++++---- .../kms/yxgh/df/dto/DfDangerousParamDto.java | 2 +- .../yxgh/df/dto/DfDangerousTaskDetailDto.java | 2 +- .../df/dto/DfDangerousTaskProjectRelDto.java | 8 ++++---- .../yxgh/df/mapper/DfDangerousTaskMapper.java | 20 +++++++++---------- .../df/service/DfDangerousTaskService.java | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java index a54aab8d..eee228c1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java +++ b/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; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskProjectRel.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskProjectRel.java index 9b50034d..88e1d98f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskProjectRel.java +++ b/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; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousParamDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousParamDto.java index 19724bfe..83f4fe89 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousParamDto.java +++ b/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; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDetailDto.java index 8aa61f46..07668e50 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDetailDto.java +++ b/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 engineeringList; + private List engineeringList; /** * 问题列表 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskProjectRelDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskProjectRelDto.java index 5d672492..05a88354 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskProjectRelDto.java +++ b/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; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java index 220040a9..172f21bd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java @@ -25,22 +25,22 @@ public interface DfDangerousTaskMapper extends BaseMapper { "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_gcgl gl ON rw.dike_code = gl.dike_code " + + "LEFT JOIN bs_sgc_df_gcda df ON df.dike_code = rw.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 " + - "" + - "AND df.dike_name LIKE CONCAT('%', #{dfProject.dikeName}, '%') " + + "" + + "AND df.dike_name LIKE CONCAT('%', #{dto.dikeName}, '%') " + "" + - "" + - "AND df.dike_grad = #{dfProject.dikeGrad} " + + "" + + "AND df.dike_grad = #{dto.dikeGrad} " + "" + - "" + - "AND df.adcd_start = #{dfProject.adcdStart} " + + "" + + "AND df.adcd_start = #{dto.adcdStart} " + "" + - "" + - "AND df.adcd_end = #{dfProject.adcdEnd} " + + "" + + "AND df.adcd_end = #{dto.adcdEnd} " + "" + "" + "AND gl.engineering_management_unit like concat('%', #{dto.engineeringManagementUnit}, '%') " + diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java index 0129ae05..076317a6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java @@ -132,7 +132,7 @@ public class DfDangerousTaskService extends BaseService relList = projectRelMapper.selectList(Wrappers.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);