From cd21a84cf4727fd1ee6ca55af0336ceb75b28248 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 15 Nov 2022 12:37:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IcResiComparisonRecordDao.xml      | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml
index ff9e7a7fb1..a4b098bb07 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml
@@ -74,26 +74,13 @@
         b.comparison_result comparisonResult
         FROM
             ic_resi_user a
-        <choose>
-           <when test='identical == null or identical == "" or identical == "0" or type == null and type == "" or type == "0" '>
-                LEFT JOIN ic_resi_comparison_record b ON a.id = b.resi_id AND b.del_flag = '0'
-                <if test="identical != null and identical != ''">
-                    AND b.identical =#{identical}
-                </if>
-                <if test="type != null and type != ''">
-                    AND b.type =#{type}
-                </if>
-            </when>
-            <otherwise>
-                INNER JOIN ic_resi_comparison_record b ON a.id = b.resi_id AND b.del_flag = '0'
-                <if test="identical != null and identical != ''">
-                    AND b.identical =#{identical}
-                </if>
-                <if test="type != null and type != ''">
-                    AND b.type =#{type}
-                </if>
-            </otherwise>
-        </choose>
+        LEFT JOIN ic_resi_comparison_record b ON a.id = b.resi_id AND b.del_flag = '0'
+        <if test='identical != null and identical != "" and identical == "0" '>
+            AND b.identical =#{identical}
+        </if>
+        <if test='type != null and type != "" and type == "0" '>
+            AND b.type =#{type}
+        </if>
         WHERE
             a.del_flag = '0'
         AND a.customer_id = #{customerId}
@@ -101,6 +88,12 @@
         <if test="idCard != null and idCard != ''">
             AND a.id_card =#{idCard}
         </if>
+        <if test='identical != null and identical != "" and identical != "0" '>
+            AND b.identical =#{identical}
+        </if>
+        <if test='type != null and type != "" and type != "0" '>
+            AND b.type =#{type}
+        </if>
         ORDER BY a.pids ASC, b.created_time DESC
     </select>
 

From b787f42c57905fd5612085a038e5e0bd8f2b6b8f Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 15 Nov 2022 13:37:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?natInfoSyncButton=E6=94=B9=E4=B8=BAsubmitSy?=
 =?UTF-8?q?ncJob=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/DataSyncConfigController.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java
index 948471cbe3..afaf67391b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java
@@ -124,8 +124,16 @@ public class DataSyncConfigController {
         return new Result();
     }
 
-    @PostMapping("natInfoSyncButton")
-    public Result natInfoSyncButton(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){
+    /**
+     * 提交同步任务(核酸，疫苗，身份一致性验证)
+     * @author wxz
+     * @date 2022/11/15 下午1:37
+     * @param formDTO
+ * @param tokenDto
+     * @return Result
+     */
+    @PostMapping("submitSyncJob")
+    public Result submitSyncJob(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         dataSyncConfigService.natInfoSyncButton(formDTO);

From f48f1c6112f8c36ebd1390ab72f5c9bea126dd43 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 15 Nov 2022 13:39:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?natInfoSyncButton=E6=94=B9=E4=B8=BAsubmitSy?=
 =?UTF-8?q?ncJob=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/DataSyncConfigController.java     | 2 +-
 .../src/main/java/com/epmet/service/DataSyncConfigService.java  | 2 +-
 .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java
index afaf67391b..737bf81727 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java
@@ -136,7 +136,7 @@ public class DataSyncConfigController {
     public Result submitSyncJob(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
-        dataSyncConfigService.natInfoSyncButton(formDTO);
+        dataSyncConfigService.submitSyncJob(formDTO);
         return new Result();
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java
index b4d80051da..300128bc4d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java
@@ -112,7 +112,7 @@ public interface DataSyncConfigService extends BaseService<DataSyncConfigEntity>
      */
     void natInfoScanTask(DataSyncTaskParam formDTO);
 
-    void natInfoSyncButton(DataSyncTaskParam formDTO);
+    void submitSyncJob(DataSyncTaskParam formDTO);
 
     List<NatUserInfoResultDTO> getNatUserInfoFromDb(DataSyncTaskParam formDTO, int pageNo, int pageSize);
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
index b3a50c4490..79fd952139 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@@ -411,7 +411,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
 
      */
     @Override
-    public void natInfoSyncButton(DataSyncTaskParam formDTO) {
+    public void submitSyncJob(DataSyncTaskParam formDTO) {
         AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId());
         if (null == agencyInfo){
             throw new EpmetException("未查询到组织信息："+formDTO.getAgencyId());