From 06f8a441c95904cb852ce3bf626fdb261aeb4fe6 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Tue, 22 Apr 2025 14:10:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E9=A2=84=E7=BA=A6=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/importExcelController.java | 2 + .../basic/dao/PersonnelLibraryDao.java | 6 +- .../entity/PersonnelReservationBean.java | 5 + .../service/impl/ImportExcelServiceImpl.java | 296 +++++++++++------- src/main/resources/download/预约体检模版.xlsx | Bin 0 -> 10036 bytes .../mappers/basic/PersonnelLibraryMapper.xml | 18 +- .../js/work/basic/PersonnelLibraryList.js | 17 +- .../work/basic/PersonnelLibraryList.html | 2 +- 8 files changed, 218 insertions(+), 128 deletions(-) create mode 100644 src/main/resources/download/预约体检模版.xlsx diff --git a/src/main/java/com/bonus/boot/manager/basic/controller/importExcelController.java b/src/main/java/com/bonus/boot/manager/basic/controller/importExcelController.java index dd021ca..3f8fdd8 100644 --- a/src/main/java/com/bonus/boot/manager/basic/controller/importExcelController.java +++ b/src/main/java/com/bonus/boot/manager/basic/controller/importExcelController.java @@ -50,6 +50,7 @@ public class importExcelController { ar.setFailMsg(code); } } catch (Exception e) { + ar.setFailMsg(e.getMessage()); e.printStackTrace(); } return ar; @@ -91,6 +92,7 @@ public class importExcelController { } } catch (Exception e) { e.printStackTrace(); + ar.setFailMsg(e.getMessage()); } return ar; } diff --git a/src/main/java/com/bonus/boot/manager/basic/dao/PersonnelLibraryDao.java b/src/main/java/com/bonus/boot/manager/basic/dao/PersonnelLibraryDao.java index 00ae7b1..1520251 100644 --- a/src/main/java/com/bonus/boot/manager/basic/dao/PersonnelLibraryDao.java +++ b/src/main/java/com/bonus/boot/manager/basic/dao/PersonnelLibraryDao.java @@ -46,7 +46,11 @@ public interface PersonnelLibraryDao { PersonnelReservationBean getMealName(@Param("setMeal")String setMeal); - PersonnelReservationBean getInfoById(@Param("personName")String personName,@Param("idNumber") String idNumber, @Param("phone")String phone); + PersonnelReservationBean getInfoById(@Param("personName")String personName,@Param("idNumber") String idNumber, @Param("phone")String phone,@Param("ifHighee")String ifHighee); int updateReservation(PersonnelReservationBean bean); + + int getPersonNameBy(@Param("personName")String personName); + + int getPhoneBy(@Param("personName")String personName,@Param("phone")String phone); } diff --git a/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelReservationBean.java b/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelReservationBean.java index 95a78d6..ce86fd3 100644 --- a/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelReservationBean.java +++ b/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelReservationBean.java @@ -122,4 +122,9 @@ public class PersonnelReservationBean extends HospitalBean{ */ private String checkType; + /** + * 是否高职1是0不是 3 是展示空 + */ + private String ifHighee; + } 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 83abaef..b68c38d 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 @@ -26,8 +26,6 @@ import java.util.List; import java.util.UUID; /** - * - * * @author makejava * @since 2023-16-19 13:57:46 */ @@ -44,9 +42,9 @@ public class ImportExcelServiceImpl implements ImportExcelService { @Override public String saveExcelInfo(List lstObj) { - PersonnelLibraryBean bean=new PersonnelLibraryBean(); + PersonnelLibraryBean bean = new PersonnelLibraryBean(); String res = ""; - int team =1; + int team = 1; int i = 1; String personName = ""; String phone = ""; @@ -65,21 +63,21 @@ public class ImportExcelServiceImpl implements ImportExcelService { department = obj.getString("department").trim(); // specJob = obj.getString("specJob").trim(); //通过部门名称寻找部门id - if (StringHelper.isEmpty(idNumber) || "0.0".equals(idNumber.trim())) { + if (StringHelper.isEmpty(idNumber) || "0.0".equals(idNumber.trim())) { res += "第" + i + "行" + personName + "行身份证为空;"; team = 2; } else if (idNumber.length() != 18) { res += "第" + i + "行" + personName + "行身份证格式错误;"; team = 2; - }else { - sex=getSexByIdcard(idNumber); + } else { + sex = getSexByIdcard(idNumber); bean.setSex(sex); int age = countAge(idNumber); bean.setAge(age); } - if(!department.isEmpty()) { + if (!department.isEmpty()) { String departmentName = dao.getdepartmentName(department); - if (StringHelper.isEmpty(departmentName) || "0.0".equals(departmentName.trim())) { + if (StringHelper.isEmpty(departmentName) || "0.0".equals(departmentName.trim())) { team = 2; res += "第" + i + "行" + personName + "部门名称有误，请检查"; System.out.println(res); @@ -99,12 +97,12 @@ public class ImportExcelServiceImpl implements ImportExcelService { // } // } personType = obj.getString("personType"); - String peronid= ChangepersonType(personType); - if(!peronid.equals("0")){ + String peronid = ChangepersonType(personType); + if (!peronid.equals("0")) { bean.setPersonType(peronid); - }else{ + } else { System.out.println(res); - res += "第" + i + "行" + personName+"用工形式有误，请检查" ; + res += "第" + i + "行" + personName + "用工形式有误，请检查"; System.out.println(res); } @@ -114,15 +112,15 @@ public class ImportExcelServiceImpl implements ImportExcelService { bean.setPhone(phone); bean.setIdNumber(idNumber); bean.setPassword(passwordEncoder.encode("YNsbd@123456")); - if(bean.getSpecialPost()=="" ||bean.getSpecialPost()==null){ - bean.setSpecialPost(0+""); + if (bean.getSpecialPost() == "" || bean.getSpecialPost() == null) { + bean.setSpecialPost(0 + ""); } - if(team!=2){ - // 查询通过身份证去查询 + if (team != 2) { + // 查询通过身份证去查询 int sum = dao.getinfoByidcard(phone); - if(sum>0){ + if (sum > 0) { dao.updatephyInfo(bean); - } else{ + } else { dao.updatePersonExport(bean); } res = "导入成功"; @@ -146,7 +144,7 @@ public class ImportExcelServiceImpl implements ImportExcelService { try { if (lstObj != null && lstObj.size() > 0) { for (JSONObject obj : lstObj) { - NegativeResultBean bean = new NegativeResultBean(); + NegativeResultBean bean = new NegativeResultBean(); bean.setPhyNumber(obj.getString("phyNumber")); bean.setPhyName(obj.getString("phyName")); bean.setProfilePosition(obj.getString("profilePosition")); @@ -163,23 +161,23 @@ public class ImportExcelServiceImpl implements ImportExcelService { bean.setGenerRecom(obj.getString("generRecom")); bean.setDataYear(DateTimeHelper.getYear(new Date())); bean.setHospitalId(UserUtil.getLoginUser().getHospitalId()); - bean.setId(UUID.randomUUID().toString().replace("-","")); - if(StringHelper.isEmpty(obj.getString("phyNumber")) - ||StringHelper.isEmpty(obj.getString("phyName")) - ||StringHelper.isEmpty(obj.getString("profilePosition")) - ||StringHelper.isEmpty(obj.getString("phySex")) - ||StringHelper.isEmpty(obj.getString("phyOle")) - ||StringHelper.isEmpty(obj.getString("phyUnit")) - ||StringHelper.isEmpty(obj.getString("teamId")) - ||StringHelper.isEmpty(obj.getString("teamName")) - ||StringHelper.isEmpty(obj.getString("teamDepart")) - ||StringHelper.isEmpty(obj.getString("signDate")) - ||containsChineseCharacters(obj.getString("signDate")) - ||StringHelper.isEmpty(obj.getString("masResult")) - ||StringHelper.isEmpty(obj.getString("concWord")) - ||StringHelper.isEmpty(obj.getString("generRecom")) - ||((obj.getString("signDate")+"").indexOf("1900")!=-1) || ((obj.getString("signDate")+"").indexOf("1899")!=-1)){ - res.append("行号："+obj.getString("id")+"数据，"+obj.getString("phyName")+"数据异常或为空，导入失败！
"); + bean.setId(UUID.randomUUID().toString().replace("-", "")); + if (StringHelper.isEmpty(obj.getString("phyNumber")) + || StringHelper.isEmpty(obj.getString("phyName")) + || StringHelper.isEmpty(obj.getString("profilePosition")) + || StringHelper.isEmpty(obj.getString("phySex")) + || StringHelper.isEmpty(obj.getString("phyOle")) + || StringHelper.isEmpty(obj.getString("phyUnit")) + || StringHelper.isEmpty(obj.getString("teamId")) + || StringHelper.isEmpty(obj.getString("teamName")) + || StringHelper.isEmpty(obj.getString("teamDepart")) + || StringHelper.isEmpty(obj.getString("signDate")) + || containsChineseCharacters(obj.getString("signDate")) + || StringHelper.isEmpty(obj.getString("masResult")) + || StringHelper.isEmpty(obj.getString("concWord")) + || StringHelper.isEmpty(obj.getString("generRecom")) + || ((obj.getString("signDate") + "").indexOf("1900") != -1) || ((obj.getString("signDate") + "").indexOf("1899") != -1)) { + res.append("行号：" + obj.getString("id") + "数据，" + obj.getString("phyName") + "数据异常或为空，导入失败！
"); continue; } @@ -192,20 +190,20 @@ public class ImportExcelServiceImpl implements ImportExcelService { b.setTeamId(obj.getString("teamId")); b.setDataYear(dataYear); b.setHospitalId(UserUtil.getLoginUser().getHospitalId()); - b.setId(UUID.randomUUID().toString().replace("-","")); + b.setId(UUID.randomUUID().toString().replace("-", "")); for (SysType bb : getIllnessType) { String[] arrays = bb.getIllnessKeyword().split(";"); - String illId = bb.getId()+""; + String illId = bb.getId() + ""; String illType = bb.getIllnessType(); b.setIllnessType(illId); b.setIllnessName(illType); - System.err.println("illId="+illId); - System.err.println("illType="+illType); - for (String aa : arrays){ + System.err.println("illId=" + illId); + System.err.println("illType=" + illType); + for (String aa : arrays) { boolean result = concWord.contains(aa); - System.err.println("aa="+aa); - System.err.println("result="+result); - if(result){ + System.err.println("aa=" + aa); + System.err.println("result=" + result); + if (result) { negativeResultDao.addCountResultMessage(b); continue; } @@ -225,22 +223,22 @@ public class ImportExcelServiceImpl implements ImportExcelService { // } // } int num = negativeResultDao.addDataInfo(bean); - if(num <=0){ - res.append("第"+obj.getString("id")+"数据，"+obj.getString("phyName")+"新增失败！'\\n"); + if (num <= 0) { + res.append("第" + obj.getString("id") + "数据，" + obj.getString("phyName") + "新增失败！'\\n"); } } } } catch (Exception e) { e.printStackTrace(); } - return res.toString().length()<=0?"导入成功":res.toString(); + return res.toString().length() <= 0 ? "导入成功" : res.toString(); } @Override public String reservation(List lstObj) { - PersonnelReservationBean bean=new PersonnelReservationBean(); + List validBeans = new ArrayList<>(); // 用于存储通过验证的数据 String res = ""; - int team =1; + int team = 1; int i = 0; String personName = ""; String phone = ""; @@ -249,147 +247,207 @@ public class ImportExcelServiceImpl implements ImportExcelService { String hospital = ""; String sex = ""; String setMeal = ""; + boolean hasError = false; // 标志位，用于记录是否有错误 + try { if (lstObj != null && lstObj.size() > 0) { for (JSONObject obj : lstObj) { i++; + PersonnelReservationBean bean = new PersonnelReservationBean(); // 每个对象创建一个新的Bean personName = obj.getString("personName").trim(); idNumber = obj.getString("idNumber").trim(); sex = obj.getString("sex").trim(); - department = obj.getString("department").trim(); hospital = obj.getString("hospital").trim(); setMeal = obj.getString("setMeal").trim(); phone = obj.getString("phone").trim(); - - //判断姓名为空 - if(StringHelper.isEmpty(personName)){ + // 判断姓名为空 + if (StringHelper.isEmpty(personName)) { res += "第" + i + "行姓名为空;"; + hasError = true; } 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; } else if (idNumber.length() != 18) { res += "第" + i + "行" + personName + "行身份证格式错误;"; team = 2; + hasError = true; } bean.setIdNumber(idNumber); - //判断性别为空 - if (StringHelper.isEmpty(sex) ) { + // 判断性别为空 + if (StringHelper.isEmpty(sex)) { res += "第" + i + "行" + personName + "行性别为空;"; team = 2; - }else { - String a=getSexByIdcard(idNumber); - String b= ""; - if(sex.equals("男")){ - b="0"; - }else{ - b="1"; + hasError = true; + } else { + String a = getSexByIdcard(idNumber); + String b = ""; + if (sex.equals("男")) { + b = "0"; + } else { + b = "1"; } - if(!a.equals(b)){ + if (!a.equals(b)) { res += "第" + i + "行" + personName + "行身份证与性别不匹配;"; - }else { + hasError = true; + } else { bean.setSex(b); } } - //判断部门名称为空 - if(!department.isEmpty()) { + // 判断部门名称为空 + if (!department.isEmpty()) { String departmentName = dao.getdepartmentName(department); - if (StringHelper.isEmpty(departmentName) || "0.0".equals(departmentName.trim())) { + if (StringHelper.isEmpty(departmentName) || "0.0".equals(departmentName.trim())) { team = 2; res += "第" + i + "行" + personName + "部门名称有误，请检查"; - System.out.println(res); + hasError = true; } else { bean.setDepartment(departmentName + ""); } - }else{ + } else { team = 2; res += "第" + i + "行" + personName + "部门名称为空"; + hasError = true; } - //判断医院名称为空 - if (StringHelper.isEmpty(hospital) ) { + // 判断医院名称为空 + if (StringHelper.isEmpty(hospital)) { res += "第" + i + "行" + personName + "行医院名称为空;"; team = 2; - }else{ - if(hospital.equals("A")){ + hasError = true; + } else { + if (hospital.equals("A")) { bean.setHospital("33"); - }else if(hospital.equals("B")) { + } else if (hospital.equals("B")) { bean.setHospital("34"); - }else if(hospital.equals("C")) { + } else if (hospital.equals("C")) { bean.setHospital("35"); - }else { + } else { res += "第" + i + "行" + personName + "行医院名称有误，请检查"; + hasError = true; } } - //判断体检套餐为空 - if (StringHelper.isEmpty(setMeal) ) { + String ifHighee = null; // 判断是否为高职 + // 判断体检套餐为空 + if (StringHelper.isEmpty(setMeal)) { res += "第" + i + "行" + personName + "行体检套餐为空;"; team = 2; - }else if(!setMeal.contains(sex)){ + hasError = true; + } else if (!setMeal.contains(sex)) { res += "第" + i + "行" + personName + "行体检套餐内容与性别不符合;"; team = 2; + hasError = true; } else { PersonnelReservationBean bean1 = dao.getMealName(setMeal); - String setMealName = bean1.getSetMealId(); - if (StringHelper.isEmpty(setMealName) || "0.0".equals(setMealName.trim())) { + if(bean1!=null){ + String setMealName = bean1.getSetMealId(); + ifHighee = bean1.getIfHighee(); + if (StringHelper.isEmpty(setMealName) || "0.0".equals(setMealName.trim())) { + team = 2; + res += "第" + i + "行" + personName + "体检套餐有误，请检查"; + hasError = true; + } else { + bean.setSetMeal(setMealName + ""); + bean.setCheckType(bean1.getCheckType()); + bean.setCombName(setMeal); + } + }else{ team = 2; res += "第" + i + "行" + personName + "体检套餐有误，请检查"; - System.out.println(res); - } else { - bean.setSetMeal(setMealName + ""); - bean.setCheckType(bean1.getCheckType()); - bean.setCombName(setMeal); + hasError = true; } + } - //判断手机号码为空 - if (StringHelper.isEmpty(phone) || "0.0".equals(phone.trim())) { + // 判断手机号码为空 + if (StringHelper.isEmpty(phone) || "0.0".equals(phone.trim())) { res += "第" + i + "行" + personName + "行手机号码为空;"; team = 2; + hasError = true; } else if (!isLegalMobileNumber(phone)) { res += "第" + i + "行" + personName + "行手机号码格式错误;"; team = 2; + hasError = true; } bean.setPhone(phone); - if(team!=2){ - // 查询通过身份证、姓名、电话去查询 - PersonnelReservationBean beans = dao.getInfoById(personName,idNumber,phone); - if(beans!=null){ - //获取预约人的id - bean.setId(beans.getId()); - int k = dao.updateReservation(bean); - res = "导入成功"; - }else{ - res += "第" + i + "行" + personName + "行数据有误，在职人员信息未找到。请检查"; + // 查询通过身份证、姓名、电话去查询 + int personNameNum = dao.getPersonNameBy(personName); + if (personNameNum > 0) { + + } else { + res += "第" + i + "行" + personName + "行姓名有误，在职人员信息未找到。请检查"; + team = 2; + hasError = true; + } + + int phoneNum = dao.getPhoneBy(personName,phone); + if (phoneNum > 0) { + + }else{ + res += "第" + i + "行" + personName + "行手机号有误，在职人员信息未找到。请检查"; + team = 2; + hasError = true; + } + + if (team != 2) { + PersonnelReservationBean beans = dao.getInfoById(personName, idNumber, phone,""); + if (beans != null) { + // 获取预约人的id + // bean.setId(beans.getId()); + } else { + res += "第" + i + "行" + personName + "行身份证有误，在职人员信息未找到。请检查"; + hasError = true; + } + + PersonnelReservationBean beans1 = dao.getInfoById(personName, idNumber, phone,ifHighee); + if (beans1 != null) { + // 获取预约人的id + bean.setId(beans1.getId()); + } else { + res += "第" + i + "行" + personName + "行高职与非高职有误，在职人员信息未找到。请检查"; + hasError = true; } } + // 只有在没有错误的情况下才执行新增操作 + if (!hasError) { + validBeans.add(bean); + } + } + // 只有在没有错误的情况下才执行批量导入操作 + if (!hasError) { + for (PersonnelReservationBean bean : validBeans) { + int k = dao.updateReservation(bean); + } + res = "导入成功"; } } } catch (Exception e) { e.printStackTrace(); } return res; + } private String ChangepersonType(String personType) { String team; - if(personType.equals("在职")){ - team="1"; - }else if(personType.equals("离退休")){ - team="2"; - }else if(personType.equals("劳务派遣")){ - team="3"; - }else{ - team="0"; + if (personType.equals("在职")) { + team = "1"; + } else if (personType.equals("离退休")) { + team = "2"; + } else if (personType.equals("劳务派遣")) { + team = "3"; + } else { + team = "0"; } return team; } @@ -403,10 +461,10 @@ public class ImportExcelServiceImpl implements ImportExcelService { } - private String changeView(String srt){ - if(StringHelper.isEmpty(srt)){ + private String changeView(String srt) { + if (StringHelper.isEmpty(srt)) { return ""; - }else{ + } else { return srt; } } @@ -417,14 +475,17 @@ public class ImportExcelServiceImpl implements ImportExcelService { } return mobile.matches(MOBILE_RULE); } + /** * 验证身份证真假 - * @param carNumber 身份证号 - * @return boolean*/ + * + * @param carNumber 身份证号 + * @return boolean + */ public static boolean isCard(String carNumber) { //判断输入身份证号长度是否合法 if (carNumber.length() != 18) { - return false; + return false; } //校验身份证真假 int sum = 0; @@ -460,6 +521,7 @@ public class ImportExcelServiceImpl implements ImportExcelService { /** * 根据身份证号计算持有者年龄 + * * @param idCard * @return */ @@ -470,8 +532,8 @@ public class ImportExcelServiceImpl implements ImportExcelService { String year; String monthDay; if (idCard.length() == 18) { - year = idCard.substring(6,10); - monthDay = idCard.substring(10,14); + year = idCard.substring(6, 10); + monthDay = idCard.substring(10, 14); } else { year = "19" + idCard.substring(6, 8); monthDay = idCard.substring(8, 12); diff --git a/src/main/resources/download/预约体检模版.xlsx b/src/main/resources/download/预约体检模版.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..fa8ab62e54f9de181eb5262e726404ed63c005f1 GIT binary patch literal 10036 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 + and if_higher = #{ifHighee} + + + + + + update pm_base_physical diff --git a/src/main/resources/static/js/work/basic/PersonnelLibraryList.js b/src/main/resources/static/js/work/basic/PersonnelLibraryList.js index 7af7eca..250a5c0 100644 --- a/src/main/resources/static/js/work/basic/PersonnelLibraryList.js +++ b/src/main/resources/static/js/work/basic/PersonnelLibraryList.js @@ -115,9 +115,6 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () { case "exportBtn": //导出 break; - case "exportBtnYu": - download() - break; } }); }); @@ -189,7 +186,7 @@ function importExcel() { contentType: false, success: function (data) { if (data.resMsg == '导入成功') { - showMessage('导入成功！', true); + showMessages('导入成功！', true); } else { showMessage(data.resMsg, false); } @@ -208,9 +205,13 @@ function showMessage(message, isSuccess) { layer.msg(message, { time: 10000, icon: isSuccess ? 1 : 2 }); } +function showMessages(message, isSuccess) { + layer.msg(message, { time: 3000, icon: isSuccess ? 1 : 2 }); +} -function download(){ - window.location.href = ctxPath + "/download/download?filename=体检人员名单导入.xlsx" + +function fetchExcelYu(){ + window.location.href = ctxPath + "/download/download?filename=预约体检模版.xlsx" } function importExcelYu() { @@ -244,10 +245,10 @@ function importExcelYu() { contentType: false, success: function (data) { if (data.resMsg == '导入成功') { - showMessage('导入成功！', true); + showMessages('导入成功！', true); setTimeout(() => { window.location.reload(); - }, 10001) + }, 30001) } else { showMessage(data.resMsg, false); } diff --git a/src/main/resources/static/pages/work/basic/PersonnelLibraryList.html b/src/main/resources/static/pages/work/basic/PersonnelLibraryList.html index 3c7f5df..950a0c7 100644 --- a/src/main/resources/static/pages/work/basic/PersonnelLibraryList.html +++ b/src/main/resources/static/pages/work/basic/PersonnelLibraryList.html @@ -140,7 +140,7 @@
- +