Commit 4f49f53e authored by hongguangwu's avatar hongguangwu

30号版本:档案合同、商险、薪资状态;缴费库反馈列;合同提交的直接审核优化等

parent 07e75bdb
......@@ -1295,7 +1295,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
// 处理档案状态
if (CollectionUtils.isNotEmpty(successList)) {
this.doFailInfo(successList, sourceIdCardList, replaceIdList, CommonConstants.FOUR_STRING);
this.doFailInfo(successList, sourceIdCardList, replaceIdList, CommonConstants.ZERO_STRING);
}
}
//操作记录
......@@ -1578,18 +1578,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
proStatus = proStatusMap.get(detail.getEmpIdcardNo() + CommonConstants.DOWN_LINE_STRING + detail.getDeptId());
empStatus = empStatusMap.get(detail.getEmpIdcardNo());
// 判断该项目的商险的状态 2正常>3处理中>4失效>0无商险
// 判断该项目的商险的状态 2正常>4处理中>3失效>0无商险
// 0无2正常3失效4处理中
status = this.judgeStatus(detail);
if (proStatus != null) {
if (status != 0 && status < proStatus) {
proStatus = status;
if (proStatus != CommonConstants.TWO_INT && (status == CommonConstants.TWO_INT
|| status == CommonConstants.FOUR_INT
|| (status == CommonConstants.THREE_INT && proStatus != CommonConstants.FOUR_INT))) {
proStatus = status;
}
} else {
proStatus = status;
}
if (empStatus != null) {
if (status != 0 && status < empStatus) {
if (empStatus != CommonConstants.TWO_INT && (status == CommonConstants.TWO_INT
|| status == CommonConstants.FOUR_INT
|| (status == CommonConstants.THREE_INT && empStatus != CommonConstants.FOUR_INT))) {
empStatus = status;
}
} else {
......
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