diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java index 22bcf80aab..ecdc69588a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java @@ -31,6 +31,7 @@ import com.yxt.anrui.base.api.basedistributor.app.apply.AppDeptVo; import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo; import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorDto; import com.yxt.anrui.base.api.basedistributorapply.flow.*; +import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -129,6 +130,11 @@ public interface BaseDistributorApplyFeign { @GetMapping(value = "/getPreviousNodesForReject") ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody DistributorDelegateQuery distributorDelegateQuery); + + //---------------------------移动端-------------------------------------- @ApiOperation("查询本分公司下销售部门/销售专员/对应部门主管") @@ -164,7 +170,7 @@ public interface BaseDistributorApplyFeign { ResultBean deleteDistributor2(@PathVariable("sid") String sid); - //---------------------------------------移动端流程---------------------------------------------// + //---------------------------------------移动端流程---------------------------------------------// @ApiOperation("经销商备案提交") @PostMapping("/submitDistributor") public ResultBean submitDistributor(@RequestBody @Valid AppSubmitApplyDto dto); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java index 4af116fc62..974ad700c2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java @@ -124,6 +124,11 @@ public class BaseDistributorApplyFeignFallback implements BaseDistributorApplyFe return null; } + @Override + public ResultBean delegate(DistributorDelegateQuery distributorDelegateQuery) { + return null; + } + @Override public ResultBean> getSalesDept(String userSid, String orgPath) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/DistributorDelegateQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/DistributorDelegateQuery.java new file mode 100644 index 0000000000..358373ad51 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/DistributorDelegateQuery.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.base.api.basedistributorapply.flow; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 9:28 + */ +@Data +public class DistributorDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") +// @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; + + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java index 7bb605e8c4..80435abfcd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java @@ -149,6 +149,11 @@ public class BaseDistributorApplyRest implements BaseDistributorApplyFeign { return baseDistributorApplyService.getPreviousNodesForReject(query); } + @Override + public ResultBean delegate(DistributorDelegateQuery distributorDelegateQuery) { + return baseDistributorApplyService.delegate(distributorDelegateQuery); + } + @Override public ResultBean> getSalesDept(String userSid, String orgPath) { return baseDistributorApplyService.getSalesDept(userSid,orgPath); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java index d33ce9a4e8..b5ce39e820 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java @@ -46,9 +46,12 @@ import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowFeign; +import com.yxt.anrui.flowable.api.flowtask.DelegateQuery; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.*; @@ -120,6 +123,8 @@ public class BaseDistributorApplyService extends MybatisBaseService userVoResultBean1 = sysUserFeign.fetchBySid(userSid); + String userName = ""; + if (userVoResultBean1.getData() != null) { + userName = userVoResultBean1.getData().getName(); + } + ResultBean userVoResultBean2 = sysUserFeign.fetchBySid(assignee); + ProcessCommentDto processCommentDto = new ProcessCommentDto(); + processCommentDto.setReviewerSid(userSid); + if (userVoResultBean2.getData() != null) { + String changeName = userVoResultBean2.getData().getName(); + processCommentDto.setReviewer(userName); + processCommentDto.setContent(userName + "加签给" + changeName + "：" + views); + } + processCommentDto.setTime(new Date()); + processCommentDto.setProcessId(instanceId); + processCommentFeign.save(processCommentDto); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java index c66c7816b8..7c4fdfa8e5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java @@ -3,10 +3,7 @@ package com.yxt.anrui.terminal.api.autoservice.distributor; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DeptVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.CompleteDistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorFlowableQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorTaskQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.SubmitDistributorApplyDto; +import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -129,7 +126,7 @@ public interface DistributorFeign { @ResponseBody ResultBean deleteDistributor2(@PathVariable("sid") String sid); -////----------------------------------流程代码------------------------------------------------- + ////----------------------------------流程代码------------------------------------------------- // @ApiOperation("提交流程") @PostMapping("/submitDistributorBaseInfo") @@ -167,4 +164,10 @@ public interface DistributorFeign { @GetMapping("/getFlowOperateTitle") @ResponseBody ResultBean getFlowOperateTitle(@Valid @SpringQueryMap DistributorFlowableQuery query); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody AppDistributorDelegateQuery appDistributorDelegateQuery); + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/flowable/AppDistributorDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/flowable/AppDistributorDelegateQuery.java new file mode 100644 index 0000000000..acdb0de9e7 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/flowable/AppDistributorDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.autoservice.distributor.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 10:16 + */ +@Data +public class AppDistributorDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java index 96338e7c21..4583d5e8d3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java @@ -4,10 +4,7 @@ import com.yxt.anrui.terminal.api.autoservice.distributor.*; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DeptVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.CompleteDistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorFlowableQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorTaskQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.SubmitDistributorApplyDto; +import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -161,4 +158,9 @@ public class DistributorRest implements DistributorFeign { public ResultBean getFlowOperateTitle(DistributorFlowableQuery query) { return distributorService.getFlowOperateTitle(query); } + + @Override + public ResultBean delegate(AppDistributorDelegateQuery appDistributorDelegateQuery) { + return distributorService.delegate(appDistributorDelegateQuery); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java index 40f3e05e72..6ba2fa40e0 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java @@ -14,6 +14,7 @@ import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyFeign; import com.yxt.anrui.base.api.basedistributorapply.flow.AppSubmitApplyDto; import com.yxt.anrui.base.api.basedistributorapply.flow.BaseDistributorApplyCompleteDto; import com.yxt.anrui.base.api.basedistributorapply.flow.BaseDistributorApplyTaskQuery; +import com.yxt.anrui.base.api.basedistributorapply.flow.DistributorDelegateQuery; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -23,10 +24,7 @@ import com.yxt.anrui.terminal.api.autoservice.distributor.*; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DeptVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.CompleteDistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorFlowableQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorTaskQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.SubmitDistributorApplyDto; +import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -382,4 +380,12 @@ public class DistributorService { } return rb.success().setData(data); } + + public ResultBean delegate(AppDistributorDelegateQuery appDistributorDelegateQuery) { + ResultBean rb = ResultBean.fireFail(); + DistributorDelegateQuery distributorDelegateQuery = new DistributorDelegateQuery(); + BeanUtil.copyProperties(appDistributorDelegateQuery, distributorDelegateQuery); + ResultBean delegate = baseDistributorApplyFeign.delegate(distributorDelegateQuery); + return rb.success(); + } }