核酸比对，关系表改为 agency_id+compare_rec_id唯一

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

@@ -285,7 +285,8 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
                     .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);
+            // 关系表 agency_id+compare_rec_id唯一
+            IcNatCompareRecRelationEntity existRelationEntity = icNatCompareRecRelationDao.selectExist(data.getCustomerId(), origin.getId(), staffInfo.getAgencyId(), null);
             if(null!=existRelationEntity){
                 // 是否本社区（agency_id）下居民(0:否  1:是)
                 if (null != icResiUserDTO && icResiUserDTO.getAgencyId().equals(staffInfo.getAgencyId())) {
@@ -295,6 +296,7 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
                 }
                 //记录最后一次导入时间、最近一次操作人id,最近一次操作人姓名
                 existRelationEntity.setImportTime(importTime);
+                existRelationEntity.setImportDate(importDate);
                 existRelationEntity.setStaffId(staffInfo.getStaffId());
                 existRelationEntity.setStaffName(staffInfo.getRealName());
                 existRelationEntity.setAgencyName(staffInfo.getAgencyName());

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

@@ -33,6 +33,8 @@
           AND r.CUSTOMER_ID = #{customerId}
           AND r.COMPARE_REC_ID = #{compareRecId}
           AND r.AGENCY_ID = #{agencyId}
+        <if test='null != importDate and "" != importDate'>
           AND r.IMPORT_DATE = #{importDate}
+        </if>
     </select>
 </mapper>