Commit 01e60210 authored by fangxinjiang's avatar fangxinjiang

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

parents 348cf714 c454abf0
...@@ -539,12 +539,12 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -539,12 +539,12 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
if (socialInfo == null || Common.isEmpty(socialInfo.getId())) { if (socialInfo == null || Common.isEmpty(socialInfo.getId())) {
return R.failed("未找到社保"); return R.failed("未找到社保");
} else { } else {
String handleRemark; TDispatchInfo disExist = dispatchInfoMapper.selectOne(Wrappers.<TDispatchInfo>query().lambda()
.eq(TDispatchInfo::getSocialId, id).last(CommonConstants.LAST_ONE_SQL));
String handleRemark = "派增";
// 有可以转的项目,则可以转 // 有可以转的项目,则可以转
boolean canUpdate = false; boolean canUpdate = false;
if (CommonConstants.ZERO_STRING.equals(socialInfo.getDispatchType())) { if (disExist != null && CommonConstants.ONE_STRING.equals(disExist.getType())) {
handleRemark = "派增";
} else {
handleRemark = "派减"; handleRemark = "派减";
} }
// 判断养工失转人工 // 判断养工失转人工
...@@ -582,7 +582,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -582,7 +582,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
} }
} }
// 更新社保和加日志 // 更新社保和加日志
return doUpdateCoreAndLog(id, user, socialInfo, handleRemark, canUpdate); return doUpdateCoreAndLog(user, socialInfo, handleRemark, canUpdate, disExist);
} }
} }
...@@ -618,12 +618,12 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -618,12 +618,12 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
if (socialInfo == null || Common.isEmpty(socialInfo.getId())) { if (socialInfo == null || Common.isEmpty(socialInfo.getId())) {
return R.failed("未找到社保"); return R.failed("未找到社保");
} else { } else {
String handleRemark; TDispatchInfo disExist = dispatchInfoMapper.selectOne(Wrappers.<TDispatchInfo>query().lambda()
.eq(TDispatchInfo::getSocialId, id).last(CommonConstants.LAST_ONE_SQL));
String handleRemark = "派增";
// 有可以转的项目,则可以转 // 有可以转的项目,则可以转
boolean canUpdate = false; boolean canUpdate = false;
if (CommonConstants.ZERO_STRING.equals(socialInfo.getDispatchType())) { if (disExist != null && CommonConstants.ONE_STRING.equals(disExist.getType())) {
handleRemark = "派增";
} else {
handleRemark = "派减"; handleRemark = "派减";
} }
// 判断养工失转自动化 // 判断养工失转自动化
...@@ -669,12 +669,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -669,12 +669,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
} }
} }
// 更新社保和加日志 // 更新社保和加日志
return doUpdateCoreAndLog(id, user, socialInfo, handleRemark, canUpdate); return doUpdateCoreAndLog(user, socialInfo, handleRemark, canUpdate, disExist);
} }
} }
/** /**
* @param id 社保ID
* @param user 当前登录人 * @param user 当前登录人
* @param socialInfo 社保信息 * @param socialInfo 社保信息
* @param handleRemark 操作备注 * @param handleRemark 操作备注
...@@ -684,16 +683,16 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -684,16 +683,16 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
* @Date: 2025/4/25 17:24 * @Date: 2025/4/25 17:24
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
private R<String> doUpdateCoreAndLog(String id, YifuUser user, TSocialInfo socialInfo, String handleRemark, boolean canUpdate) { private R<String> doUpdateCoreAndLog(YifuUser user, TSocialInfo socialInfo, String handleRemark
, boolean canUpdate, TDispatchInfo disExist) {
if (canUpdate) { if (canUpdate) {
this.updateById(socialInfo); this.updateById(socialInfo);
TDispatchInfo disExist = dispatchInfoMapper.selectOne(Wrappers.<TDispatchInfo>query().lambda()
.eq(TDispatchInfo::getSocialId, id).last(CommonConstants.LAST_ONE_SQL));
if (disExist != null) { if (disExist != null) {
socialInfo.setDispatchId(disExist.getId()); socialInfo.setDispatchId(disExist.getId());
} }
// 加流程进展明细 // 加流程进展明细
tAuditInfoService.doSaveAuditInfo(socialInfo, handleRemark, handleRemark, handleRemark, user, CommonConstants.TWO_STRING); tAuditInfoService.doSaveAuditInfo(socialInfo, handleRemark, handleRemark, handleRemark, user
, CommonConstants.ONE_STRING);
return R.ok("成功"); return R.ok("成功");
} else { } else {
return R.failed("状态未变更,请刷新后查看列表状态!"); return R.failed("状态未变更,请刷新后查看列表状态!");
......
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