Commit 575512b4 authored by hongguangwu's avatar hongguangwu

MVP1.6.9-社保自动化日志

parent 6ce81ef2
...@@ -1828,6 +1828,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1828,6 +1828,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
title = "社保"; title = "社保";
socialInfo = idCardMap.get(doAddId + CommonConstants.DOWN_LINE_STRING + empIdCard); socialInfo = idCardMap.get(doAddId + CommonConstants.DOWN_LINE_STRING + empIdCard);
if (socialInfo != null) { if (socialInfo != null) {
ygsHandleStatus = CommonConstants.SEVEN_STRING;
ysdHandleStatus = CommonConstants.SEVEN_STRING;
if (typeFlag && CommonConstants.SEVEN_STRING.equals(socialInfo.getYgsHandleStatus())) { if (typeFlag && CommonConstants.SEVEN_STRING.equals(socialInfo.getYgsHandleStatus())) {
updateSocial = socialMap.get(socialInfo.getId()); updateSocial = socialMap.get(socialInfo.getId());
...@@ -1845,6 +1847,41 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1845,6 +1847,41 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
updateSocial.setYgsRemark(handleRemark); updateSocial.setYgsRemark(handleRemark);
updateSocial.setYgsRemarkOld(auditRemark); updateSocial.setYgsRemarkOld(auditRemark);
} else if ("审核不通过".equals(excel.getAuditStatus())) { } else if ("审核不通过".equals(excel.getAuditStatus())) {
// 如果找到了失败原因配置:
failConfig = getConfig(auditRemark, errorMap);
if (failConfig != null) {
updateSocial.setYgsRemark(failConfig.getSimpleReason());
// failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理
// setYgsHandleStatus 3继续办理、4终止办理、5人工处理
if (CommonConstants.ONE_STRING.equals(failConfig.getReplay())) {
ygsHandleStatus = CommonConstants.THREE_STRING;
// 新增流程进展明细
if (CommonConstants.ZERO_STRING.equals(socialInfo.getDispatchType())) {
title += "派增";
} else {
title += "派减";
}
title += "养老、工伤、失业审核不通过!继续办理:" + failConfig.getSimpleReason();
this.doSocialTAuditInfo(socialInfo, title, title, failConfig.getSimpleReason(), user);
} else if (CommonConstants.TWO_STRING.equals(failConfig.getReplay())) {
ygsHandleStatus = CommonConstants.FOUR_STRING;
ygsFailList = new ArrayList<>();
ygsFailList.add(socialInfo.getDispatchId());
handleRemark = "中止办理:" + failConfig.getSimpleReason();
remark = "中止办理:" + failConfig.getSimpleReason();
} else if (CommonConstants.THREE_STRING.equals(failConfig.getReplay())) {
ygsHandleStatus = CommonConstants.FIVE_STRING;
// 新增流程进展明细
if (CommonConstants.ZERO_STRING.equals(socialInfo.getDispatchType())) {
title += "派增";
} else {
title += "派减";
}
title += "养老、工伤、失业审核不通过!人工处理:" + failConfig.getSimpleReason();
this.doSocialTAuditInfo(socialInfo, title, title, failConfig.getSimpleReason(), user);
}
} else {
handleRemark = "社保士兵审核不通过转人工处理!"; handleRemark = "社保士兵审核不通过转人工处理!";
remark = auditRemark; remark = auditRemark;
handleRemark += remark; handleRemark += remark;
...@@ -1859,6 +1896,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1859,6 +1896,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
} }
title += "养老、工伤、失业" + handleRemark; title += "养老、工伤、失业" + handleRemark;
this.doSocialTAuditInfo(socialInfo, title, title, title, user); this.doSocialTAuditInfo(socialInfo, title, title, title, user);
}
} else { } else {
updateSocial.setYgsRemark(auditRemark); updateSocial.setYgsRemark(auditRemark);
updateSocial.setYgsRemarkOld(auditRemark); updateSocial.setYgsRemarkOld(auditRemark);
...@@ -1876,7 +1914,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1876,7 +1914,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
} }
title += "养老、工伤、失业" + handleRemark; title += "养老、工伤、失业" + handleRemark;
this.doSocialTAuditInfo(socialInfo, title, title, title, user); this.doSocialTAuditInfo(socialInfo, title, title, title, user);
//}
} }
updateSocial.setYgsHandleStatus(ygsHandleStatus); updateSocial.setYgsHandleStatus(ygsHandleStatus);
updateSocialList.add(updateSocial); updateSocialList.add(updateSocial);
...@@ -1904,6 +1941,42 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1904,6 +1941,42 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
updateSocial.setYsdRemark(handleRemark); updateSocial.setYsdRemark(handleRemark);
updateSocial.setYsdRemarkOld(auditRemark); updateSocial.setYsdRemarkOld(auditRemark);
} else if ("审核不通过".equals(excel.getAuditStatus())) { } else if ("审核不通过".equals(excel.getAuditStatus())) {
// 如果找到了失败原因配置:
failConfig = getConfig(auditRemark, errorMap);
if (failConfig != null) {
updateSocial.setYsdRemark(failConfig.getSimpleReason());
// failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理
// ysdHandleStatus 3继续办理、4终止办理、5人工处理
if (CommonConstants.ONE_STRING.equals(failConfig.getReplay())) {
ysdHandleStatus = CommonConstants.THREE_STRING;
// 新增流程进展明细
if (CommonConstants.ZERO_STRING.equals(socialInfo.getDispatchType())) {
title += "派增";
} else {
title += "派减";
}
title += "医疗、生育、大病审核不通过!继续办理:" + failConfig.getSimpleReason();
this.doSocialTAuditInfo(socialInfo, title, title, failConfig.getSimpleReason(), user);
} else if (CommonConstants.TWO_STRING.equals(failConfig.getReplay())) {
ysdHandleStatus = CommonConstants.FOUR_STRING;
ysdFailList = new ArrayList<>();
ysdFailList.add(socialInfo.getDispatchId());
handleRemark = "中止办理:" + failConfig.getSimpleReason();
remark = "中止办理:" + failConfig.getSimpleReason();
} else if (CommonConstants.THREE_STRING.equals(failConfig.getReplay())) {
ysdHandleStatus = CommonConstants.FIVE_STRING;
// 新增流程进展明细
if (CommonConstants.ZERO_STRING.equals(socialInfo.getDispatchType())) {
title += "派增";
} else {
title += "派减";
}
title += "医疗、生育、大病审核不通过!人工处理:" + failConfig.getSimpleReason();
this.doSocialTAuditInfo(socialInfo, title, title, failConfig.getSimpleReason(), user);
}
} else {
handleRemark = "社保士兵审核不通过转人工处理!"; handleRemark = "社保士兵审核不通过转人工处理!";
remark = auditRemark; remark = auditRemark;
handleRemark += remark; handleRemark += remark;
...@@ -1918,6 +1991,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1918,6 +1991,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
} }
title += "医疗、生育、大病" + handleRemark; title += "医疗、生育、大病" + handleRemark;
this.doSocialTAuditInfo(socialInfo, title, title, title, user); this.doSocialTAuditInfo(socialInfo, title, title, title, user);
}
} else { } else {
updateSocial.setYsdRemark(auditRemark); updateSocial.setYsdRemark(auditRemark);
handleRemark = "社保士兵审核结果:" + excel.getAuditStatus(); handleRemark = "社保士兵审核结果:" + excel.getAuditStatus();
...@@ -1935,7 +2009,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1935,7 +2009,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
} }
title += "医疗、生育、大病" + handleRemark; title += "医疗、生育、大病" + handleRemark;
this.doSocialTAuditInfo(socialInfo, title, title, title, user); this.doSocialTAuditInfo(socialInfo, title, title, title, user);
//}
} }
updateSocial.setYsdHandleStatus(ysdHandleStatus); updateSocial.setYsdHandleStatus(ysdHandleStatus);
updateSocialList.add(updateSocial); updateSocialList.add(updateSocial);
...@@ -2062,21 +2135,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -2062,21 +2135,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
updateSocial.setId(socialInfo.getId()); updateSocial.setId(socialInfo.getId());
} }
if ("是".equals(excel.getIsSuccess())) { if ("是".equals(excel.getIsSuccess())) {
/*ygsHandleStatus = CommonConstants.SIX_STRING;
ygsList = new ArrayList<>();
ygsList.add(socialInfo.getDispatchId());
handleRemark = "社保士兵自动办理成功!";
remark = "社保士兵自动办理成功!!";
if (Common.isNotNull(excel.getMsg())) {
failConfig = getConfig(excel.getMsg(),errorMap);
if (failConfig != null) {
updateSocial.setYgsRemark(failConfig.getSimpleReason());
}
updateSocial.setYgsRemarkOld(handleRemark);
} else {
updateSocial.setYgsRemark(handleRemark);
updateSocial.setYgsRemarkOld(handleRemark);
}*/
handleRemark = "社保士兵提交成功!"; handleRemark = "社保士兵提交成功!";
remark = handleRemark; remark = handleRemark;
...@@ -2171,22 +2229,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -2171,22 +2229,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
updateSocial.setId(socialInfo.getId()); updateSocial.setId(socialInfo.getId());
} }
if ("是".equals(excel.getIsSuccess())) { if ("是".equals(excel.getIsSuccess())) {
// 2024-5-20 11:40:54 暂时将成功变为人工办理:
/*ysdHandleStatus = CommonConstants.SIX_STRING;
ysdList = new ArrayList<>();
ysdList.add(socialInfo.getDispatchId());
handleRemark = "社保士兵自动办理成功!";
remark = "社保士兵自动办理成功!!";
if (Common.isNotNull(excel.getMsg())) {
failConfig = getConfig(excel.getMsg(),errorMap);
if (failConfig != null) {
updateSocial.setYsdRemark(failConfig.getSimpleReason());
}
updateSocial.setYsdRemarkOld(handleRemark);
} else {
updateSocial.setYsdRemark(handleRemark);
updateSocial.setYsdRemarkOld(handleRemark);
}*/
handleRemark = "社保士兵提交成功:" + excel.getMsg(); handleRemark = "社保士兵提交成功:" + excel.getMsg();
remark = handleRemark; remark = handleRemark;
updateSocial.setYsdRemark(handleRemark); updateSocial.setYsdRemark(handleRemark);
...@@ -2248,7 +2290,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -2248,7 +2290,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
title += "派减"; title += "派减";
} }
title += "医疗、生育、大病办理失败!人工处理:" + failConfig.getSimpleReason(); title += "医疗、生育、大病办理失败!人工处理:" + failConfig.getSimpleReason();
this.doSocialTAuditInfo(socialInfo, title, "医疗、生育、大病办理失败!人工处理:" + failConfig.getSimpleReason(), failConfig.getSimpleReason(), user); this.doSocialTAuditInfo(socialInfo, title, title, failConfig.getSimpleReason(), user);
} }
} else { } else {
ysdHandleStatus = CommonConstants.FIVE_STRING; ysdHandleStatus = CommonConstants.FIVE_STRING;
...@@ -2318,7 +2360,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -2318,7 +2360,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
* @return: java.lang.String * @return: java.lang.String
**/ **/
private String getStatusName(int status) { private String getStatusName(int status) {
String[] arr = {"空","待办理","自动办理中","继续办理","止办理","人工处理","成功","提交成功"}; String[] arr = {"空","待办理","自动办理中","继续办理","止办理","人工处理","成功","提交成功"};
return arr[status]; return arr[status];
} }
...@@ -2329,10 +2371,38 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -2329,10 +2371,38 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
* @return: com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig * @return: com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig
**/ **/
private FailReasonConfig getConfig(String msg, Map<String, FailReasonConfig> errorMap) { private FailReasonConfig getConfig(String msg, Map<String, FailReasonConfig> errorMap) {
if (errorMap != null) { if (errorMap != null && Common.isNotNull(msg)) {
FailReasonConfig configTemp;
for (Map.Entry<String, FailReasonConfig> config : errorMap.entrySet()) { for (Map.Entry<String, FailReasonConfig> config : errorMap.entrySet()) {
if (msg.contains(config.getKey())) { if (msg.contains(config.getKey())) {
return config.getValue(); configTemp = config.getValue();
// 有截取且截取左右标识都在:
if (Common.isNotNull(configTemp.getIsReplace())
&& CommonConstants.ONE_STRING.equals(configTemp.getIsReplace())
&& Common.isNotNull(configTemp.getReplaceLeft())
&& Common.isNotNull(configTemp.getReplaceRight())
) {
String[] leftRes = msg.split(configTemp.getReplaceLeft());
if (leftRes.length>1) {
String result = null;
for (int i=1; i < leftRes.length; i++) {
if (leftRes[i].contains("】")) {
String[] rightRes = leftRes[i].split(configTemp.getReplaceRight());
result = rightRes[0];
break;
}
}
if (Common.isNotNull(result) && leftRes.length > 2
&& configTemp.getReplaceLeft().equals(configTemp.getReplaceRight())) {
result = leftRes[1];
}
if (Common.isNotNull(result)) {
configTemp.setSimpleReason(configTemp.getSimpleReason()
+ configTemp.getReplaceLeft() + result + configTemp.getReplaceRight());
}
}
}
return configTemp;
} }
} }
} }
......
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