导入导出逻辑

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

@@ -454,7 +454,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Override
     public List<EpidemicRecordListDTO> getList(Map<String, Object> params) {
         params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
-        List<EpidemicRecordListDTO> list = baseDao.getEpidemicUserRecordList(params);
+        params.put("age",new ArrayList<>());
+        params.put("company",new ArrayList<>());
         //        for (EpidemicRecordListDTO eru : list) {
 //            eru.setIdCard(idEncrypt(eru.getIdCard()));
 //            eru.setMobile(mobileEncrypt(eru.getMobile()));
@@ -462,7 +463,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
 //            eru.setRelationPeople(nameDesensitization(eru.getRelationPeople()));
 //            eru.setRelationPeopleMobile(mobileEncrypt(eru.getRelationPeopleMobile()));
 //        }
-        return list;
+        return baseDao.getEpidemicUserRecordList(params);
     }
 
     /**

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

@@ -73,6 +73,8 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
         wrapper.like(StringUtils.isNotBlank(realName), "REAL_NAME", realName);
         String mobile = (String) params.get("mobile");
         wrapper.like(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
+        String identityNo = (String) params.get("identityNo");
+        wrapper.like(StringUtils.isNotBlank(identityNo), "IDENTITY_NO", identityNo);
         return wrapper;
     }
 
@@ -178,7 +180,7 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
             Map<String, EpidemicUserInfoDTO> maxDoseMap = new HashMap<>();
             log.info("准备进入Excel数据导入循环");
 
-            List<VaccineDto> vaccineList = vaccineTypeService.vaccineList();
+//            List<VaccineDto> vaccineList = vaccineTypeService.vaccineList();
             List<VaccineDto> companyList = vaccineCompanyService.compantyList();
             List<VaccineDto> siteList = vaccinationSiteService.getSiteList();
             List<EpidemicUserInfoEntity> allUserList = epidemicUserInfoDao.selectAllUserInfo();
@@ -217,28 +219,28 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
                     continue;
                 }
 
-                // 校验疫苗类型
-                String vaccineName = epidemicReportUserInfoAllExcel.getVaccineName();
-                if (StringUtils.isNotBlank(vaccineName)) {
-                    List<VaccineDto> vaccine = vaccineList.stream().filter(item -> vaccineName.equals(item.getLabel())).collect(Collectors.toList());
-                    if (!vaccine.isEmpty()) {
-                        epidemicReportUserInfoAllExcel.setVaccineId(vaccine.get(0).getValue());
-                    } else {
-                        checkInfo += "第" + (i + 1) + "条、";
-                        epidemicReportUserInfoAllExcel.setErrorInfo("不存在的疫苗类型");
-                        addErrorList.add(epidemicReportUserInfoAllExcel);
-                        continue;
-                    }
-                } else {
-                    checkInfo += "第" + (i + 1) + "条、";
-                    epidemicReportUserInfoAllExcel.setErrorInfo("未填写疫苗类型");
-                    addErrorList.add(epidemicReportUserInfoAllExcel);
-                    continue;
-                }
+//                // 校验疫苗类型
+//                String vaccineName = epidemicReportUserInfoAllExcel.getVaccineName();
+//                if (StringUtils.isNotBlank(vaccineName)) {
+//                    List<VaccineDto> vaccine = vaccineList.stream().filter(item -> vaccineName.equals(item.getLabel())).collect(Collectors.toList());
+//                    if (!vaccine.isEmpty()) {
+//                        epidemicReportUserInfoAllExcel.setVaccineId(vaccine.get(0).getValue());
+//                    } else {
+//                        checkInfo += "第" + (i + 1) + "条、";
+//                        epidemicReportUserInfoAllExcel.setErrorInfo("不存在的疫苗类型");
+//                        addErrorList.add(epidemicReportUserInfoAllExcel);
+//                        continue;
+//                    }
+//                } else {
+//                    checkInfo += "第" + (i + 1) + "条、";
+//                    epidemicReportUserInfoAllExcel.setErrorInfo("未填写疫苗类型");
+//                    addErrorList.add(epidemicReportUserInfoAllExcel);
+//                    continue;
+//                }
 
                 // 校验疫苗生产商
                 String companyName = epidemicReportUserInfoAllExcel.getCompanyName();
-                if (StringUtils.isNotBlank(vaccineName)) {
+                if (StringUtils.isNotBlank(companyName)) {
                     List<VaccineDto> company = companyList.stream().filter(item -> companyName.equals(item.getLabel())).collect(Collectors.toList());
                     if (!company.isEmpty()) {
                         epidemicReportUserInfoAllExcel.setCompanyId(company.get(0).getValue());
@@ -258,7 +260,7 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
 
                 // 校验疫苗接种点
                 String siteName = epidemicReportUserInfoAllExcel.getSiteName();
-                if (StringUtils.isNotBlank(vaccineName)) {
+                if (StringUtils.isNotBlank(siteName)) {
                     List<VaccineDto> site = siteList.stream().filter(item -> siteName.equals(item.getLabel())).collect(Collectors.toList());
                     if (!site.isEmpty()) {
                         epidemicReportUserInfoAllExcel.setSiteId(site.get(0).getValue());