Commit c454abf0 authored by hongguangwu's avatar hongguangwu

MVP1.7.10-社保转人工状态

parent 4e69142c
......@@ -541,7 +541,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
} else {
TDispatchInfo disExist = dispatchInfoMapper.selectOne(Wrappers.<TDispatchInfo>query().lambda()
.eq(TDispatchInfo::getSocialId, id).last(CommonConstants.LAST_ONE_SQL));
String handleRemark = "派增";;
String handleRemark = "派增";
// 有可以转的项目,则可以转
boolean canUpdate = false;
if (disExist != null && CommonConstants.ONE_STRING.equals(disExist.getType())) {
......@@ -582,7 +582,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
}
}
// 更新社保和加日志
return doUpdateCoreAndLog(id, user, socialInfo, handleRemark, canUpdate, disExist);
return doUpdateCoreAndLog(user, socialInfo, handleRemark, canUpdate, disExist);
}
}
......@@ -620,7 +620,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
} else {
TDispatchInfo disExist = dispatchInfoMapper.selectOne(Wrappers.<TDispatchInfo>query().lambda()
.eq(TDispatchInfo::getSocialId, id).last(CommonConstants.LAST_ONE_SQL));
String handleRemark = "派增";;
String handleRemark = "派增";
// 有可以转的项目,则可以转
boolean canUpdate = false;
if (disExist != null && CommonConstants.ONE_STRING.equals(disExist.getType())) {
......@@ -669,12 +669,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
}
}
// 更新社保和加日志
return doUpdateCoreAndLog(id, user, socialInfo, handleRemark, canUpdate, disExist);
return doUpdateCoreAndLog(user, socialInfo, handleRemark, canUpdate, disExist);
}
}
/**
* @param id 社保ID
* @param user 当前登录人
* @param socialInfo 社保信息
* @param handleRemark 操作备注
......@@ -684,7 +683,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
* @Date: 2025/4/25 17:24
* @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
private R<String> doUpdateCoreAndLog(YifuUser user, TSocialInfo socialInfo, String handleRemark
, boolean canUpdate, TDispatchInfo disExist) {
if (canUpdate) {
this.updateById(socialInfo);
......
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