Commit 4a83504f authored by hongguangwu's avatar hongguangwu

1.7.22-撤销取消电子签

parent 061332bf
...@@ -235,12 +235,15 @@ public class TSocialInfoController { ...@@ -235,12 +235,15 @@ public class TSocialInfoController {
@Operation(summary = "转自动化", description = "转自动化") @Operation(summary = "转自动化", description = "转自动化")
@GetMapping("/doAuto" ) @GetMapping("/doAuto" )
public R<String> doAuto(@RequestParam String id, @RequestParam String isSocial public R<String> doAuto(@RequestParam String id, @RequestParam String isSocial
, @RequestParam(required = false) String ybsfqzcb) { , @RequestParam(required = false) String ybsfqzcb,
@RequestParam(name = "isAutoYgsHmc", required = false) String isAutoYgsHmc,
@RequestParam(name = "isAutoYsdHmc", required = false) String isAutoYsdHmc,
@RequestParam(name = "isAutoLeaveDoc", required = false) String isAutoLeaveDoc) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) { if (user == null || Common.isEmpty(user.getId())) {
return R.failed("请登录!"); return R.failed("请登录!");
} }
return tSocialInfoService.doAuto(id, isSocial, ybsfqzcb, user); return tSocialInfoService.doAuto(id, isSocial, ybsfqzcb, user,isAutoYgsHmc,isAutoYsdHmc,isAutoLeaveDoc);
} }
/** /**
......
...@@ -135,6 +135,6 @@ public interface TSocialInfoService extends IService<TSocialInfo> { ...@@ -135,6 +135,6 @@ public interface TSocialInfoService extends IService<TSocialInfo> {
* @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>
**/ **/
R<String> doAuto(String id, String isSocial, String ybsfqzcb, YifuUser user); R<String> doAuto(String id, String isSocial, String ybsfqzcb, YifuUser user, String isAutoYgsHmc, String isAutoYsdHmc , String isAutoLeaveDoc);
} }
...@@ -4103,9 +4103,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4103,9 +4103,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//记录处理意见到派单 最新的意见会覆盖之前的,详情 到流程中查询 //记录处理意见到派单 最新的意见会覆盖之前的,详情 到流程中查询
dis.setHandleRemark(ServiceUtil.ifNullToEmpty(auditRemark)); dis.setHandleRemark(ServiceUtil.ifNullToEmpty(auditRemark));
dis.setAuditRemark(ServiceUtil.ifNullToEmpty(auditRemark)); dis.setAuditRemark(ServiceUtil.ifNullToEmpty(auditRemark));
if (Common.isNotNull(isAutoYgsHmc)) {
dis.setIsAutoYgsHmc(isAutoYgsHmc); dis.setIsAutoYgsHmc(isAutoYgsHmc);
}
if (Common.isNotNull(isAutoYsdHmc)) {
dis.setIsAutoYsdHmc(isAutoYsdHmc); dis.setIsAutoYsdHmc(isAutoYsdHmc);
}
if (Common.isNotNull(isAutoLeaveDoc)) {
dis.setIsAutoLeaveDoc(isAutoLeaveDoc); dis.setIsAutoLeaveDoc(isAutoLeaveDoc);
}
auditInfo.setDispatchInfoId(dis.getId()); auditInfo.setDispatchInfoId(dis.getId());
//更新派单状态 //更新派单状态
......
...@@ -609,7 +609,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -609,7 +609,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
@Override @Override
public R<String> doAutoBatch(List<String> idList, String isSocial, String ybsfqzcb, YifuUser user) { public R<String> doAutoBatch(List<String> idList, String isSocial, String ybsfqzcb, YifuUser user) {
for (String id : idList) { for (String id : idList) {
doAuto(id, isSocial, ybsfqzcb, user); doAuto(id, isSocial, ybsfqzcb, user, null, null, null);
} }
return R.ok("成功!"); return R.ok("成功!");
} }
...@@ -625,7 +625,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -625,7 +625,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
* @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>
**/ **/
@Override @Override
public R<String> doAuto(String id, String isSocial, String ybsfqzcb, YifuUser user) { public R<String> doAuto(String id, String isSocial, String ybsfqzcb, YifuUser user, String isAutoYgsHmc, String isAutoYsdHmc , String isAutoLeaveDoc) {
TSocialInfo socialInfo = this.getById(id); TSocialInfo socialInfo = this.getById(id);
if (socialInfo == null || Common.isEmpty(socialInfo.getId())) { if (socialInfo == null || Common.isEmpty(socialInfo.getId())) {
return R.failed("未找到社保"); return R.failed("未找到社保");
...@@ -634,10 +634,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -634,10 +634,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
.eq(TDispatchInfo::getSocialId, id) .eq(TDispatchInfo::getSocialId, id)
.eq(TDispatchInfo::getStatus, CommonConstants.TWO_STRING) .eq(TDispatchInfo::getStatus, CommonConstants.TWO_STRING)
.orderByDesc(TDispatchInfo::getCreateTime).last(CommonConstants.LAST_ONE_SQL)); .orderByDesc(TDispatchInfo::getCreateTime).last(CommonConstants.LAST_ONE_SQL));
if (disExist != null) {
String handleRemark = "派增"; String handleRemark = "派增";
// 有可以转的项目,则可以转 // 有可以转的项目,则可以转
boolean canUpdate = false; boolean canUpdate = false;
if (disExist != null && CommonConstants.ONE_STRING.equals(disExist.getType())) { if (CommonConstants.ONE_STRING.equals(disExist.getType())) {
handleRemark = "派减"; handleRemark = "派减";
} }
// 判断养工失转自动化 // 判断养工失转自动化
...@@ -720,11 +721,24 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -720,11 +721,24 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
if (CommonConstants.ONE_STRING.equals(ybsfqzcb)) { if (CommonConstants.ONE_STRING.equals(ybsfqzcb)) {
newYbsfqzcbValue = "“是”"; newYbsfqzcbValue = "“是”";
} }
handleRemark += oldYbsfqzcbValue+"→"+ newYbsfqzcbValue; handleRemark += oldYbsfqzcbValue + "→" + newYbsfqzcbValue;
}
if (Common.isNotNull(isAutoYgsHmc)) {
disExist.setIsAutoYgsHmc(isAutoYgsHmc);
} }
if (Common.isNotNull(isAutoYsdHmc)) {
disExist.setIsAutoYsdHmc(isAutoYsdHmc);
}
if (Common.isNotNull(isAutoLeaveDoc)) {
disExist.setIsAutoLeaveDoc(isAutoLeaveDoc);
}
dispatchInfoMapper.updateById(disExist);
// 更新社保和加日志 // 更新社保和加日志
return doUpdateCoreAndLog(user, socialInfo, handleRemark, canUpdate, disExist); return doUpdateCoreAndLog(user, socialInfo, handleRemark, canUpdate, disExist);
} }
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