From 0a7d779cda452134dff2d6c3448357865ea5b31a Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Fri, 15 Mar 2024 11:18:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A0=A4=E9=98=B2?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9B=91=E6=B5=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java | 3 +++
 .../java/com/kms/yxgh/df/service/DfDeviceCheckingService.java | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java
index cdf281a5..925c06ba 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java
@@ -37,6 +37,9 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
             "<if test='dto.adcd != null and dto.adcd != \"\"'>",
             "and adcd = #{dto.adcd} ",
             "</if>",
+            "<if test='dto.dikeGrad != null and dto.dikeGrad != \"\"'>",
+            "and dike_grad = #{dto.dikeGrad} ",
+            "</if>",
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>",
             "and adcd_start = #{dto.adcdStart} ",
             "</if>",
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java
index ec94b040..f15105e0 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java
@@ -51,12 +51,16 @@ public class DfDeviceCheckingService extends BaseService<DfDeviceCheckingMapper,
     private static Function<DfDeviceChecking, DfDeviceCheckingDetailDto> getDfDeviceCheckingDfDeviceCheckingDetailDtoFunction() {
         return item -> {
             DfDeviceCheckingDetailDto dto = new DfDeviceCheckingDetailDto();
+            dto.setId(item.getId());
             dto.setDeviceId(item.getDeviceId());
             dto.setMessage(item.getMessage());
             dto.setName(item.getName());
             dto.setType(item.getType());
             dto.setWarningType(item.getWarningType());
+            dto.setWarningLevel(item.getWarningLevel());
             dto.setDikeCode(item.getDikeCode());
+            dto.setCreateTime(item.getCreateTime());
+            dto.setUpdateTime(item.getUpdateTime());
             dto.setConfigs(JSON.parseObject(item.getConfig(), new TypeReference<List<DfDeviceCheckingDetailDto.Config>>() {
             }));
             return dto;