From 450bf0d2bc352e0f17e093e9baa4d60920661f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”>
Date: Tue, 15 Apr 2025 14:55:21 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E5=B7=A1=E6=9F=A5=E5=85=BB?=
 =?UTF-8?q?=E6=8A=A4=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/yxgh/dw/dto/DwRecordSearchV2Dto.java  |  3 ++-
 .../yxgh/dw/service/DwCheckingV2Service.java  |  3 +--
 .../yxgh/sz/dto/v2/SzRecordSearchV2Dto.java   |  2 ++
 .../mapper/yxgh/DwCheckingV2Mapper.xml        | 27 +++++++------------
 .../mapper/yxgh/SzCheckingV2Mapper.xml        | 26 +++++++-----------
 5 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java
index b3178764..aa02d4e8 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java
@@ -20,7 +20,8 @@ public class DwRecordSearchV2Dto implements IAdcdDeptRole {
 
     @ApiModelProperty("工程损坏单位id")
     private String damageUnitId;
-
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
     @ApiModelProperty("工程名称")
     private String dikeName;
     @ApiModelProperty("工程类型")
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
index c780a026..443a2577 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
@@ -247,7 +247,6 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck
         receiveV2Dto.setUnitList(BeanCopyUtils.copyList(list, DwProReceiveFeedbackV2Dto.DwTeamUnitV2Dto.class));
         List<DwCheckingV2ProjectManage> manageList =
                 this.baseMapper.selectList(new LambdaQueryWrapper<DwCheckingV2ProjectManage>()
-                        .apply(" distinct dike_code ")
                         .in(DwCheckingV2ProjectManage::getDikeCode, list.stream()
                                 .map(BsSgcDfManateam::getDikeCode)
                                 .collect(Collectors.toList())));
@@ -258,7 +257,7 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck
             DwProReceiveFeedbackV2Dto.DwProjectDropDownItemV2Dto copy =
                     BeanCopyUtils.copy(e, DwProReceiveFeedbackV2Dto.DwProjectDropDownItemV2Dto.class);
             assert copy != null;
-            copy.setPersonName(personNameList.getOrDefault(copy.getDikeCode(), com.baomidou.mybatisplus.core.toolkit.StringUtils.EMPTY));
+            copy.setPersonName(personNameList.getOrDefault(copy.getDikeCode(), StringUtils.EMPTY));
             return copy;
         }).collect(Collectors.toList()));
         return receiveV2Dto;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
index c8af9ec2..2f65e486 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
@@ -16,6 +16,8 @@ public class SzRecordSearchV2Dto implements IAdcdDeptRole {
 
     @ApiModelProperty(value = "行政区划")
     private String adcd;
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
     @ApiModelProperty("项目id")
     private String checkingId;
     @ApiModelProperty("水闸名称")
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DwCheckingV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DwCheckingV2Mapper.xml
index 6371c184..a7dd620f 100644
--- a/shuili-system/src/main/resources/mapper/yxgh/DwCheckingV2Mapper.xml
+++ b/shuili-system/src/main/resources/mapper/yxgh/DwCheckingV2Mapper.xml
@@ -12,27 +12,18 @@
         <result property="category" column="category"/>
         <result property="createUid" column="create_uid"/>
         <result property="createName" column="create_name"/>
-
-        <result property="cycle" column="create_name"/>
-        <result property="responsibleUnit" column="responsible_unit"/>
-        <result property="responsibleUnitId" column="responsible_unit_id"/>
-        <result property="taskName" column="task_name"/>
     </resultMap>
     <select id="page" resultMap="pageMap">
         select
-            xmgl.id,
-            xmgl.dike_code ,
-            xmgl.dike_name ,
-            xmgl.type ,
-            xmgl.name ,
-            xmgl.create_time ,
-            xmgl.category ,
-            xmgl.create_uid ,
-            xmgl.cycle,
-            xmgl.responsible_unit,
-            xmgl.responsible_unit_id,
-            xmgl.task_name,
-            xmgl.create_name
+        xmgl.id,
+        xmgl.dike_code ,
+        xmgl.dike_name ,
+        xmgl.type,
+        xmgl.name,
+        xmgl.create_time,
+        xmgl.category ,
+        xmgl.create_uid,
+        xmgl.create_name
         from
             bs_sgc_dw_xmgl xmgl
         left join att_dike_base base on base.dike_code=xmgl.dike_code
diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzCheckingV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzCheckingV2Mapper.xml
index 2dfe6359..30d54eea 100644
--- a/shuili-system/src/main/resources/mapper/yxgh/SzCheckingV2Mapper.xml
+++ b/shuili-system/src/main/resources/mapper/yxgh/SzCheckingV2Mapper.xml
@@ -12,26 +12,18 @@
         <result property="category" column="category"/>
         <result property="createUid" column="create_uid"/>
         <result property="createName" column="create_name"/>
-        <result property="cycle" column="create_name"/>
-        <result property="responsibleUnit" column="responsible_unit"/>
-        <result property="responsibleUnitId" column="responsible_unit_id"/>
-        <result property="taskName" column="task_name"/>
     </resultMap>
     <select id="page" resultMap="pageMap">
         select
-            xmgl.id,
-            xmgl.waga_code ,
-            xmgl.waga_name ,
-            xmgl.type ,
-            xmgl.name ,
-            xmgl.create_time ,
-            xmgl.category ,
-            xmgl.create_uid ,
-            xmgl.cycle,
-            xmgl.responsible_unit,
-            xmgl.responsible_unit_id,
-            xmgl.task_name,
-            xmgl.create_name
+        xmgl.id,
+        xmgl.waga_code ,
+        xmgl.waga_name ,
+        xmgl.type,
+        xmgl.name,
+        xmgl.create_time,
+        xmgl.category ,
+        xmgl.create_uid,
+        xmgl.create_name
         from
             bs_sgc_sz_xmgl xmgl
         left join att_waga_base base on base.waga_code=xmgl.waga_code