From 111522b3072d31a335866a973357a2aec839521f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 27 Sep 2022 15:32:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=83=9F=E5=8F=B0=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=89=8D=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/IcNatCompareRecordDTO.java  |  4 ++
 .../entity/IcNatCompareRecRelationEntity.java |  5 ++-
 ...IcNatCompareRecordExcelImportListener.java | 42 ++++++++++++-------
 .../impl/IcNatCompareRecordServiceImpl.java   |  3 ++
 .../mapper/IcNatCompareRecordDao.xml          |  3 +-
 5 files changed, 40 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 13ba0614f3..acd0c28306 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
@@ -114,4 +114,8 @@ public class IcNatCompareRecordDTO implements Serializable {
     @ExcelProperty("导入时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date importTime;
+
+    @ColumnWidth(30)
+    @ExcelProperty("导入组织")
+    private String agencyName;
 }
\ No newline at end of file
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 614c05dc64..daffebedd9 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
@@ -45,7 +45,10 @@ public class IcNatCompareRecRelationEntity extends BaseEpmetEntity {
      * 操作人员所属组织id
      */
 	private String agencyId;
-
+	/**
+	 * 组织名称
+	 */
+	private String agencyName;
     /**
      * agency_id的上级
      */
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 00e66143f8..f18b256247 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,18 +2,26 @@ 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.enums.EnvEnum;
 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;
@@ -73,23 +81,27 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
             compareRecordEntity.setLatestNatTime(null);
             compareRecordEntity.setNatAddress(StrConstant.EPMETY_STR);
             compareRecordEntity.setNatResult(StrConstant.EPMETY_STR);
-            // 调用烟台api获取核酸检测结果
-            /*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();
-                compareRecordEntity.setLatestNatTime(DateUtils.parse(testTime, DateUtils.DATE_PATTERN));
-                compareRecordEntity.setNatAddress(StringUtils.isNotBlank(ytHsjcResDetailDTO.getSampling_org_pcr()) ? ytHsjcResDetailDTO.getSample_result_pcr() : StrConstant.EPMETY_STR);
+            // 开发和测试没法测试，只能写死只有生产才去调用了 烟台客户id:1535072605621841922
+            EnvEnum currentEnv = EnvEnum.getCurrentEnv();
+            if (EnvEnum.PROD.getCode().equals(currentEnv.getCode()) && "1535072605621841922".equals(customerId)) {
+                // 调用烟台api获取核酸检测结果
+                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();
+                    compareRecordEntity.setLatestNatTime(DateUtils.parse(testTime, DateUtils.DATE_PATTERN));
+                    compareRecordEntity.setNatAddress(StringUtils.isNotBlank(ytHsjcResDetailDTO.getSampling_org_pcr()) ? ytHsjcResDetailDTO.getSample_result_pcr() : StrConstant.EPMETY_STR);
 
-                // "sample_result_pcr":"2",// 核酸检测结果 1:阳性,2:阴性
-                String sample_result_pcr = ytHsjcResDetailDTO.getSample_result_pcr();
-                if (NumConstant.ONE_STR.equals(sample_result_pcr)) {
-                    compareRecordEntity.setNatResult(NumConstant.ONE_STR);
-                } else if (NumConstant.TWO_STR.equals(sample_result_pcr)) {
-                    compareRecordEntity.setNatResult(NumConstant.ZERO_STR);
+                    // "sample_result_pcr":"2",// 核酸检测结果 1:阳性,2:阴性
+                    String sample_result_pcr = ytHsjcResDetailDTO.getSample_result_pcr();
+                    if (NumConstant.ONE_STR.equals(sample_result_pcr)) {
+                        compareRecordEntity.setNatResult(NumConstant.ONE_STR);
+                    } else if (NumConstant.TWO_STR.equals(sample_result_pcr)) {
+                        compareRecordEntity.setNatResult(NumConstant.ZERO_STR);
+                    }
+                    compareRecordEntity.setContactAddress(StringUtils.isNotBlank(ytHsjcResDetailDTO.getAddress()) ? ytHsjcResDetailDTO.getAddress() : StrConstant.EPMETY_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 dfb434ca91..2ac1d18b47 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
@@ -237,6 +237,7 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
             relationEntity.setImportDate(importDate);
             relationEntity.setImportTime(importTime);
             relationEntity.setAgencyId(staffInfo.getAgencyId());
+            relationEntity.setAgencyName(staffInfo.getAgencyName());
             relationEntity.setStaffId(staffInfo.getStaffId());
             relationEntity.setStaffName(staffInfo.getRealName());
             if (null != agencyInfoCache) {
@@ -271,6 +272,7 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
                 existRelationEntity.setImportTime(importTime);
                 existRelationEntity.setStaffId(staffInfo.getStaffId());
                 existRelationEntity.setStaffName(staffInfo.getRealName());
+                existRelationEntity.setAgencyName(staffInfo.getAgencyName());
                 icNatCompareRecRelationDao.updateById(existRelationEntity);
             }else{
                 IcNatCompareRecRelationEntity relationEntity = new IcNatCompareRecRelationEntity();
@@ -279,6 +281,7 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
                 relationEntity.setImportDate(importDate);
                 relationEntity.setImportTime(importTime);
                 relationEntity.setAgencyId(staffInfo.getAgencyId());
+                relationEntity.setAgencyName(staffInfo.getAgencyName());
                 relationEntity.setStaffId(staffInfo.getStaffId());
                 relationEntity.setStaffName(staffInfo.getRealName());
                 if (null != agencyInfoCache) {
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 e855f98b7f..39ac58bbe2 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
@@ -23,6 +23,7 @@
             r.STAFF_ID,
             r.STAFF_NAME,
             r.AGENCY_ID,
+            r.AGENCY_NAME,
             r.pids,
             r.IMPORT_TIME,
             r.IMPORT_DATE,
@@ -54,7 +55,7 @@
             AND r.AGENCY_ID = #{agencyId} or r.pids like concat('%',#{agencyId},'%')
         </if>
         ORDER BY
-            r.IMPORT_TIME DESC
+            r.IMPORT_TIME DESC,r.AGENCY_ID desc
     </select>
 
     <select id="selectByIdCard" parameterType="map" resultType="com.epmet.entity.IcNatCompareRecordEntity">