From c3c69f449af911523e11968bc254d7dfbce70568 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 20 Sep 2022 14:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IcEpidemicSpecialAttentionController.java    | 16 +++++++++++++++-
 .../java/com/epmet/excel/NatExportExcel.java     |  7 +++++--
 .../IcEpidemicSpecialAttentionServiceImpl.java   |  4 +++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java
index fc84fdc43d..169dc8ea37 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java
@@ -15,6 +15,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
+import com.epmet.dto.SysDictDataDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.dto.result.NatPieResultDTO;
@@ -23,6 +24,7 @@ import com.epmet.excel.NatExportExcel;
 import com.epmet.excel.NatImportExcel;
 import com.epmet.excel.VaccinationExportExcel;
 import com.epmet.excel.VaccinationImportExcel;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
 import lombok.extern.slf4j.Slf4j;
@@ -35,7 +37,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -53,6 +57,8 @@ public class IcEpidemicSpecialAttentionController {
     private IcEpidemicSpecialAttentionService icEpidemicSpecialAttentionService;
     @Autowired
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+    @Autowired
+    private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
 
     /**
      * Desc: 【疫苗接种关注名单，疫苗接种关注名单】列表
@@ -195,11 +201,19 @@ public class IcEpidemicSpecialAttentionController {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setIsPage(false);
-        PageData pageData = icEpidemicSpecialAttentionService.vaccinationList(formDTO);
+        PageData<VaccinationListResultDTO> pageData = icEpidemicSpecialAttentionService.vaccinationList(formDTO);
         // 关注类型，核酸检测：2，疫苗接种：1，行程上报：0
         if (formDTO.getAttentionType().equals(NumConstant.ONE)){
             ExcelUtils.exportExcelToTarget(response, null, pageData.getList(), VaccinationExportExcel.class);
         }else {
+            Result<List<SysDictDataDTO>> isolatedState = epmetAdminOpenFeignClient.dictDataList("isolatedState");
+            if (!isolatedState.success()){
+                throw new EpmetException("查询字典表数据失败..."+"isolatedState");
+            }
+            Map<String, String> dictMap = isolatedState.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel));
+            pageData.getList().forEach(l -> {
+                l.setIsolatedState(dictMap.get(l.getIsolatedState()));
+            });
             ExcelUtils.exportExcelToTarget(response, null, pageData.getList(), NatExportExcel.class);
         }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java
index cc3d827af0..fd404ca278 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java
@@ -29,7 +29,10 @@ public class NatExportExcel {
     @Excel(name = "关注原因",width = 40)
     private String reason;
 
-    @Excel(name = "最近一次通知时间",width = 20)
-    private String lastInformTime;
+    @Excel(name = "最后一次核酸时间",width = 20)
+    private String lastNatTime;
+
+    @Excel(name = "隔离状态",width = 20)
+    private String isolatedState;
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
index d41cf26726..27e07f9f4c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@@ -162,7 +162,9 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                 result.setTotal(list.size());
             }
         }else if (formDTO.getAttentionType().equals(NumConstant.TWO)){
-            formDTO.setIsHistory(NumConstant.ZERO_STR);
+            if (StringUtils.isBlank(formDTO.getIsHistory())){
+                formDTO.setIsHistory(NumConstant.ZERO_STR);
+            }
             if (formDTO.getIsPage()){
                 PageInfo<VaccinationListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.natList(formDTO));
                 result.setList(pageInfo.getList());