Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java

@@ -233,7 +233,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
                                         DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
                             } else {
                                 // 采样时间不一致，说明未出结果
-                                compareRecordEntity.setInternalRemark(String.format("采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
+                                compareRecordEntity.setInternalRemark(String.format("未出结果,采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
                                         DateUtils.format(compareRecordEntity.getLatestCyTime(),DateUtils.DATE_TIME_PATTERN),
                                         DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
                             }

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

@@ -227,7 +227,7 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
      */
     @Transactional(rollbackFor = Exception.class)
     public void persisNat(IcNatCompareRecordEntity data, CustomerStaffInfoCacheResult staffInfo, String importDate, Date importTime) {
-        // 查询是否本辖区居民
+        // 查询是否本辖区居民 没有限制status='0'
         IcResiUserDTO icResiUserDTO = SpringContextUtils.getBean(IcResiUserService.class).getByIdCard(data.getCustomerId(), data.getIdCard(), null);
         AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
         //根据身份证号判断是否存在基础信息