From 211291616ebbdd7878f50e29867d34157e6c2045 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 17 Jun 2024 17:58:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=84=E7=BD=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java | 2 ++ .../src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java | 3 +++ .../src/main/java/com/kms/yxgh/df/service/DfRecordService.java | 1 + 3 files changed, 6 insertions(+) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java index 47051d4e..2a3fa7da 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java @@ -33,6 +33,8 @@ public class DfRecordSearchDto { private String dutyHolderType; @ApiModelProperty("状态") private String status; + @ApiModelProperty("处置状态") + private String handleStatus; @ApiModelProperty("巡查记录IDs") private List ids; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java index a6a1aabc..450275be 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java @@ -36,6 +36,9 @@ public class DfRecordSimpleDto { @ApiModelProperty("状态") private String status; + @ApiModelProperty("处置状态") + private String handleStatus; + @ApiModelProperty("计划名称") private String planName; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index b1617f0d..50fbd5fd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -54,6 +54,7 @@ public class DfRecordService extends BaseService { Wrapper wp = Wrappers.lambdaQuery() .like(StringUtils.isNotBlank(searchDto.getDikeName()), DfRecord::getDikeName, searchDto.getDikeName()) .eq(StringUtils.isNotBlank(searchDto.getStatus()), DfRecord::getStatus, searchDto.getStatus()) + .eq(StringUtils.isNotBlank(searchDto.getHandleStatus()), DfRecord::getHandleStatus, searchDto.getHandleStatus()) .eq(StringUtils.isNotBlank(searchDto.getDikeType()), DfRecord::getDikeType, searchDto.getDikeType()) .like(StringUtils.isNotBlank(searchDto.getLineName()), DfRecord::getLineName, searchDto.getLineName()) .eq(StringUtils.isNotBlank(searchDto.getLineType()), DfRecord::getLineType, searchDto.getLineType())