Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java

@@ -124,11 +124,19 @@ 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);
+        dataSyncConfigService.submitSyncJob(formDTO);
         return new Result();
     }
 

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);
 

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());

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>