bonus
/
YSpeaManager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人员库功能变更

This commit is contained in:
lSun 2025-07-04 10:34:13 +08:00
parent f99c80395a
commit 9e91f12009
3 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/bonus/boot/manager/basic/service/impl/ImportExcelServiceImpl.java
View File

@ -497,7 +497,7 @@ public class ImportExcelServiceImpl implements ImportExcelService {
bean.setPersonName(personName); bean.setPersonName(personName);
// 判断身份证为空 // 判断身份证为空
if (StringHelper.isEmpty(idNumber) || "0.0".equals(idNumber.trim())) { /*if (StringHelper.isEmpty(idNumber) || "0.0".equals(idNumber.trim())) {
res += "第" + i + "行" + personName + "行身份证为空;"; res += "第" + i + "行" + personName + "行身份证为空;";
team = 2; team = 2;
hasError = true; hasError = true;
@ -506,10 +506,10 @@ public class ImportExcelServiceImpl implements ImportExcelService {
team = 2; team = 2;
hasError = true; hasError = true;
} }
bean.setIdNumber(idNumber); bean.setIdNumber(idNumber);*/
// 判断性别为空 // 判断性别为空
if (StringHelper.isEmpty(sex)) { /*if (StringHelper.isEmpty(sex)) {
res += "第" + i + "行" + personName + "行性别为空;"; res += "第" + i + "行" + personName + "行性别为空;";
team = 2; team = 2;
hasError = true; hasError = true;
@ -527,23 +527,23 @@ public class ImportExcelServiceImpl implements ImportExcelService {
} else { } else {
bean.setSex(b); bean.setSex(b);
} }
} }*/
// // 判断部门名称为空 // 判断部门名称为空
// if (!department.isEmpty()) { /*if (!department.isEmpty()) {
// String departmentName = dao.getdepartmentName(department); 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; team = 2;
// res += "第" + i + "行" + personName + "部门名称有误，请检查"; res += "第" + i + "行" + personName + "部门名称有误，请检查";
// hasError = true; hasError = true;
// } else { } else {
// bean.setDepartment(departmentName + ""); bean.setDepartment(departmentName + "");
// } }
// } else { } else {
// team = 2; team = 2;
// res += "第" + i + "行" + personName + "部门名称为空"; res += "第" + i + "行" + personName + "部门名称为空";
// hasError = true; hasError = true;
// } }*/
// 判断医院名称为空 // 判断医院名称为空
if (StringHelper.isEmpty(hospital)) { if (StringHelper.isEmpty(hospital)) {
@ -624,7 +624,7 @@ public class ImportExcelServiceImpl implements ImportExcelService {
} }
if (team != 2) { if (team != 2) {
PersonnelReservationBean beans = dao.getInfoById(personName, idNumber, phone,""); PersonnelReservationBean beans = dao.getInfoById(personName, "", phone,"");
if (beans != null) { if (beans != null) {
// 获取预约人的id // 获取预约人的id
// bean.setId(beans.getId()); // bean.setId(beans.getId());
@ -633,7 +633,7 @@ public class ImportExcelServiceImpl implements ImportExcelService {
hasError = true; hasError = true;
} }
PersonnelReservationBean beans1 = dao.getInfoById(personName, idNumber, phone,""); PersonnelReservationBean beans1 = dao.getInfoById(personName, "", phone,"");
if (beans1 != null) { if (beans1 != null) {
// 获取预约人的id // 获取预约人的id
bean.setId(beans1.getId()); bean.setId(beans1.getId());

6
src/main/resources/mappers/basic/PersonnelLibraryMapper.xml
View File

@ -172,8 +172,12 @@
<select id="getInfoById" resultType="com.bonus.boot.manager.basic.entity.PersonnelReservationBean"> <select id="getInfoById" resultType="com.bonus.boot.manager.basic.entity.PersonnelReservationBean">
SELECT id SELECT id
from pm_base_physical from pm_base_physical
where is_active = '1' and if_job = '1' and phy_name = #{personName} and idcard = #{idNumber} where is_active = '1' and if_job = '1' and phy_name = #{personName}
and telep_number = #{phone} and telep_number = #{phone}
<if test="idNumber!=null and idNumber !='' and idNumber !='null' ">
and idcard = #{idNumber}
</if>
<if test="ifHighee!=null and ifHighee !='' and ifHighee !='null' "> <if test="ifHighee!=null and ifHighee !='' and ifHighee !='null' ">
and if_higher = #{ifHighee} and if_higher = #{ifHighee}
</if> </if>

8
src/main/resources/static/pages/work/basic/PackageTypeList.html
View File

@ -93,13 +93,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-inline" style="width: 30%;"> <div class="layui-input-inline" style="width: 30%;">
<label class="layui-form-label" style="width: 37%;">套餐类型名称：</label> <label class="layui-form-label" style="width: 37%;">套餐类型名称：</label>
<!-- <input type="text" id="typeName" placeholder="请输入套餐类型名称" autocomplete="off" class="layui-input">--> <input type="text" id="typeName" maxlength="40" title="字数40" placeholder="请输入套餐类型名称" autocomplete="off" class="layui-input">
<select class="layui-select" id="typeName" name="typeName">
<option value="">--请选择类型名称--</option>
<option value="1">标准套餐</option>
<option value="2">个性化套餐</option>
<option value="3">职业健康套餐</option>
</select>
</div> </div>
<div class="layui-inline" style="width: 5%;margin-top: 4px"> <div class="layui-inline" style="width: 5%;margin-top: 4px">