diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java index 7fab88d..7452c0b 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java @@ -265,8 +265,10 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl recordList = ExcelImportUtil.importExcel(f, EpidemicReportUserInfoAllExcel.class, new ImportParams()); + List recordList = ExcelImportUtil.importExcel(f, EpidemicReportUserInfoAllExcel.class, importParams); if (CollUtil.isEmpty(recordList)) { return new Result().error("导入内容不能为空"); } @@ -274,6 +276,8 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl checkIdCardList = new ArrayList<>(); // 存储需要逻辑删除的身份证号 List deleteIdCardArr = new ArrayList<>(); + // 存储不更新人员只更新地址的的id + List secretIdCardArr = new ArrayList<>(); // 存储批量插入实体 List addList = new ArrayList<>(); // 存储错误数据批量插入实体 @@ -335,18 +339,18 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl 0) { + // 对规范数据,根据身份证号进行逻辑删除 + if (deleteIdCardArr.size() > 0) { // baseDao.deleteInfoByIdCard(deleteIdCardArr); -// baseDao.deleteRecordByIdCard(deleteIdCardArr); -// } + baseDao.deleteRecordByIdCard(deleteIdCardArr); + } // 插入数据----需改为批量插入 List insertUserList = new ArrayList<>(); @@ -355,10 +359,14 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl