From bff42b1dd5bfffa6a3bbd00733716e2cd252d8a7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 14 Oct 2022 14:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/DataSyncRecordDisabilityDao.java      | 14 ++++++
 .../DataSyncRecordDisabilityEntity.java       |  6 +++
 .../DataSyncRecordDisabilityServiceImpl.java  |  3 ++
 .../impl/IcUserChangeRecordServiceImpl.java   |  3 +-
 .../mapper/DataSyncRecordDisabilityDao.xml    | 43 +++++++++++++++++--
 5 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java
index c920bf67b1..d17f7e13cd 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java
@@ -21,5 +21,19 @@ public interface DataSyncRecordDisabilityDao extends BaseDao<DataSyncRecordDisab
 
     List<DataSyncRecordDisabilityDTO> list(DataSyncRecordDisabilityFormDTO formDTO);
 
+    /**
+     * Desc: 更新 icResiUser
+     * @param entities
+     * @author zxc
+     * @date 2022/10/14 13:43
+     */
     void batchUpdateResiDisability(List<DataSyncRecordDisabilityEntity> entities);
+
+    /**
+     * Desc: 批量更新残疾表
+     * @param entities
+     * @author zxc
+     * @date 2022/10/14 13:44
+     */
+    void batchUpdateDisability(List<DataSyncRecordDisabilityEntity> entities);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java
index b09103c8d7..5d2987cdb3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java
@@ -135,4 +135,10 @@ public class DataSyncRecordDisabilityEntity extends BaseEpmetEntity {
      */
 	private String dealResult;
 
+	/**
+	 * 更新状态
+	 */
+	@TableField(exist = false)
+	private Boolean updateStatus = false;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
index 1fc23c1341..4fed49f5de 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
@@ -228,6 +228,7 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
                 }
             });
         });
+        entities.stream().filter(e -> StringUtils.isBlank(e.getCjzk()) || StringUtils.isBlank(e.getCjlb())).forEach(e -> e.setUpdateStatus(true));
         // 变更记录
         List<CategoryStatusAndIdDTO> collect = entities.stream().map(m -> {
             CategoryStatusAndIdDTO dto = new CategoryStatusAndIdDTO();
@@ -255,6 +256,8 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
         icUserChangeRecordService.addRecordByResidentCategory(addRecordByResidentCategoryFormDTO);
         // 更新 ic_resi_user
         baseDao.batchUpdateResiDisability(entities);
+        // 回填 主表
+        baseDao.batchUpdateDisability(entities);
     }
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
index a764fc894a..0b93e12dd5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
@@ -192,7 +192,6 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
      * @date 2022/10/14 09:04
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void addRecordByResidentCategory(AddRecordByResidentCategoryFormDTO formDTO) {
         formDTO.getIcResiUserIds().forEach(i -> {
             IcResiUserEntity entity = icResiUserDao.selectById(i.getIcResiUserId());
@@ -211,7 +210,7 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
                 icUserChangeRecordEntity.setBeforeChangeName(categoryMap.get(formDTO.getColumnName()).equals(NumConstant.ONE_STR) ? formDTO.getLabel().concat(":是") : formDTO.getLabel().concat(":否"));
                 icUserChangeRecordEntity.setAfterChangeName(i.getCategoryStatus().equals(NumConstant.ONE_STR) ? formDTO.getLabel().concat(":是") : formDTO.getLabel().concat(":否"));
                 icUserChangeRecordEntity.setChangeTime(new Date());
-                icUserChangeRecordEntity.setRemark(formDTO.getColumnName().concat("数据更新"));
+                icUserChangeRecordEntity.setRemark(formDTO.getLabel().concat("数据更新"));
                 baseDao.insert(icUserChangeRecordEntity);
 
                 IcUserChangeDetailedEntity icUserChangeDetailedEntity = new IcUserChangeDetailedEntity();
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml
index c4fcd6bb89..889ca27c1c 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml
@@ -83,11 +83,46 @@
                 </foreach>
             </trim>
             UPDATED_TIME = NOW()
-            WHERE 1=1
-            <foreach collection="list" item="item" open="AND( " separator=" OR " index="index" close=")">
-                id = #{item.icResiUserId}
-            </foreach>
         </trim>
+        WHERE 1=1
+        <foreach collection="list" item="item" open="AND( " separator=" OR " index="index" close=")">
+            id = #{item.icResiUserId}
+        </foreach>
+    </update>
+
+    <update id="batchUpdateDisability">
+        UPDATE data_sync_record_disability
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="DEAL_STATUS =(case" suffix="end),">
+                <foreach collection="list" item="item">
+                    <choose>
+                        <when test='item.updateStatus == true '>
+                            when id = #{item.id} then 2
+                        </when>
+                        <otherwise>
+                            when id = #{item.id} then 1
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="DEAL_RESULT =(case" suffix="end),">
+                <foreach collection="list" item="item">
+                    <choose>
+                        <when test='item.updateStatus == true '>
+                            when id = #{item.id} then '处理失败'
+                        </when>
+                        <otherwise>
+                            when id = #{item.id} then '处理成功'
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </trim>
+            UPDATED_TIME = NOW()
+        </trim>
+        WHERE 1=1
+        <foreach collection="list" item="item" open="AND( " separator=" OR " index="index" close=")">
+            id = #{item.id}
+        </foreach>
     </update>
 
     <select id="list" resultType="com.epmet.dto.DataSyncRecordDisabilityDTO">