Commit 90d5928e authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23

parents 23965156 c99516ba
...@@ -64,6 +64,12 @@ public class TAutoMainRelExportVo implements Serializable { ...@@ -64,6 +64,12 @@ public class TAutoMainRelExportVo implements Serializable {
@Schema(description = "项目编码") @Schema(description = "项目编码")
private String deptNo; private String deptNo;
// ==================== 自动化配置项显示字段 ====================
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("自动化配置项")
@Schema(description = "自动化配置项列表(记录配置了哪些服务项目)")
private String autoConfigItemsDisplay;
/** /**
* 服务状态:0正常 1停止服务 2冻结 (是否使用:0是 非0否) * 服务状态:0正常 1停止服务 2冻结 (是否使用:0是 非0否)
*/ */
...@@ -114,12 +120,6 @@ public class TAutoMainRelExportVo implements Serializable { ...@@ -114,12 +120,6 @@ public class TAutoMainRelExportVo implements Serializable {
@Schema(description = "限制项显示(拼接后的服务项目名称)") @Schema(description = "限制项显示(拼接后的服务项目名称)")
private String restrictItemsDisplay; private String restrictItemsDisplay;
// ==================== 自动化配置项显示字段 ====================
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("自动化配置项")
@Schema(description = "自动化配置项列表(记录配置了哪些服务项目)")
private String autoConfigItemsDisplay;
/** /**
* 创建时间 * 创建时间
*/ */
......
...@@ -2152,23 +2152,26 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -2152,23 +2152,26 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){ if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
return checkRes.getMsg(); return checkRes.getMsg();
} }
EmployeeRegistration exit = baseMapper.selectOne(Wrappers.<EmployeeRegistration>query().lambda() // 查询该员工在该项目下最新的入职登记记录(不限状态)
EmployeeRegistration latestExit = baseMapper.selectOne(Wrappers.<EmployeeRegistration>query().lambda()
.eq(EmployeeRegistration::getEmpIdcard, registration.getEmpIdcard()) .eq(EmployeeRegistration::getEmpIdcard, registration.getEmpIdcard())
.eq(EmployeeRegistration::getDeptNo, registration.getDeptNo()) .eq(EmployeeRegistration::getDeptNo, registration.getDeptNo())
.eq(EmployeeRegistration::getFeedbackType, registration.getFeedbackType()) .eq(EmployeeRegistration::getFeedbackType, registration.getFeedbackType())
.orderByDesc(EmployeeRegistration::getCreateTime) .orderByDesc(EmployeeRegistration::getCreateTime)
.in(EmployeeRegistration::getProcessStatus, CommonConstants.processStatus)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(exit)) {
// 如果存在历史记录,根据不同状态处理
if (Common.isNotNull(latestExit)) {
String processStatus = latestExit.getProcessStatus();
// 状态为待处理(0)或已接收(1) → 拦截重复登记
if (CommonConstants.processStatus.contains(processStatus)) {
return RegistConstants.REGIST_SAME_CHECK; return RegistConstants.REGIST_SAME_CHECK;
} }
//针对入职的判断
if (CommonConstants.ONE_STRING.equals(registration.getFeedbackType())) { // 状态为已处理(2) → 需要校验项目档案
int nowDay = Integer.parseInt(DateUtil.getThisDay()); if (CommonConstants.TWO_STRING.equals(processStatus)
if (Common.isNot16Age(registration.getEmpIdcard(), nowDay)) { && CommonConstants.ONE_STRING.equals(registration.getFeedbackType())) {
return CommonConstants.UNDER_16_ERROR;
}
//针对入职的判断是否存在在项项目档案
EmpProjectStatusVo vo = new EmpProjectStatusVo(); EmpProjectStatusVo vo = new EmpProjectStatusVo();
vo.setEmpIdcard(registration.getEmpIdcard()); vo.setEmpIdcard(registration.getEmpIdcard());
vo.setDeptNo(registration.getDeptNo()); vo.setDeptNo(registration.getDeptNo());
...@@ -2177,6 +2180,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -2177,6 +2180,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return RegistConstants.EMP_PROJECT_IS_EXIT_CHECK; return RegistConstants.EMP_PROJECT_IS_EXIT_CHECK;
} }
} }
// 其他状态(如拒绝入职3、已离职等)→ 允许重新登记,不校验项目档案
}
//针对入职的其他判断
if (CommonConstants.ONE_STRING.equals(registration.getFeedbackType())) {
int nowDay = Integer.parseInt(DateUtil.getThisDay());
if (Common.isNot16Age(registration.getEmpIdcard(), nowDay)) {
return CommonConstants.UNDER_16_ERROR;
}
}
//针对离职的判断人员项目档案状态是否正常 //针对离职的判断人员项目档案状态是否正常
if (CommonConstants.TWO_STRING.equals(registration.getFeedbackType())) { if (CommonConstants.TWO_STRING.equals(registration.getFeedbackType())) {
EmpProjectStatusVo vo = new EmpProjectStatusVo(); EmpProjectStatusVo vo = new EmpProjectStatusVo();
...@@ -3199,15 +3212,20 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -3199,15 +3212,20 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
.eq(EmployeeRegistration::getEmpIdcard, insert.getEmpIdcard()) .eq(EmployeeRegistration::getEmpIdcard, insert.getEmpIdcard())
.eq(EmployeeRegistration::getDeptNo, insert.getDeptNo()) .eq(EmployeeRegistration::getDeptNo, insert.getDeptNo())
.eq(EmployeeRegistration::getFeedbackType, insert.getFeedbackType()) .eq(EmployeeRegistration::getFeedbackType, insert.getFeedbackType())
.in(EmployeeRegistration::getProcessStatus, CommonConstants.processStatus)
.orderByDesc(EmployeeRegistration::getCreateTime) .orderByDesc(EmployeeRegistration::getCreateTime)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
// 如果存在历史记录,根据不同状态处理
if (Common.isNotNull(exit)) { if (Common.isNotNull(exit)) {
String processStatus = exit.getProcessStatus();
// 状态为待处理(0)或已接收(1) → 拦截重复登记
if (CommonConstants.processStatus.contains(processStatus)) {
errorList.add(RegistConstants.REGIST_SAME_CHECK); errorList.add(RegistConstants.REGIST_SAME_CHECK);
} }
// 状态为已处理(2) → 需要校验项目档案
//针对入职的判断是否存在在项项目档案 else if (CommonConstants.TWO_STRING.equals(processStatus)
if (CommonConstants.ONE_STRING.equals(insert.getFeedbackType())) { && CommonConstants.ONE_STRING.equals(exit.getFeedbackType())) {
EmpProjectStatusVo vo = new EmpProjectStatusVo(); EmpProjectStatusVo vo = new EmpProjectStatusVo();
vo.setEmpIdcard(insert.getEmpIdcard()); vo.setEmpIdcard(insert.getEmpIdcard());
vo.setDeptNo(insert.getDeptNo()); vo.setDeptNo(insert.getDeptNo());
...@@ -3216,6 +3234,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -3216,6 +3234,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
errorList.add(RegistConstants.EMP_PROJECT_IS_EXIT_CHECK); errorList.add(RegistConstants.EMP_PROJECT_IS_EXIT_CHECK);
} }
} }
// 其他状态(如拒绝入职3、已离职等)→ 允许重新登记,不校验项目档案
}
//针对离职的判断人员项目档案状态是否正常(前置条件:项目存在) //针对离职的判断人员项目档案状态是否正常(前置条件:项目存在)
if (CommonConstants.TWO_STRING.equals(insert.getFeedbackType()) && Common.isNotNull(selectVo)) { if (CommonConstants.TWO_STRING.equals(insert.getFeedbackType()) && Common.isNotNull(selectVo)) {
......
...@@ -10438,6 +10438,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -10438,6 +10438,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.set(TEmployeeInsurancePre::getErrorTime,null); .set(TEmployeeInsurancePre::getErrorTime,null);
employeeInsurancePreMapper.update(null, updateDiyInfoWrapper); employeeInsurancePreMapper.update(null, updateDiyInfoWrapper);
LambdaUpdateWrapper<TInsurancePreRenewDetail> updateReNewInfoWrapper = new LambdaUpdateWrapper<>();
updateReNewInfoWrapper.eq(TInsurancePreRenewDetail::getInsurancesId, ids)
.set(TInsurancePreRenewDetail::getProcessStatus,CommonConstants.THREE_STRING)
.set(TInsurancePreRenewDetail::getErrorTime,null)
.set(TInsurancePreRenewDetail::getErrorInfo,null);
tInsurancePreRenewDetailMapper.update(null, updateReNewInfoWrapper);
} }
} }
} }
......
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