diff --git a/src/main/java/com/bonus/boot/manager/basic/service/impl/ImportExcelServiceImpl.java b/src/main/java/com/bonus/boot/manager/basic/service/impl/ImportExcelServiceImpl.java index 0f763f2..2f85c0d 100644 --- a/src/main/java/com/bonus/boot/manager/basic/service/impl/ImportExcelServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/basic/service/impl/ImportExcelServiceImpl.java @@ -497,7 +497,7 @@ public class ImportExcelServiceImpl implements ImportExcelService { bean.setPersonName(personName); // 判断身份证为空 - if (StringHelper.isEmpty(idNumber) || "0.0".equals(idNumber.trim())) { + /*if (StringHelper.isEmpty(idNumber) || "0.0".equals(idNumber.trim())) { res += "第" + i + "行" + personName + "行身份证为空;"; team = 2; hasError = true; @@ -506,10 +506,10 @@ public class ImportExcelServiceImpl implements ImportExcelService { team = 2; hasError = true; } - bean.setIdNumber(idNumber); + bean.setIdNumber(idNumber);*/ // 判断性别为空 - if (StringHelper.isEmpty(sex)) { + /*if (StringHelper.isEmpty(sex)) { res += "第" + i + "行" + personName + "行性别为空;"; team = 2; hasError = true; @@ -527,23 +527,23 @@ public class ImportExcelServiceImpl implements ImportExcelService { } else { bean.setSex(b); } - } + }*/ -// // 判断部门名称为空 -// if (!department.isEmpty()) { -// String departmentName = dao.getdepartmentName(department); -// if (StringHelper.isEmpty(departmentName) || "0.0".equals(departmentName.trim())) { -// team = 2; -// res += "第" + i + "行" + personName + "部门名称有误,请检查"; -// hasError = true; -// } else { -// bean.setDepartment(departmentName + ""); -// } -// } else { -// team = 2; -// res += "第" + i + "行" + personName + "部门名称为空"; -// hasError = true; -// } + // 判断部门名称为空 + /*if (!department.isEmpty()) { + String departmentName = dao.getdepartmentName(department); + if (StringHelper.isEmpty(departmentName) || "0.0".equals(departmentName.trim())) { + team = 2; + res += "第" + i + "行" + personName + "部门名称有误,请检查"; + hasError = true; + } else { + bean.setDepartment(departmentName + ""); + } + } else { + team = 2; + res += "第" + i + "行" + personName + "部门名称为空"; + hasError = true; + }*/ // 判断医院名称为空 if (StringHelper.isEmpty(hospital)) { @@ -624,7 +624,7 @@ public class ImportExcelServiceImpl implements ImportExcelService { } if (team != 2) { - PersonnelReservationBean beans = dao.getInfoById(personName, idNumber, phone,""); + PersonnelReservationBean beans = dao.getInfoById(personName, "", phone,""); if (beans != null) { // 获取预约人的id // bean.setId(beans.getId()); @@ -633,7 +633,7 @@ public class ImportExcelServiceImpl implements ImportExcelService { hasError = true; } - PersonnelReservationBean beans1 = dao.getInfoById(personName, idNumber, phone,""); + PersonnelReservationBean beans1 = dao.getInfoById(personName, "", phone,""); if (beans1 != null) { // 获取预约人的id bean.setId(beans1.getId()); diff --git a/src/main/resources/mappers/basic/PersonnelLibraryMapper.xml b/src/main/resources/mappers/basic/PersonnelLibraryMapper.xml index 1b49f75..7a5a0ad 100644 --- a/src/main/resources/mappers/basic/PersonnelLibraryMapper.xml +++ b/src/main/resources/mappers/basic/PersonnelLibraryMapper.xml @@ -172,8 +172,12 @@ - - - - - +