人员信息导入

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java

@@ -82,8 +82,9 @@ public class EpidemicUserInfoController {
     public Result delete(@RequestBody Long[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
-
-        return epidemicUserInfoService.deleteUserById(ids);
+        epidemicUserInfoService.delete(ids);
+        return new Result();
+//        return epidemicUserInfoService.deleteUserById(ids);
     }
 
     @GetMapping("export")

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicUserErrorDTO.java

@@ -31,7 +31,7 @@ public class EpidemicUserErrorDTO implements Serializable {
     private String politicsStatus;
     private String joinTime;
     private String organizationalRelationshipLocation;
-    private String residentsFamilyIdentityNo;
+    private String selfIdentityNo;
     private String mobile;
     private String health;
     private String maritalStatus;

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/entity/EpidemicUserErrorEntity.java

@@ -27,7 +27,7 @@ public class EpidemicUserErrorEntity extends BasePingyinEntity {
 	private String politicsStatus;
 	private String joinTime;
 	private String organizationalRelationshipLocation;
-	private String residentsFamilyIdentityNo;
+	private String selfIdentityNo;
 	private String mobile;
 	private String health;
 	private String maritalStatus;

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidemicUserErrorExcel.java

@@ -37,7 +37,7 @@ public class EpidemicUserErrorExcel {
     private String organizationalRelationshipLocation;
 
     @Excel(name = "身份证号码")
-    private String residentsFamilyIdentityNo;
+    private String selfIdentityNo;
 
     @Excel(name = "联系电话")
     private String mobile;

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@@ -705,6 +705,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
 //            List<EpdcPopulationErrorResultDTO> epdcHouseAndHouseHeadErrorResultDTOS = null;
             //居民导入数据
             List<BaseResidentInformationUpdateExcel> BaseResidentInformationUpdateExcels = null;
+            List<BaseResidentInformationUpdateExcel> baseResidentInformationUpdateExcelsNew = null;// 处理错误数据使用
             //居民导入数据异常提示
             List<EpdcPopulationErrorResultDTO> epdcResidentErrorResultDTOS = null;
 
@@ -728,8 +729,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
 //                    );
 //                } else if (numSheet == 1) {//检验和新增居住人信息
             BaseResidentInformationUpdateExcels = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
+            baseResidentInformationUpdateExcelsNew = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
             // 校验数据
-            epdcResidentErrorResultDTOS = this.checkResidentsExcel(BaseResidentInformationUpdateExcels, sysPopulationSimpleDictDTOS,addList,addErrorList);
+            epdcResidentErrorResultDTOS = this.checkResidentsExcel(BaseResidentInformationUpdateExcels,baseResidentInformationUpdateExcelsNew, sysPopulationSimpleDictDTOS,addList,addErrorList);
 //                }
 //            }
             // 校验户主和房屋信息
@@ -1065,16 +1067,18 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
      * @Param [basePopulationInformationExcels, basePopulationInformationExcels1]
      **/
     private List<EpdcPopulationErrorResultDTO> checkResidentsExcel(List<BaseResidentInformationUpdateExcel> basePopulationInformationExcels,
+                                                                   List<BaseResidentInformationUpdateExcel> basePopulationInformationExcelsNew,
                                                                    List<SysPopulationSimpleDictDTO> sysPopulationSimpleDictDTOS,
                                                                    List<BaseResidentInformationUpdateExcel> addList,
                                                                    List<BaseResidentInformationUpdateExcel> addErrorList) {
         // 不匹配信息
         List<EpdcPopulationErrorResultDTO> errorLineInfoList = new ArrayList<>();
         EpdcPopulationErrorResultDTO errorLineInfoDto = null;
+        BaseResidentInformationUpdateExcel baseResidentInformationUpdateExcelNew = new BaseResidentInformationUpdateExcel();
         for (int i = 0; i < basePopulationInformationExcels.size(); i++) {
             String errorInfo = "";
             BaseResidentInformationUpdateExcel BaseResidentInformationUpdateExcel = basePopulationInformationExcels.get(i);
-            BaseResidentInformationUpdateExcel baseResidentInformationUpdateExcelNew = basePopulationInformationExcels.get(i);
+            baseResidentInformationUpdateExcelNew = basePopulationInformationExcelsNew.get(i);
 //            String residentsIdentityNo = BaseResidentInformationUpdateExcel.getResidentsIdentityNo() == null ? null : BaseResidentInformationUpdateExcel.getResidentsIdentityNo().trim();
             String selfIdentityNo = BaseResidentInformationUpdateExcel.getSelfIdentityNo() == null ? null : BaseResidentInformationUpdateExcel.getSelfIdentityNo().trim();
 //            String houseHeadRelation = BaseResidentInformationUpdateExcel.getHouseHeadRelation() == null ? null : BaseResidentInformationUpdateExcel.getHouseHeadRelation().trim();

epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserErrorDao.xml

@@ -16,7 +16,7 @@
             e.POLITICS_STATUS,
             e.JOIN_TIME,
             e.ORGANIZATIONAL_RELATIONSHIP_LOCATION,
-            e.RESIDENTS_FAMILY_IDENTITY_NO,
+            e.SELF_IDENTITY_NO,
             e.MOBILE,
             e.HEALTH,
             e.MARITAL_STATUS,