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

3 years ago · 58b642c885
7 changed files with 104 additions and 20 deletions
--- 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
@ -1,5 +1,6 @@
 package com.epmet.controller;

+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
@ -7,6 +8,7 @@ import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@ -15,7 +17,9 @@ import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.excel.NatExportExcel;
+import com.epmet.excel.NatImportExcel;
 import com.epmet.excel.VaccinationExportExcel;
+import com.epmet.excel.VaccinationImportExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
 import lombok.extern.slf4j.Slf4j;
@ -26,6 +30,9 @@ import org.springframework.web.multipart.MultipartFile;

 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;


 /**
@ -173,4 +180,22 @@ public class IcEpidemicSpecialAttentionController {

    }

+    @PostMapping("export-template")
+    public void exportTemplate(HttpServletResponse response, @RequestBody VaccinationListFormDTO formDTO) throws Exception {
+        TemplateExportParams templatePath = new TemplateExportParams();
+        String fileName = "";
+        Map<String,Object> map = new HashMap<>();
+        // 关注类型，核酸检测：2，疫苗接种：1，行程上报：0
+        if (formDTO.getAttentionType().equals(NumConstant.ONE)){
+            templatePath.setTemplateUrl("excel/attention_vaccination_template.xlsx");
+            fileName = "疫苗接种关注名单导入模板";
+            map.put("maplist",new ArrayList<VaccinationImportExcel>());
+        }else if (formDTO.getAttentionType().equals(NumConstant.TWO)){
+            templatePath.setTemplateUrl("excel/attention_nat_template.xlsx");
+            fileName = "核酸检测关注名单导入模板";
+            map.put("maplist",new ArrayList<NatImportExcel>());
+        }
+        ExcelPoiUtils.exportExcel(templatePath ,map,fileName,response);
+    }
+
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatImportExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatImportExcel.java
@ -0,0 +1,30 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.epmet.commons.tools.utils.ExcelVerifyInfo;
+import lombok.Data;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/29 10:24
+ * @DESC
+ */
+@Data
+public class NatImportExcel extends ExcelVerifyInfo {
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "电话")
+    private String mobile;
+
+    @Excel(name = "身份证")
+    private String idCard;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "关注原因")
+    private String reason;
+
+}
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationImportExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationImportExcel.java
@ -0,0 +1,27 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.epmet.commons.tools.utils.ExcelVerifyInfo;
+import lombok.Data;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/29 10:24
+ * @DESC
+ */
+@Data
+public class VaccinationImportExcel extends ExcelVerifyInfo {
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "电话")
+    private String mobile;
+
+    @Excel(name = "身份证")
+    private String idCard;
+
+    @Excel(name = "备注")
+    private String remark;
+
+}
--- 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
@ -316,26 +316,28 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                    continue;
                }
            }
-            Map<String, Long> groupByIdCard = list.stream().collect(Collectors.groupingBy(ImportEpidemicSpecialAttention::getIdCard, Collectors.counting()));
-            groupByIdCard.forEach((idCard,count) -> {
-                if (Integer.valueOf(count.toString()).compareTo(1) != 0){
-                    for (ImportEpidemicSpecialAttention i : list) {
-                        if (idCard.equals(i.getIdCard()) && !i.getAddStatus()){
-                            errorInfo.add(getErrorInfo(i,"数据重复",i.getNum()));
-                            i.setAddStatus(true);
+            if (list.size() > errorInfo.size()){
+                Map<String, Long> groupByIdCard = list.stream().collect(Collectors.groupingBy(ImportEpidemicSpecialAttention::getIdCard, Collectors.counting()));
+                groupByIdCard.forEach((idCard,count) -> {
+                    if (Integer.valueOf(count.toString()).compareTo(1) != 0){
+                        for (ImportEpidemicSpecialAttention i : list) {
+                            if (idCard.equals(i.getIdCard()) && !i.getAddStatus()){
+                                errorInfo.add(getErrorInfo(i,"数据重复",i.getNum()));
+                                i.setAddStatus(true);
+                            }
                        }
                    }
-                }
-            });
-            List<String> idCards = list.stream().map(m -> m.getIdCard()).collect(Collectors.toList());
-            List<String> existList = baseDao.getExistList(attentionType, idCards);
-            if (CollectionUtils.isNotEmpty(existList)){
-                for (String s : existList) {
-                    for (int i = NumConstant.ZERO; i < list.size(); i++) {
-                        if (s.equals(list.get(i).getIdCard()) && !list.get(i).getAddStatus()){
-                            errorInfo.add(getErrorInfo(list.get(i),"数据已存在",list.get(i).getNum()));
-                            list.get(i).setAddStatus(true);
-                            continue;
+                });
+                List<String> idCards = list.stream().map(m -> m.getIdCard()).collect(Collectors.toList());
+                List<String> existList = baseDao.getExistList(attentionType, idCards);
+                if (CollectionUtils.isNotEmpty(existList)){
+                    for (String s : existList) {
+                        for (int i = NumConstant.ZERO; i < list.size(); i++) {
+                            if (s.equals(list.get(i).getIdCard()) && !list.get(i).getAddStatus()){
+                                errorInfo.add(getErrorInfo(list.get(i),"数据已存在",list.get(i).getNum()));
+                                list.get(i).setAddStatus(true);
+                                continue;
+                            }
                        }
                    }
                }
--- a/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx
--- a/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
@ -25,9 +25,9 @@
            a.ID_CARD,
            a.REMARK,
            IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime,
-            COUNT(v.ID) AS vaccinationCount
+            IFNULL(v.vaccinationCount,0) AS vaccinationCount
        FROM ic_epidemic_special_attention a
-        LEFT JOIN ic_resi_vaccine v ON (v.ID_CARD = a.ID_CARD AND v.DEL_FLAG = '0')
+        LEFT JOIN (SELECT id_card ,count(1) AS vaccinationCount FROM ic_resi_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD) v ON (v.ID_CARD = a.ID_CARD)
        WHERE a.DEL_FLAG = 0
          AND a.ORG_ID = #{orgId}
          AND ATTENTION_TYPE = #{attentionType}