Merge remote-tracking branch 'origin/dev_compare_data'

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java

@@ -11,6 +11,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.GenderEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
@@ -97,7 +98,10 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
     public DataSyncRecordDisabilityDTO get(String id) {
         DataSyncRecordDisabilityEntity entity = baseDao.selectById(id);
         DataSyncRecordDisabilityDTO result = ConvertUtils.sourceToTarget(entity, DataSyncRecordDisabilityDTO.class);
-        result.setGenderCn(result.getGender() == NumConstant.ONE ? "男" : "女");
+        result.setGenderCn(GenderEnum.UN_KNOWN.getName());
+        if (null != result.getGender()){
+            result.setGenderCn(result.getGender() == NumConstant.ONE ? "男" : "女");
+        }
         IcResiUserDTO icResiUserDTO = icResiUserService.get(entity.getIcResiUserId());
         ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
         resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");
@@ -241,6 +245,7 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
         String customerId = tokenDto.getCustomerId();
         String userId = tokenDto.getUserId();
         List<String> all = Arrays.asList(ids);
+        // 根据IDs查询烟台拉取的残疾信息
         List<DataSyncRecordDisabilityEntity> entities = baseDao.selectBatchIds(all);
         IcFormOptionsQueryFormDTO formDTO = new IcFormOptionsQueryFormDTO();
         formDTO.setCustomerId(customerId);
@@ -269,7 +274,8 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
                 }
             });
         });
-        entities.stream().filter(e -> StringUtils.isBlank(e.getCjzk()) || StringUtils.isBlank(e.getCjlb())).forEach(e -> e.setUpdateStatus(true));
+        // cjzk，cjlb为空的，处理结果赋值 处理失败
+//        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();

epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml

@@ -112,7 +112,7 @@
                             when id = #{item.id} then '处理失败'
                         </when>
                         <otherwise>
-                            when id = #{item.id} then '处理成功'
+                            when id = #{item.id} then ''
                         </otherwise>
                     </choose>
                 </foreach>