Commit 3f47a4c1 authored by fangxinjiang's avatar fangxinjiang

优化-fxj

parent 638ba15b
...@@ -720,7 +720,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -720,7 +720,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
StringBuilder errorTemp = new StringBuilder(); StringBuilder errorTemp = new StringBuilder();
// 服务事项取消勾选商险时要查询 身份证+项目的在途或在保商险数据并给出提示:"存在办理中/已办理的数据,服务事项必须勾选" // 服务事项取消勾选商险时要查询 身份证+项目的在途或在保商险数据并给出提示:"存在办理中/已办理的数据,服务事项必须勾选"
// 触发条件:原数据含商险,新数据不含商险 // 触发条件:原数据含商险,新数据不含商险
if (Common.isNotNull(comparePre.getServerItem()) && comparePre.getServerItem().contains("商险") /*if (Common.isNotNull(comparePre.getServerItem()) && comparePre.getServerItem().contains("商险")
&& (Common.isEmpty(employeeRegistrationPre.getServerItem()) || !employeeRegistrationPre.getServerItem().contains("商险"))) { && (Common.isEmpty(employeeRegistrationPre.getServerItem()) || !employeeRegistrationPre.getServerItem().contains("商险"))) {
// 查询该身份证+项目是否存在在途或在保的商险数据 // 查询该身份证+项目是否存在在途或在保的商险数据
BaseSearchVO paramVo = new BaseSearchVO(); BaseSearchVO paramVo = new BaseSearchVO();
...@@ -733,7 +733,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -733,7 +733,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
// 存在在途或在保的商险数据,不允许取消勾选 // 存在在途或在保的商险数据,不允许取消勾选
errorTemp.append("存在办理中/已办理的数据,服务事项必须勾选;"); errorTemp.append("存在办理中/已办理的数据,服务事项必须勾选;");
} }
} }*/
// 1:存在商险,判断合规性+日期+五个不同等: // 1:存在商险,判断合规性+日期+五个不同等:
if (Common.isNotNull(employeeRegistrationPre.getServerItem()) && employeeRegistrationPre.getServerItem().contains("商险")) { if (Common.isNotNull(employeeRegistrationPre.getServerItem()) && employeeRegistrationPre.getServerItem().contains("商险")) {
//商险是否购买为是时增加校验 //商险是否购买为是时增加校验
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment