Merge remote-tracking branch 'origin/develop_new' into develop_new

src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

@@ -20,9 +20,9 @@ import java.util.Map;
 import java.util.Set;
 
 @Component
-@FeignClient(value = "FotonLAWSSystem",path="/api",url="")
+//@FeignClient(value = "FotonLAWSSystem",path="/api",url="")
 //线上部署用
-//@FeignClient(value = "FotonLAWSSystem-test",path="/api",url="")
+@FeignClient(value = "FotonLAWSSystem-test",path="/api",url="")
 @RequestMapping("/")
 public interface LawsUserInfoService {
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java

@@ -158,42 +158,10 @@ public class BLApplicantAfter implements TaskListener{
                 String esId1 = object.getString("esId1");
                 String esId2 = object.getString("esId2");
 
-                List<EsPrcRelation> esPrcRelationList1 = esPrcRelationService.list(esId1);
-                if (esPrcRelationList1 != null && !esPrcRelationList1.isEmpty()) {
-                    String prcId1 = esPrcRelationList1.get(0).getPrcId();
-                    List<Task> list1 = taskService.createTaskQuery().processInstanceId(prcId1).active().list();
-                    if (list1 != null && !list1.isEmpty()) {
-                        // 删除正在运行中的流程根据流程实例ID
-                        runtimeService.deleteProcessInstance(prcId1, "");
-                    }
-                }
-
-                List<EsPrcRelation> esPrcRelationList2 = esPrcRelationService.list(esId2);
-                if (esPrcRelationList2 != null && !esPrcRelationList2.isEmpty()) {
-                    String prcId2 = esPrcRelationList2.get(0).getPrcId();
-                    List<Task> list2 = taskService.createTaskQuery().processInstanceId(prcId2).active().list();
-                    if (list2 != null && !list2.isEmpty()) {
-                        // 删除正在运行中的流程根据流程实例ID
-                        runtimeService.deleteProcessInstance(prcId2, "");
-                    }
-                }
-
                 // 删除旧的 计划和流程关联关系， 因为 一条计划只对应一条企标制修订流程
                 esPrcRelationService.delEsPrcRelation(esId1);
                 esPrcRelationService.delEsPrcRelation(esId2);
 
-            } else if ("2".equals(type) || "3".equals(type) || "4".equals(type)) {
-                String esId = object.getString("esId");
-                List<EsPrcRelation> esPrcRelationList = esPrcRelationService.list(esId);
-                if (esPrcRelationList != null && !esPrcRelationList.isEmpty()) {
-                    String prcId = esPrcRelationList.get(0).getPrcId();
-                    List<Task> list = taskService.createTaskQuery().processInstanceId(esPrcRelationList.get(0).getPrcId()).active().list();
-                    if (list != null && !list.isEmpty()) {
-                        // 删除正在运行中的流程根据流程实例ID
-                        runtimeService.deleteProcessInstance(prcId, "");
-                    }
-                }
-
             }
             // 修改 计划和流程关联关系
             esPrcRelationService.modifyEsPrcRelation(object.getString("nowEsId"), delegateTask.getProcessInstanceId(), null, null);

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java

@@ -40,6 +40,10 @@ public class ProcessStep4After implements TaskListener {
 
         IEsPrcRelationService esPrcRelationService = SpringContextUtil.getBean(IEsPrcRelationService.class);
 
+        TaskService taskService = SpringContextUtil.getBean(TaskService.class);
+
+        RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class);
+
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -322,5 +326,81 @@ public class ProcessStep4After implements TaskListener {
             }
         }
 
+        // 撤回对应的计划管控流程
+        //1合并 2延期 3取消 4更名 5立项
+        if (StringUtils.isNotBlank(type)) {
+            if ("1".equals(type)) {
+                String esId1 = object.getString("esId1");
+                String esId2 = object.getString("esId2");
+
+                List<EsPrcRelation> esPrcRelationList1 = esPrcRelationService.list(esId1);
+                if (esPrcRelationList1 != null && !esPrcRelationList1.isEmpty()) {
+                    String prcIdGk1 = esPrcRelationList1.get(0).getPrcIdGk();
+                    List<Task> list1 = taskService.createTaskQuery().processInstanceId(prcIdGk1).active().list();
+                    if (list1 != null && !list1.isEmpty()) {
+                        String nowTaskInfo1 = list1.get(0).getName();
+                        if ("技术标准起草".equals(nowTaskInfo1)) {
+                            // 删除正在运行中的流程根据流程实例ID
+                            runtimeService.deleteProcessInstance(prcIdGk1, "");
+                        }
+                    } else {
+                        String prcId1 = esPrcRelationList1.get(0).getPrcId();
+                        List<Task> list = taskService.createTaskQuery().processInstanceId(prcId1).active().list();
+                        if (list != null && !list.isEmpty()) {
+                            // 删除正在运行中的流程根据流程实例ID
+                            runtimeService.deleteProcessInstance(prcId1, "");
+                        }
+                    }
+                }
+
+                List<EsPrcRelation> esPrcRelationList2 = esPrcRelationService.list(esId2);
+                if (esPrcRelationList2 != null && !esPrcRelationList2.isEmpty()) {
+                    String prcIdGk2 = esPrcRelationList2.get(0).getPrcIdGk();
+                    List<Task> list2 = taskService.createTaskQuery().processInstanceId(prcIdGk2).active().list();
+                    if (list2 != null && !list2.isEmpty()) {
+                        String nowTaskInfo2 = list2.get(0).getName();
+                        if ("技术标准起草".equals(nowTaskInfo2)) {
+                            // 删除正在运行中的流程根据流程实例ID
+                            runtimeService.deleteProcessInstance(prcIdGk2, "");
+                        }
+                    } else {
+                        String prcId2 = esPrcRelationList2.get(0).getPrcId();
+                        List<Task> list = taskService.createTaskQuery().processInstanceId(prcId2).active().list();
+                        if (list != null && !list.isEmpty()) {
+                            // 删除正在运行中的流程根据流程实例ID
+                            runtimeService.deleteProcessInstance(prcId2, "");
+                        }
+                    }
+                }
+
+                // 删除旧的 计划和流程关联关系， 因为 一条计划只对应一条企标制修订流程
+                esPrcRelationService.delEsPrcRelation(esId1);
+                esPrcRelationService.delEsPrcRelation(esId2);
+
+            } else if ("2".equals(type) || "3".equals(type) || "4".equals(type)) {
+                String esId = object.getString("esId");
+                List<EsPrcRelation> esPrcRelationList = esPrcRelationService.list(esId);
+                if (esPrcRelationList != null && !esPrcRelationList.isEmpty()) {
+                    String prcIdGk = esPrcRelationList.get(0).getPrcIdGk();
+                    List<Task> listGk = taskService.createTaskQuery().processInstanceId(esPrcRelationList.get(0).getPrcIdGk()).active().list();
+                    if (listGk != null && !listGk.isEmpty()) {
+                        String nowTaskInfo = listGk.get(0).getName();
+                        if ("技术标准起草".equals(nowTaskInfo)) {
+                            // 删除正在运行中的流程根据流程实例ID
+                            runtimeService.deleteProcessInstance(prcIdGk, "");
+                        }
+                    } else {
+                        String prcId = esPrcRelationList.get(0).getPrcId();
+                        List<Task> list = taskService.createTaskQuery().processInstanceId(prcId).active().list();
+                        if (list != null && !list.isEmpty()) {
+                            // 删除正在运行中的流程根据流程实例ID
+                            runtimeService.deleteProcessInstance(prcId, "");
+                        }
+                    }
+                }
+
+            }
+        }
+
     }
 }

src/main/resources/application.yml

@@ -15,12 +15,12 @@ logging:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://10.100.5.117:4201/eureka/
+      defaultZone: http://127.0.0.1:8123/eureka/
   instance:
     prefer-ip-address: true
 spring:
   application:
-    name: bat-wkflow
+    name: bat-wkflow-test
   http:
     encoding:
       charset: UTF-8
@@ -33,9 +33,9 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.100.5.111:3306/foton_bat_wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
+    url: jdbc:mysql://121.36.69.172:3307/foton-bat-wkflow-test?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
-    username: tempuser
+    username: root
-    password: Fting&8g35g#geg2
+    password: hzwlsoft.com
   activiti:
     database-schema-update: true
     # 自动部署验证设置:true-开启（默认）、false-关闭
@@ -44,10 +44,10 @@ spring:
     active: dev
   # 相关服务配置同业务系统
   rabbitmq:
-    host: 10.100.5.119
+    host: 121.36.69.172
     port: 5672
     username: admin
-    password: foton@admin
+    password: hzwlsoft.com
     listener:
       direct:
         # 默认加载 发版 需改为 true
@@ -102,7 +102,7 @@ ribbon:
 
 # 配置 是否 启用 OA
 oa:
-  flag: true
+  flag: false
 
 # 配置前端服务全路径地址 如下 /#/
 webUrl: https://srms.foton.com.cn/#/