From de050351049c3dcd11cb22867e22a9afec08b1b8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 27 Sep 2022 15:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=8E=89=E7=83=9F=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B5=8B=E8=AF=95=E4=B8=8B=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcNatCompareRecordDTO.java     |  2 +-
 .../epmet/entity/IcNatCompareRecRelationEntity.java   |  4 ++--
 .../IcNatCompareRecordExcelImportListener.java        | 11 ++---------
 .../service/impl/IcNatCompareRecordServiceImpl.java   |  5 ++++-
 .../main/resources/mapper/IcNatCompareRecordDao.xml   |  9 +++++----
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java
index 4d8fd927c4..13ba0614f3 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java
@@ -28,7 +28,7 @@ public class IcNatCompareRecordDTO implements Serializable {
      * 主键
      */
     @ExcelIgnore
-    private String id;
+    private String relationId;
 
     /**
      * 姓名
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecRelationEntity.java
index a910160186..614c05dc64 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecRelationEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecRelationEntity.java
@@ -57,12 +57,12 @@ public class IcNatCompareRecRelationEntity extends BaseEpmetEntity {
 	private String pids;
 
     /**
-     * 操作人
+     * 最近一次操作人
      */
 	private String staffId;
 
     /**
-     * 操作人姓名
+     * 最近一次操作人姓名
      */
 	private String staffName;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
index 9b259ffd99..00e66143f8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
@@ -2,25 +2,18 @@ package com.epmet.excel.handler;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
-import com.epmet.commons.tools.dto.result.YtHsjcResDTO;
-import com.epmet.commons.tools.dto.result.YtHsjcResDetailDTO;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ObjectUtil;
-import com.epmet.commons.tools.utils.YtHsResUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.entity.IcNatCompareRecordEntity;
 import com.epmet.excel.data.IcNatCompareRecordExcelData;
 import com.epmet.service.impl.IcNatCompareRecordServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -81,7 +74,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
             compareRecordEntity.setNatAddress(StrConstant.EPMETY_STR);
             compareRecordEntity.setNatResult(StrConstant.EPMETY_STR);
             // 调用烟台api获取核酸检测结果
-            YtHsjcResDTO hsjcResDTO = YtHsResUtils.hsjc(data.getIdCard(), 1, 1);
+            /*YtHsjcResDTO hsjcResDTO = YtHsResUtils.hsjc(data.getIdCard(), 1, 1);
             if (null != hsjcResDTO && CollectionUtils.isNotEmpty(hsjcResDTO.getData()) && null != hsjcResDTO.getData().get(0)) {
                 YtHsjcResDetailDTO ytHsjcResDetailDTO = hsjcResDTO.getData().get(0);
                 String testTime = ytHsjcResDetailDTO.getTest_time();
@@ -96,7 +89,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
                     compareRecordEntity.setNatResult(NumConstant.ZERO_STR);
                 }
                 compareRecordEntity.setContactAddress(StringUtils.isNotBlank(ytHsjcResDetailDTO.getAddress()) ? ytHsjcResDetailDTO.getAddress() : StrConstant.EPMETY_STR);
-            }
+            }*/
             datas.add(compareRecordEntity);
 
             if (datas.size() == MAX_THRESHOLD) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
index 38c29329ad..dfb434ca91 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
@@ -108,7 +108,7 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
             String importDate= DateUtils.format(importTime,DateUtils.DATE_PATTERN_YYYYMMDD);
             IcNatCompareRecordExcelImportListener listener = new IcNatCompareRecordExcelImportListener(customerId, staffInfo, importDate, importTime, this);
 
-            EasyExcel.read(filePath.toFile(), IcNatCompareRecordExcelData.class, listener).headRowNumber(2).sheet(0).doRead();
+            EasyExcel.read(filePath.toFile(), IcNatCompareRecordExcelData.class, listener).headRowNumber(1).sheet(0).doRead();
 
             Path errorDescFile = null;
             String errorDesFileUrl = null;
@@ -267,7 +267,10 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
                 } else {
                     existRelationEntity.setIsAgencyUser(NumConstant.ZERO_STR);
                 }
+                //记录最后一次导入时间、最近一次操作人id,最近一次操作人姓名
                 existRelationEntity.setImportTime(importTime);
+                existRelationEntity.setStaffId(staffInfo.getStaffId());
+                existRelationEntity.setStaffName(staffInfo.getRealName());
                 icNatCompareRecRelationDao.updateById(existRelationEntity);
             }else{
                 IcNatCompareRecRelationEntity relationEntity = new IcNatCompareRecRelationEntity();
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml
index 08dc3cc163..e855f98b7f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml
@@ -6,14 +6,16 @@
     <!-- 分页查询 -->
     <select id="pageList" parameterType="com.epmet.dto.form.yqfk.IcNatCompareRecordPageFormDTO" resultType="com.epmet.dto.IcNatCompareRecordDTO">
         SELECT
-            r.ID,
+            r.ID as relationId,
             c.MOBILE,
             c.ID_CARD,
             c.`NAME`,
             c.LATEST_NAT_TIME,
             c.NAT_ADDRESS,
             c.NAT_RESULT,
-            ( CASE WHEN c.NAT_RESULT = '1' THEN '阳性' ELSE '阴性' END ) AS natResultDesc,
+            ( CASE WHEN c.NAT_RESULT = '1' THEN '阳性'
+                when c.NAT_RESULT = '0' THEN '阴性'
+                ELSE '' END ) AS natResultDesc,
             c.IS_RESI_USER,
             ( CASE WHEN r.IS_AGENCY_USER = '0' THEN '否' ELSE '是' END ) AS isResiUserDesc,
             C.MOBILE AS realMobile,
@@ -29,11 +31,10 @@
             r.IMPORT_DATE,
             r.IMPORT_TIME as importTime
         FROM ic_nat_compare_rec_relation r
-         left join ic_nat_compare_record c  on (r.COMPARE_REC_ID=c.ID)
+         inner join ic_nat_compare_record c  on (r.COMPARE_REC_ID=c.ID  AND c.del_flag='0')
         WHERE
             r.DEL_FLAG = '0'
           AND r.CUSTOMER_ID = #{customerId}
-          AND c.del_flag='0'
         <if test='null != isResiUser and "" != isResiUser'>
             AND r.IS_AGENCY_USER = #{isResiUser}
         </if>