Commit 061332bf authored by hongguangwu's avatar hongguangwu

1.7.22-撤销取消电子签

parent d9c1730c
...@@ -543,7 +543,10 @@ public class TDispatchInfoController { ...@@ -543,7 +543,10 @@ public class TDispatchInfoController {
@RequestParam(name = "auditStatus", required = true) String auditStatus, @RequestParam(name = "auditStatus", required = true) String auditStatus,
@RequestParam(name = "auditRemark", required = false) String auditRemark, @RequestParam(name = "auditRemark", required = false) String auditRemark,
@RequestParam(name = "remark", required = false) String remark, @RequestParam(name = "remark", required = false) String remark,
@RequestParam(name = "isSingleAudit", required = false) String isSingleAudit) { @RequestParam(name = "isSingleAudit", required = false) String isSingleAudit,
@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 (Common.isEmpty(user)){ if (Common.isEmpty(user)){
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
...@@ -562,7 +565,7 @@ public class TDispatchInfoController { ...@@ -562,7 +565,7 @@ public class TDispatchInfoController {
List<String> friendIdList = new ArrayList<>(); List<String> friendIdList = new ArrayList<>();
List<String> soldierIdList = new ArrayList<>(); List<String> soldierIdList = new ArrayList<>();
R<List<ErrorMessage>> errorList = tDispatchInfoService.addApplyAudit(idList,auditStatus,auditRemark R<List<ErrorMessage>> errorList = tDispatchInfoService.addApplyAudit(idList,auditStatus,auditRemark
,remark, isSingleAudit,friendIdList,soldierIdList); ,remark, isSingleAudit,friendIdList,soldierIdList,isAutoYgsHmc,isAutoYsdHmc,isAutoLeaveDoc);
//推送税友 //推送税友
if (!friendIdList.isEmpty()) { if (!friendIdList.isEmpty()) {
socialTask.pushFriend(friendIdList); socialTask.pushFriend(friendIdList);
......
...@@ -85,10 +85,11 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> { ...@@ -85,10 +85,11 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
DispatchDetailVo getSocialAndFundInfoById(String id); DispatchDetailVo getSocialAndFundInfoById(String id);
List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus
, String auditRemark, String remark, String isSingleAudit,List<String> friendIdList,List<String> soldierIdList); , String auditRemark, String remark, String isSingleAudit,List<String> friendIdList,List<String> soldierIdList
, String isAutoYgsHmc, String isAutoYsdHmc , String isAutoLeaveDoc);
R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark
, String isSingleAudit,List<String> friendIdList,List<String> soldierIdList); , String isSingleAudit,List<String> friendIdList,List<String> soldierIdList, String isAutoYgsHmc, String isAutoYsdHmc , String isAutoLeaveDoc);
// isAutoFlag:是否社保士兵的自动办理,true :是 // isAutoFlag:是否社保士兵的自动办理,true :是
R<List<ErrorMessage>> addApplyHandle(List<String> ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark, YifuUser user, boolean isAutoHandle); R<List<ErrorMessage>> addApplyHandle(List<String> ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark, YifuUser user, boolean isAutoHandle);
......
...@@ -3791,7 +3791,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3791,7 +3791,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
**/ **/
@Override @Override
public List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus public List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus
, String auditRemark, String remark, String isSingleAudit,List<String> friendIdList,List<String> soldierIdList) { , String auditRemark, String remark, String isSingleAudit,List<String> friendIdList,List<String> soldierIdList
, String isAutoYgsHmc, String isAutoYsdHmc , String isAutoLeaveDoc) {
List<ErrorMessage> errorList = new ArrayList<>(); List<ErrorMessage> errorList = new ArrayList<>();
if (!Common.isNotNull(idsList)) { if (!Common.isNotNull(idsList)) {
errorList.add(new ErrorMessage(-1, CommonConstants.PARAM_IS_NOT_ERROR)); errorList.add(new ErrorMessage(-1, CommonConstants.PARAM_IS_NOT_ERROR));
...@@ -4102,6 +4103,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4102,6 +4103,10 @@ 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));
dis.setIsAutoYgsHmc(isAutoYgsHmc);
dis.setIsAutoYsdHmc(isAutoYsdHmc);
dis.setIsAutoLeaveDoc(isAutoLeaveDoc);
auditInfo.setDispatchInfoId(dis.getId()); auditInfo.setDispatchInfoId(dis.getId());
//更新派单状态 //更新派单状态
if (CommonConstants.ZERO_INT == flag) { if (CommonConstants.ZERO_INT == flag) {
...@@ -4473,7 +4478,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4473,7 +4478,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@ShardingTransactionType(TransactionType.BASE) @ShardingTransactionType(TransactionType.BASE)
@Override @Override
public R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark public R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark
, String isSingleAudit,List<String> friendIdList,List<String> soldierIdList) { , String isSingleAudit,List<String> friendIdList,List<String> soldierIdList, String isAutoYgsHmc, String isAutoYsdHmc , String isAutoLeaveDoc) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (null == user) { if (null == user) {
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
...@@ -4493,7 +4498,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4493,7 +4498,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return R.failed("派单审核状态参数异常:0待审核 1审核通过 2审核不通过"); return R.failed("派单审核状态参数异常:0待审核 1审核通过 2审核不通过");
} }
List<ErrorMessage> errorInfo = addBatchApplyAudit(ids, user, flag, auditStatus List<ErrorMessage> errorInfo = addBatchApplyAudit(ids, user, flag, auditStatus
, Common.isNullToString(auditRemark), remark, isSingleAudit,friendIdList,soldierIdList); , Common.isNullToString(auditRemark), remark, isSingleAudit,friendIdList,soldierIdList, isAutoYgsHmc, isAutoYsdHmc, isAutoLeaveDoc);
return R.ok(errorInfo, "派单审核结果:"); return R.ok(errorInfo, "派单审核结果:");
} catch (Exception e) { } catch (Exception e) {
log.error("派单审核异常:" + e.getMessage()); log.error("派单审核异常:" + e.getMessage());
......
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