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

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java

@@ -94,7 +94,7 @@ public class IcNatCompareRecordDTO implements Serializable {
      * 最近一次核酸时间:接口填入
      */
     @ColumnWidth(30)
-    @ExcelProperty("最近一次核酸时间")
+    @ExcelProperty("最近一次检测时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date latestNatTime;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
+
 /**
  * 核酸比对记录
  *
@@ -21,47 +22,47 @@ public class IcNatCompareRecordEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 	private String customerId;
-    /**
-     * 姓名
-     */
+	/**
+	 * 姓名
+	 */
 	private String name;
 
-    /**
-     * 身份证
-     */
+	/**
+	 * 身份证
+	 */
 	private String idCard;
 
-    /**
-     * 手机号
-     */
+	/**
+	 * 手机号
+	 */
 	private String mobile;
 
-    /**
-     * 是否客户下居民(0:否  1:是)
-     */
+	/**
+	 * 是否客户下居民(0:否  1:是)
+	 */
 	private String isResiUser;
 
-    /**
-     * 是否客户下居民，ic_resi_user.id
-     */
+	/**
+	 * 是否客户下居民，ic_resi_user.id
+	 */
 	private String icResiUserId;
 	/**
 	 * 最近一次采样时间:接口填入
 	 */
 	private Date latestCyTime;
-    /**
-     * 最近一次核酸时间:接口填入
-     */
+	/**
+	 * 最近一次核酸时间:接口填入
+	 */
 	private Date latestNatTime;
 
-    /**
-     * 检测结果(0:阴性  1:阳性):接口填入
-     */
+	/**
+	 * 检测结果(0:阴性  1:阳性):接口填入
+	 */
 	private String natResult;
 
-    /**
-     * 检测地点:接口填入
-     */
+	/**
+	 * 检测地点:接口填入
+	 */
 	private String natAddress;
 	/**
 	 * 联系地址：接口填入

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

@@ -171,6 +171,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
             ObjectUtil.objectToTrim(data);
             IcNatCompareRecordEntity compareRecordEntity = ConvertUtils.sourceToTarget(data, IcNatCompareRecordEntity.class);
             compareRecordEntity.setCustomerId(customerId);
+            compareRecordEntity.setLatestCyTime(null);
             compareRecordEntity.setLatestNatTime(null);
             compareRecordEntity.setNatAddress(StrConstant.EPMETY_STR);
             compareRecordEntity.setNatResult(StrConstant.EPMETY_STR);
@@ -228,22 +229,24 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
                                     compareRecordEntity.setNatResult(NumConstant.ZERO_STR);
                                 }
                                 compareRecordEntity.setContactAddress(StringUtils.isNotBlank(address) ? address : StrConstant.EPMETY_STR);
-                                compareRecordEntity.setInternalRemark(String.format("匹配成功,采样时间一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
+                                compareRecordEntity.setInternalRemark(String.format("%s查询匹配成功,采样时间一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
+                                        DateUtils.format(importTime,DateUtils.DATE_TIME_PATTERN),
                                         DateUtils.format(compareRecordEntity.getLatestCyTime(),DateUtils.DATE_TIME_PATTERN),
                                         DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
                             } else {
                                 // 采样时间不一致，说明未出结果
-                                compareRecordEntity.setInternalRemark(String.format("未出结果,采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
+                                compareRecordEntity.setInternalRemark(String.format("%s查询未出结果,采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
+                                        DateUtils.format(importTime,DateUtils.DATE_TIME_PATTERN),
                                         DateUtils.format(compareRecordEntity.getLatestCyTime(),DateUtils.DATE_TIME_PATTERN),
                                         DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
                             }
                         } else {
-                            compareRecordEntity.setInternalRemark("最近一次检测结果为空");
+                            compareRecordEntity.setInternalRemark(String.format("%s查询最近一次检测结果为空", DateUtils.format(importTime,DateUtils.DATE_TIME_PATTERN)));
                         }
                     }
                 } else {
                     // 没有核酸采样记录
-                    compareRecordEntity.setInternalRemark("最近一次采样结果为空");
+                    compareRecordEntity.setInternalRemark(String.format("%s查询最近一次采样结果为空", DateUtils.format(importTime, DateUtils.DATE_TIME_PATTERN)));
                 }
             }
             datas.add(compareRecordEntity);

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

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -270,7 +271,20 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
             // 是否客户下居民(0:否  1:是)
             origin.setIsResiUser(StringUtils.isNotBlank(origin.getIcResiUserId()) ? NumConstant.ONE_STR : NumConstant.ZERO_STR);
             origin.setLatestImportTime(importTime);
-            baseDao.updateById(origin);
+            LambdaUpdateWrapper<IcNatCompareRecordEntity> updateWrapper=new LambdaUpdateWrapper<>();
+            updateWrapper.eq(IcNatCompareRecordEntity::getId,origin.getId());
+            updateWrapper.set(IcNatCompareRecordEntity::getName, origin.getName())
+                    .set(IcNatCompareRecordEntity::getMobile, origin.getMobile())
+                    .set(IcNatCompareRecordEntity::getIsResiUser, origin.getIsResiUser())
+                    .set(IcNatCompareRecordEntity::getIcResiUserId, origin.getIcResiUserId())
+                    .set(IcNatCompareRecordEntity::getLatestCyTime, origin.getLatestCyTime())
+                    .set(IcNatCompareRecordEntity::getLatestNatTime, origin.getLatestNatTime())
+                    .set(IcNatCompareRecordEntity::getNatResult, origin.getNatResult())
+                    .set(IcNatCompareRecordEntity::getNatAddress, origin.getNatAddress())
+                    .set(IcNatCompareRecordEntity::getContactAddress, origin.getContactAddress())
+                    .set(IcNatCompareRecordEntity::getLatestImportTime, origin.getLatestImportTime())
+                    .set(IcNatCompareRecordEntity::getInternalRemark, origin.getInternalRemark());
+            baseDao.update(null,updateWrapper);
             IcNatCompareRecRelationEntity existRelationEntity=icNatCompareRecRelationDao.selectExist(data.getCustomerId(),origin.getId(),staffInfo.getAgencyId(),importDate);
             if(null!=existRelationEntity){
                 // 是否本社区（agency_id）下居民(0:否  1:是)