新冠病毒疫苗接种人员信息台账---导入

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java

@@ -30,7 +30,7 @@ public class IcVaccinePrarmeterImportErrorModel {
     @Excel(name = "所属家庭",width = 30)
     private String homeName;
 
-    @Excel(name = "户口性质", replace = {"户籍_0","外来_1"},width = 30)
+    @Excel(name = "户口性质", width = 30, replace = {"户籍_0","外来_1"})
     private String householdType;
 
     @Excel(name = "姓名",width = 30)
@@ -42,7 +42,7 @@ public class IcVaccinePrarmeterImportErrorModel {
     @Excel(name = "身份证号",width = 30)
     private String idCard;
 
-    @Excel(name = "是否接种", replace = {"否_0","是_1"},width = 30)
+    @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"})
     private String isVaccination;
 
     @Excel(name = "第一次接种时间",width = 30)

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java

@@ -22,16 +22,11 @@ import com.epmet.dao.IcVaccinePrarmeterDao;
 import com.epmet.dto.IcVaccinePrarmeterDTO;
 import com.epmet.dto.form.GridInfoVaccinePrarmeterFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
-import com.epmet.dto.form.OrgInfoPointFormDTO;
-import com.epmet.dto.result.CommunityInfoResultDTO;
 import com.epmet.dto.result.GridInfoByNameResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
-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;
 import com.epmet.feign.OssFeignClient;
@@ -187,7 +182,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
                 insertBatch(entities);
             }
             if (CollectionUtils.isNotEmpty(errorInfo)){
-                String url = importOssUpload(errorInfo, PointNucleicMonitoringErrorModel.class);
+                String url = importOssUpload(errorInfo, IcVaccinePrarmeterImportErrorModel.class);
                 closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,url);
             }else {
                 closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,"");