From 5e5f146ce2c00c0f3f414da3e324d027b2056d74 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 23 Nov 2022 16:29:26 +0800 Subject: [PATCH 1/3] bug --- .../bat/wkflow/listener/bussLibrary/BLApplicantAfter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java index 6fbe21b9..5fed6d7b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java @@ -53,9 +53,13 @@ public class BLApplicantAfter implements TaskListener{ String username = object.getString("prcCreateUserName"); String prcName = ""; if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ - prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; + String standSort = object.getString("standSort"); + if (standSort.contains("[")) { + standSort = standSort.substring(2, standSort.length() - 2); + } + prcName = standSort+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订"; + prcName = "企标制修订"; } List nextUserList = new ArrayStack<>(); From 1a21c1576f3c6135f214128b3ec903d16bbceeb5 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 23 Nov 2022 16:32:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?174-=E6=92=A4=E5=9B=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussLibrary/BLApplicantAfter.java | 32 ------- .../ProcessStep4After.java | 83 +++++++++++++++++++ 2 files changed, 83 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java index 5fed6d7b..a7892a12 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java +++ b/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 esPrcRelationList1 = esPrcRelationService.list(esId1); - if (esPrcRelationList1 != null && !esPrcRelationList1.isEmpty()) { - String prcId1 = esPrcRelationList1.get(0).getPrcId(); - List list1 = taskService.createTaskQuery().processInstanceId(prcId1).active().list(); - if (list1 != null && !list1.isEmpty()) { - // 删除正在运行中的流程根据流程实例ID - runtimeService.deleteProcessInstance(prcId1, ""); - } - } - - List esPrcRelationList2 = esPrcRelationService.list(esId2); - if (esPrcRelationList2 != null && !esPrcRelationList2.isEmpty()) { - String prcId2 = esPrcRelationList2.get(0).getPrcId(); - List 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 esPrcRelationList = esPrcRelationService.list(esId); - if (esPrcRelationList != null && !esPrcRelationList.isEmpty()) { - String prcId = esPrcRelationList.get(0).getPrcId(); - List 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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index 088df37c..4ee41645 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java @@ -12,8 +12,11 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import net.sf.json.JSONArray; import net.sf.json.util.JSONTokener; import org.activiti.engine.ActivitiException; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.task.Task; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; @@ -38,6 +41,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 queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -267,5 +274,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 esPrcRelationList1 = esPrcRelationService.list(esId1); + if (esPrcRelationList1 != null && !esPrcRelationList1.isEmpty()) { + String prcIdGk1 = esPrcRelationList1.get(0).getPrcIdGk(); + List 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 list = taskService.createTaskQuery().processInstanceId(prcId1).active().list(); + if (list != null && !list.isEmpty()) { + // 删除正在运行中的流程根据流程实例ID + runtimeService.deleteProcessInstance(prcId1, ""); + } + } + } + + List esPrcRelationList2 = esPrcRelationService.list(esId2); + if (esPrcRelationList2 != null && !esPrcRelationList2.isEmpty()) { + String prcIdGk2 = esPrcRelationList2.get(0).getPrcIdGk(); + List 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 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 esPrcRelationList = esPrcRelationService.list(esId); + if (esPrcRelationList != null && !esPrcRelationList.isEmpty()) { + String prcIdGk = esPrcRelationList.get(0).getPrcIdGk(); + List 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 list = taskService.createTaskQuery().processInstanceId(prcId).active().list(); + if (list != null && !list.isEmpty()) { + // 删除正在运行中的流程根据流程实例ID + runtimeService.deleteProcessInstance(prcId, ""); + } + } + } + + } + } + } } From 84bcdda92de639549b5249b55ce8e53192f25dfb Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 24 Nov 2022 14:47:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 4 ++-- src/main/resources/application.yml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index cb33c47a..adbea5c4 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/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 { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 843c8366..611116e4 100644 --- a/src/main/resources/application.yml +++ b/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 - username: tempuser - password: Fting&8g35g#geg2 + url: jdbc:mysql://121.36.69.172:3307/foton-bat-wkflow-test?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8 + username: root + 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/#/