flowable集成完成，采购申请流程的测试

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",
+        contextId = "supervise-flowable-Flowable",
-        name = "anrui-flowable",
+        name = "supervise-flowable",
         path = "v1/flow",
         fallback = FlowableFallback.class)
 public interface FlowableFeign {

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",
+        contextId = "supervise-flowable-FlowDefinition",
-        name = "anrui-flowable",
+        name = "supervise-flowable",
         path = "/v1/flowable/definition",
         fallback = FlowDefinitionFeignFallBack.class)
 public interface FlowDefinitionFeign {

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",
+        contextId = "supervise-flowable-FlowInstance",
-        name = "anrui-flowable",
+        name = "supervise-flowable",
         path = "v1/flowable/instance",
         fallback = FlowInstanceFeignFallBack.class)
 public interface FlowInstanceFeign {

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",
+        contextId = "supervise-flowable-FlowTask",
-        name = "anrui-flowable",
+        name = "supervise-flowable",
         path = "v1/flowable/task",
         fallback = FlowTaskFeignFallBack.class)
 public interface FlowTaskFeign {

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 {

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",
+        contextId = "supervise-flowable-SysFormFeign",
-        name = "anrui-flowable",
+        name = "supervise-flowable",
         path = "v1/flowable/form",
         fallback = SysFormFeignFallBack.class)
 public interface SysFormFeign {

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",
+        contextId = "supervise-flowable-SysFormLink",
-        name = "anrui-flowable",
+        name = "supervise-flowable",
         path = "v1/sysformlink",
         fallback = SysFormLinkFeignFallback.class)
 public interface SysFormLinkFeign {

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",
+        contextId = "supervise-flowable-SysProUrlFeign",
-        name = "anrui-flowable",
+        name = "supervise-flowable",
         path = "v1/flowable/proUrl",
         fallback = SysProUrlFeignFallBack.class)
 public interface SysProUrlFeign {

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*********************************************/

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",
+        contextId = "yxt-supervise-flowable-holidayTest",
-        name = "yxt-anrui-flowable",
+        name = "supervise-flowable",
         path = "v1/flowable/holidaytest")
 public interface HolidayTestApi {
 

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<UpdateFlowFieldVo> resultBean = flowableService.breakProcess(fl);
         if (!resultBean.getSuccess()) {
             return resultBean;

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<FlowTaskMapper, FlowTask
                     Date startTime = histIns.getStartTime();
                     flowTask.setCreateTime(startTime);
                     Date endTime = histIns.getEndTime();
-                    flowTask.setFinishTime(endTime.toString());
+                    flowTask.setFinishTime(endTime==null?"":endTime.toString());
                     //processInstance.get("END_TIME_") timestap类型不能转string
                     String end_time_ = processInstance.get("END_TIME_") == null ? "" : "end";
                     flowTask.setProcessEndTime(end_time_);

yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/application-pro.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://120.46.172.184:3306/anrui_flowable?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://127.0.0.1:3306/supervise_flowable?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
-    password: '@anrui18033887500'
+    password: 1LAiGz$t1*Iw
   cloud:
     nacos:
       discovery:

yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://39.104.100.138:3306/anrui_flowable?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://127.0.0.1:3306/supervise_flowable?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
-    password: yxt_mysql_138
+    password: 1LAiGz$t1*Iw
   cloud:
     nacos:
       discovery:

yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   application:
-    name: anrui-flowable
+    name: supervise-flowable
   profiles:
-    active: devv
+    active: pro
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
@@ -22,7 +22,9 @@ spring:
   mvc:
     async:
       request-timeout: 20000
-
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
 
 server:
   port: 7001