From 41c68541c96abaf644aa05f23695a2845418698f Mon Sep 17 00:00:00 2001 From: djz8236 Date: Sat, 13 May 2023 12:38:24 +0800 Subject: [PATCH] =?UTF-8?q?flowable=E9=9B=86=E6=88=90=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=8C=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/flowable/api/flow/FlowableFeign.java | 4 ++-- .../flowable/api/flowdefinition/FlowDefinitionFeign.java | 4 ++-- .../flowable/api/flowinstance/FlowInstanceFeign.java | 4 ++-- .../yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java | 4 ++-- .../flowable/api/processcomment/ProcessCommentFeign.java | 2 +- .../com/yxt/anrui/flowable/api/sysform/SysFormFeign.java | 4 ++-- .../anrui/flowable/api/sysformlink/SysFormLinkFeign.java | 4 ++-- .../yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java | 4 ++-- .../com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 1 + .../java/com/yxt/anrui/flowable/test/HolidayTestApi.java | 4 ++-- .../com/yxt/anrui/flowable/biz/flow/FlowableRest.java | 1 + .../yxt/anrui/flowable/biz/flowtask/FlowTaskService.java | 2 +- .../src/main/resources/application-pro.yml | 4 ++-- .../src/main/resources/application-test.yml | 4 ++-- .../src/main/resources/application.yml | 8 +++++--- 15 files changed, 29 insertions(+), 25 deletions(-) diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java index 4748b54b..9ae6ee48 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java @@ -13,8 +13,8 @@ import java.util.Map; @Api(tags = "Flowable") @FeignClient( - contextId = "anrui-flowable-Flowable", - name = "anrui-flowable", + contextId = "supervise-flowable-Flowable", + name = "supervise-flowable", path = "v1/flow", fallback = FlowableFallback.class) public interface FlowableFeign { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeign.java index a5a6282e..2297ada6 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeign.java @@ -17,8 +17,8 @@ import java.util.Map; * @description 流程定义 */ @FeignClient( - contextId = "anrui-flowable-FlowDefinition", - name = "anrui-flowable", + contextId = "supervise-flowable-FlowDefinition", + name = "supervise-flowable", path = "/v1/flowable/definition", fallback = FlowDefinitionFeignFallBack.class) public interface FlowDefinitionFeign { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeign.java index caa94f83..4abcca57 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeign.java @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.*; * @description 工作流流程实例管理 */ @FeignClient( - contextId = "anrui-flowable-FlowInstance", - name = "anrui-flowable", + contextId = "supervise-flowable-FlowInstance", + name = "supervise-flowable", path = "v1/flowable/instance", fallback = FlowInstanceFeignFallBack.class) public interface FlowInstanceFeign { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java index 376f0bdc..5a491ad0 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java @@ -23,8 +23,8 @@ import java.util.Map; * @description */ @FeignClient( - contextId = "anrui-flowable-FlowTask", - name = "anrui-flowable", + contextId = "supervise-flowable-FlowTask", + name = "supervise-flowable", path = "v1/flowable/task", fallback = FlowTaskFeignFallBack.class) public interface FlowTaskFeign { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java index 1212610c..119f5ded 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java @@ -50,7 +50,7 @@ import java.util.List; */ @FeignClient( contextId = "processcomment-ProcessComment", - name = "anrui-flowable", + name = "supervise-flowable", path = "v1/processcomment", fallback = ProcessCommentFeignFallback.class) public interface ProcessCommentFeign { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeign.java index d6e2e0da..e7c4132e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeign.java @@ -7,8 +7,8 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @FeignClient( - contextId = "anrui-flowable-SysFormFeign", - name = "anrui-flowable", + contextId = "supervise-flowable-SysFormFeign", + name = "supervise-flowable", path = "v1/flowable/form", fallback = SysFormFeignFallBack.class) public interface SysFormFeign { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeign.java index fbe4de0b..160a0530 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeign.java @@ -24,8 +24,8 @@ import java.util.Map; */ @Api(tags = "流程业务关联表") @FeignClient( - contextId = "anrui-flowable-SysFormLink", - name = "anrui-flowable", + contextId = "supervise-flowable-SysFormLink", + name = "supervise-flowable", path = "v1/sysformlink", fallback = SysFormLinkFeignFallback.class) public interface SysFormLinkFeign { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java index 225b9909..729c4418 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java @@ -13,8 +13,8 @@ import javax.validation.Valid; import java.util.List; @FeignClient( - contextId = "anrui-flowable-SysProUrlFeign", - name = "anrui-flowable", + contextId = "supervise-flowable-SysProUrlFeign", + name = "supervise-flowable", path = "v1/flowable/proUrl", fallback = SysProUrlFeignFallBack.class) public interface SysProUrlFeign { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index c42914e5..41c193b6 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -39,6 +39,7 @@ public enum ProcDefEnum { SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"), CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"), BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"), + PR("采购申请", "process_xb9q6w5v:8:1307630"), /******************************测试流程id*********************************************/ diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java index 09e60945..b56c9396 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-api/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java @@ -15,8 +15,8 @@ import javax.servlet.http.HttpServletResponse; * @description */ @FeignClient( - contextId = "yxt-anrui-flowable-holidayTest", - name = "yxt-anrui-flowable", + contextId = "yxt-supervise-flowable-holidayTest", + name = "supervise-flowable", path = "v1/flowable/holidaytest") public interface HolidayTestApi { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 7d6a7c5c..b9310365 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -435,6 +435,7 @@ public class FlowableRest implements FlowableFeign { } fl.getValues().put("businessSid",fl.getBusinessSid()); UpdateFlowFieldVo vo = new UpdateFlowFieldVo(); + fl.setComment("终止原因:"+fl.getComment()); ResultBean resultBean = flowableService.breakProcess(fl); if (!resultBean.getSuccess()) { return resultBean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 541c3228..1289ccc7 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -301,7 +301,7 @@ public class FlowTaskService extends MybatisBaseService