From de73b649ed9da2d2d3012abf50881841d559419d Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 23 Aug 2022 16:13:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92=E7=96=AB?=
 =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6---=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IcVaccinePrarmeterImportErrorModel.java   | 75 +++++++++++++++++++
 .../impl/IcVaccinePrarmeterServiceImpl.java   |  9 ++-
 2 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java
new file mode 100644
index 0000000000..86c6ddbca1
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java
@@ -0,0 +1,75 @@
+package com.epmet.excel.error;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * @Author wgf
+ * @DateTime 2022/6/21 16:57
+ * @DESC
+ */
+@Data
+public class IcVaccinePrarmeterImportErrorModel {
+
+    @Excel(name = "行号",width = 10)
+    private Integer num;
+
+
+    @Excel(name = "所属网格",width = 30)
+    private String gridName;
+
+    @Excel(name = "所属小区",width = 30)
+    private String villageName;
+
+    @Excel(name = "所属楼宇",width = 30)
+    private String buildName;
+
+    @Excel(name = "单元",width = 30)
+    private String unitName;
+
+    @Excel(name = "所属家庭",width = 30)
+    private String homeName;
+
+    @Excel(name = "户口性质", replace = {"户籍_0","外来_1"},width = 30)
+    private String householdType;
+
+    @Excel(name = "姓名",width = 30)
+    private String name;
+
+    @Excel(name = "联系电话",width = 30)
+    private String mobile;
+
+    @Excel(name = "身份证号",width = 30)
+    private String idCard;
+
+    @Excel(name = "是否接种", replace = {"否_0","是_1"},width = 30)
+    private String isVaccination;
+
+    @Excel(name = "第一次接种时间",width = 30)
+    private String firstVacTime;
+
+    @Excel(name = "第一次接种地点",width = 30)
+    private String firstVacSite;
+
+    @Excel(name = "第二次接种时间",width = 30)
+    private String secondVacTime;
+
+    @Excel(name = "第二次接种地点",width = 30)
+    private String secondVacSite;
+
+    @Excel(name = "第三次接种时间",width = 30)
+    private String thirdVacTime;
+
+    @Excel(name = "第三次接种地点",width = 30)
+    private String thirdVacSite;
+
+    @Excel(name = "原因",width = 30)
+    private String reason;
+
+    @Excel(name = "备注",width = 30)
+    private String note;
+
+    @Excel(name = "错误信息", width = 200)
+    private String errorMsg;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
index 5353e6ea5d..2cd27fef06 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
@@ -30,6 +30,7 @@ import com.epmet.entity.IcPointNucleicMonitoringEntity;
 import com.epmet.entity.IcVaccinePrarmeterEntity;
 import com.epmet.excel.IcPointNucleicMonitoringImportExcel;
 import com.epmet.excel.IcVaccinePrarmeterImportExcel;
+import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel;
 import com.epmet.excel.error.PointNucleicMonitoringErrorModel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
@@ -142,7 +143,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
     @Override
     @Async
     public void importFile(TokenDto tokenDto, InputStream inputStream, String taskId) {
-        List<PointNucleicMonitoringErrorModel> errorInfo = new ArrayList<>();
+        List<IcVaccinePrarmeterImportErrorModel> errorInfo = new ArrayList<>();
 
         try {
             List<IcVaccinePrarmeterImportExcel> list = ExcelPoiUtils.importExcel(inputStream, 0,1, IcVaccinePrarmeterImportExcel.class);
@@ -203,7 +204,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
      * @param errorInfo
      * @param tokenDto
      */
-    public void checkInfo(List<IcVaccinePrarmeterImportExcel> list,List<PointNucleicMonitoringErrorModel> errorInfo,TokenDto tokenDto){
+    public void checkInfo(List<IcVaccinePrarmeterImportExcel> list, List<IcVaccinePrarmeterImportErrorModel> errorInfo, TokenDto tokenDto){
         for (int i = 0; i < list.size(); i++) {
             list.get(i).setNum(i+1);
             if (StringUtils.isBlank(list.get(i).getGridName()) && !list.get(i).getAddStatus()){
@@ -392,8 +393,8 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
      * @author wgf
      * @date 2022/8/23 17:17
      */
-    public PointNucleicMonitoringErrorModel getErrorInfo(IcVaccinePrarmeterImportExcel dto, String info, Integer num){
-        PointNucleicMonitoringErrorModel result = ConvertUtils.sourceToTarget(dto, PointNucleicMonitoringErrorModel.class);
+    public IcVaccinePrarmeterImportErrorModel getErrorInfo(IcVaccinePrarmeterImportExcel dto, String info, Integer num){
+        IcVaccinePrarmeterImportErrorModel result = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterImportErrorModel.class);
         result.setErrorMsg(info);
         result.setNum(num);
         return result;