From f726ac195dd9fc6b169229bf65cdd0c438a80818 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Wed, 20 Oct 2021 15:58:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?update=EF=BC=9A=E7=A6=8F=E7=94=B0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_mq/service/CreateMQService.java | 4 +-- .../service/SendDoneMQService.java | 6 ++-- .../business_mq/service/SendMQService.java | 6 ++-- .../service/impl/WebServiceOAServiceImpl.java | 10 +++--- src/main/resources/application.yml | 35 +++++++------------ 5 files changed, 25 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java index 1a488b10..b1f8ea9e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java @@ -42,7 +42,7 @@ public class CreateMQService { if(oaFlag){ //发送消息队列 - this.rabbitTemplate.convertAndSend("sendDone-exchange_MQ_GSAR", "sendDone-key_MQ_GSAR", object); + this.rabbitTemplate.convertAndSend("sendDone-exchange_MQ_GSAR_RELEASE", "sendDone-key_MQ_GSAR_RELEASE", object); } } @@ -55,7 +55,7 @@ public class CreateMQService { if(oaFlag) { //发送消息队列 - this.rabbitTemplate.convertAndSend("send-exchange_MQ_GSAR", "send-key_MQ_GSAR", object); + this.rabbitTemplate.convertAndSend("send-exchange_MQ_GSAR_RELEASE", "send-key_MQ_GSAR_RELEASE", object); } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java index aa16152b..59cabdfc 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java @@ -50,9 +50,9 @@ public class SendDoneMQService { private LawsUserInfoService lawsUserInfoService; @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = "createMQDone_SQ_GSAR", durable = "true"), - exchange = @Exchange(value = "sendDone-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"), - key = "sendDone-key_MQ_GSAR")) + value = @Queue(value = "createMQDone_SQ_GSAR_RELEASE", durable = "true"), + exchange = @Exchange(value = "sendDone-exchange_MQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"), + key = "sendDone-key_MQ_GSAR_RELEASE")) public void createMQDone(NotifyTodoSendContext object, Message message, Channel channel) throws Exception{ try{ try{ diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java index 46eaff1b..1333bc26 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java @@ -56,9 +56,9 @@ public class SendMQService { private LawsUserInfoService lawsUserInfoService; @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = "createMQ_SQ_GSAR", durable = "true"), - exchange = @Exchange(value = "send-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"), - key = "send-key_MQ_GSAR")) + value = @Queue(value = "createMQ_SQ_GSAR_RELEASE", durable = "true"), + exchange = @Exchange(value = "send-exchange_MQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"), + key = "send-key_MQ_GSAR_RELEASE")) public void createMQ(BusProcessNew object, Message message, Channel channel) throws Exception{ try{ try{ diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java index f7ba0e41..f7a6d134 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java @@ -49,7 +49,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { private String errMes = "异常信息:"; private String api_key = "OA"; - private String api_secret = "TEST_oa201611241710"; + private String api_secret = "oa201611241710"; @Value("${webUrl}") private String webUrl; @@ -296,7 +296,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setCONSUMER("SRMS"); head.setCOUNT("1"); - head.setPASSWORD("TEST_oa201611241710"); + head.setPASSWORD("oa201611241710"); head.setSRVLEVEL("1"); List list = new ArrayList<>(); list.add(notifyTodoSendContext); @@ -306,7 +306,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { Map mapCtr = new TreeMap<>(); mapCtr.put("Authorization",credentials); log.info("处理完文件数据，开始请求发送已办接口数据：【"+sdf.format(new Date())+"】"); - result = okHttpUtil.postForJson("http://172.24.12.64:85/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1021_SendNotifyTodo_PS",json.toString(),mapCtr); + result = okHttpUtil.postForJson("https://fesbnew.foton.com.cn/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1021_SendNotifyTodo_PS",json.toString(),mapCtr); log.info("请求发送已办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】"); // JSONObject jsonObject = JSONObject.parseObject(result); if(!result.contains("操作成功")){ @@ -339,7 +339,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setCONSUMER("SRMS"); head.setCOUNT("1"); - head.setPASSWORD("TEST_oa201611241710"); + head.setPASSWORD("oa201611241710"); head.setSRVLEVEL("1"); List list = new ArrayList<>(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); @@ -374,7 +374,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { Map mapCtr = new TreeMap<>(); mapCtr.put("Authorization",credentials); log.info("处理完文件数据，开始请求发送待办接口数据：【"+sdf.format(new Date())+"】"); - result = okHttpUtil.postForJson("http://172.24.12.64:85/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1019_SendTodo_PS",json.toString(),mapCtr); + result = okHttpUtil.postForJson("https://fesbnew.foton.com.cn/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1019_SendTodo_PS",json.toString(),mapCtr); log.info("请求发送待办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】"); // JSONObject jsonObject = JSONObject.parseObject(result); if(!result.contains("操作成功")){ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6a31255a..7c860204 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,7 +1,7 @@ wkfow: auth: fk-auth server: - port: 17211 + port: 4203 tomcat: uri-encoding: UTF-8 servlet: @@ -15,7 +15,9 @@ logging: eureka: client: serviceUrl: - defaultZone: http://62.234.136.153:8761/eureka/ + defaultZone: http://10.100.5.117:4201/eureka/ + instance: + prefer-ip-address: true spring: application: name: bat-wkflow @@ -31,12 +33,9 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://123.56.177.15:3306/foton-bat-wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8 - username: root - password: RsLDRj3dXtSwYjBI -# url: jdbc:mysql://127.0.0.1:3306/foton-bat-wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8 -# username: root -# password: root + 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 activiti: database-schema-update: true # 自动部署验证设置:true-开启（默认）、false-关闭 @@ -52,7 +51,7 @@ spring: listener: direct: # 默认加载 发版 需改为 true - auto-startup: false + auto-startup: true simple: concurrency: 5 max-concurrency: 10 @@ -66,7 +65,7 @@ spring: #最大重试9次 max-attempts: 6 # 消费者默认加载 发版 需改为 true - auto-startup: false + auto-startup: true # ============================================================================= # 邮箱配置-1 @@ -103,20 +102,10 @@ ribbon: # 配置 是否 启用 OA oa: - flag: false + flag: true # 配置前端服务全路径地址 如下 /#/ -webUrl: http://62.234.136.153:8038/#/ +webUrl: https://slrs.foton.com.cn/#/ -# OA 接受任务定时器是否启用 -isNotScheduled: false - -buss: - edit: - file: - path: /data/slrs/file/ - down: - file: -# path: https://srms.foton.com.cn/file/ - path: http://foton.natapp1.cc/file/ +isNotScheduled: true From 4b1fc3896929836e39f14de56ac6db3937317391 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Tue, 16 Nov 2021 14:03:37 +0800 Subject: [PATCH 2/6] feat: There is no way the --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7c860204..56ff708e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -105,7 +105,7 @@ oa: flag: true # 配置前端服务全路径地址 如下 /#/ -webUrl: https://slrs.foton.com.cn/#/ +webUrl: https://srms.foton.com.cn/#/ isNotScheduled: true From 9031326540cfeec1e5e870d2c209a8f45739620b Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sun, 21 Nov 2021 09:22:01 +0800 Subject: [PATCH 3/6] feat: There is no way the --- src/main/resources/application.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 56ff708e..a75a413b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -44,10 +44,10 @@ spring: active: dev # 相关服务配置同业务系统 rabbitmq: - host: 62.234.136.153 + host: 10.100.5.119 port: 5672 - username: guest - password: guest + username: admin + password: foton@admin listener: direct: # 默认加载 发版 需改为 true From 0f4d0121d373e8489ca06234119d2852e844e23f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 13 Dec 2021 20:41:04 +0800 Subject: [PATCH 4/6] commit --- .../ydw/bat/wkflow/business_activiti/task/TaskController.java | 2 +- .../listener/KCSTPReviewProcess/SubMinisterReviewAfter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index 08364c7f..e35459f9 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -168,4 +168,4 @@ public class TaskController { } return list; } -} \ No newline at end of file +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java index 79d68d6b..5d808db6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java @@ -61,7 +61,7 @@ public class SubMinisterReviewAfter implements TaskListener { String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "重点认证标准/政策合规性项目审查流程-法规认证副总监批准"; + String prcName = "重点认证标准/政策合规性项目审查流程-法规认证副总监审定"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From efbad17f672e7481326370fdcd386ee4076bd953 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Dec 2021 13:53:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"=E6=94=BF=E7=AD=96=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ac0055ae --- .../SubViceDirectorAfter.java | 136 ------------------ 1 file changed, 136 deletions(-) delete mode 100644 src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java deleted file mode 100644 index 9526cf8c..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.ydw.bat.wkflow.listener.KCSTPReviewProcess; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; -import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; -import com.ydw.bat.wkflow.business_main.datas.entity.Datas; -import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; -import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; -import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; -import com.ydw.bat.wkflow.util.SpringContextUtil; -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.delegate.TaskListener; -import org.apache.commons.lang.StringUtils; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -/** - * 副总监审核 - */ -public class SubViceDirectorAfter implements TaskListener { - @Override - public void notify(DelegateTask delegateTask) { - IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); - IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); - IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); - - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); - delegateTask.setVariable("objectJson",object); - - - /** - * next 结束 - */ - List nextUserList = new ArrayList(); - if ("0".equals(object.getString("actionFlag"))){ - delegateTask.setVariable("lawsProveViceChiefVerify",0); - - //流程结束 - func2(delegateTask, busBean, object, "0", busProcessNameService); - - }else { - //TODO 驳回 - String startUser = object.getString("startUser"); - delegateTask.setVariable("startUser",startUser); - nextUserList = Arrays.asList(startUser.split(",")); - - - delegateTask.setVariable("lawsProveViceChiefVerify",1); - - - } - - - //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); -// object.getString("standName") - String standName = ""; - String prcName = "重点认证标准/政策合规性项目审查流程-责任部门领导任务下发"; - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); - BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - if(one1!=null){ -// one1.setOverTime(OVERTIME); - one1.setPrcType("laws3"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); - } - - // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); - - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); - } - } - } - - private String verifyObj(String str){ - return (str == null || str.equals("")) ? "" : str; - } - - //流程结束 - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); - BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - if (one2 != null) { - //one2.setPrcName("入库流程结束"); - one2.setOverTime(OVERTIME); - one2.setPrcType("laws3"); - busProcessNameService.saveOrUpdate(one2); - } - - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one1 = busBean.getOne(queryWrapper1); - if (one1 != null) { - one1.setCommitFlag(commitFlag); - one1.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(one1); - } - } -} From 195a26ccfe16ca3404f132cd8da4050e1a2754a5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Dec 2021 16:47:14 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=88=91=E7=9A=84.java?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policyCommentProcess/DirectorAfter.java | 109 ++++++++++++++++++ .../policyCommentProcess/DirectorBefore.java | 37 ++++++ .../DistributionBefore.java | 39 +++++++ .../DockerReviewBefore.java | 37 ++++++ .../EngineerReviewBefore.java | 37 ++++++ .../EngineerRevisionAfter.java | 10 +- .../FillCommentBefore.java | 37 ++++++ .../policyCommentProcess/LaunchAfter.java | 96 +++++++++++++++ .../policyCommentProcess/LaunchBefore.java | 36 ++++++ .../MinisterReviewBefore.java | 37 ++++++ .../ViceDirectorBefore.java | 39 +++++++ 11 files changed, 509 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java new file mode 100644 index 00000000..af032498 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java @@ -0,0 +1,109 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +/** + * 总监审核 + */ +public class DirectorAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + + + if ("0".equals(object.getString("actionFlag"))){ + delegateTask.setVariable("lawsProveChiefVerify",0); + } + + + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); +// object.getString("standName") + String standName = ""; + String prcName = "政策征求意见流程"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("1"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + if (object.getString("lawsProveChiefVerify")=="0"){ + func2(delegateTask, busBean, object, "0", busProcessNameService); + } + + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } + + //流程结束 + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + //one2.setPrcName("入库流程结束"); + one2.setOverTime(OVERTIME); + one2.setPrcType("laws2"); + busProcessNameService.saveOrUpdate(one2); + } + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java new file mode 100644 index 00000000..69a66eb9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java @@ -0,0 +1,37 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; +/** + * 总监审核 + */ +public class DirectorBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzrkStep2?prcType=laws2"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionBefore.java new file mode 100644 index 00000000..c4142677 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionBefore.java @@ -0,0 +1,39 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +/** + * 任务下发 + */ +public class DistributionBefore implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzrkStep2?prcType=laws2"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java new file mode 100644 index 00000000..5c2a65c9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java @@ -0,0 +1,37 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; +/** + * 对接人审核 + */ +public class DockerReviewBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzrkStep2?prcType=laws2"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewBefore.java new file mode 100644 index 00000000..8e2fffc2 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewBefore.java @@ -0,0 +1,37 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; +/** + * 工程师审核 + */ +public class EngineerReviewBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzrkStep2?prcType=laws2"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java index 768b0e5c..3026f420 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java @@ -40,12 +40,12 @@ public class EngineerRevisionAfter implements TaskListener { JSONObject form = JSONObject.parseObject(object.getString("form")); String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId"); - if(StringUtils.isNotBlank(lawsProveMinister)){ + if(StringUtils.isNotBlank(lawsProveMinister)){ - delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister); - nextUserList= Arrays.asList(lawsProveMinister.split(",")); - delegateTask.addCandidateUsers(nextUserList); - } + delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister); + nextUserList= Arrays.asList(lawsProveMinister.split(",")); + delegateTask.addCandidateUsers(nextUserList); + } //截止时间 流程描述 创建人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentBefore.java new file mode 100644 index 00000000..a83486c6 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentBefore.java @@ -0,0 +1,37 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; +/** + * 工程师填写意见 + */ +public class FillCommentBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzrkStep2?prcType=laws2"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java new file mode 100644 index 00000000..b7eedeca --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java @@ -0,0 +1,96 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +public class LaunchAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if(StringUtils.isNotBlank(object.getString("responseDockerId"))){ + nextUserList= Arrays.asList(object.getString("responseDockerId").split(",")); + // 配置多实例 + delegateTask.setVariable("counterpartUserList",nextUserList); + delegateTask.addCandidateUsers(nextUserList); + } + + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); +// object.getString("standName") + String standName = ""; + String prcName = "政策征求意见流程-任务分发"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("laws2"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchBefore.java new file mode 100644 index 00000000..3ea9b1eb --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchBefore.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.netflix.eureka.util.batcher.TaskDispatcher; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +public class LaunchBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzrkStep2?prcType=laws2"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewBefore.java new file mode 100644 index 00000000..6a4d6f82 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewBefore.java @@ -0,0 +1,37 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; +/** + * 部长审核 + */ +public class MinisterReviewBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzrkStep2?prcType=laws2"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorBefore.java new file mode 100644 index 00000000..7f1b2f9f --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorBefore.java @@ -0,0 +1,39 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; +/** + * 副总监审核 + * @author 22501 + */ +public class ViceDirectorBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + //TODO 设置路由 + one1.setLink("bzrkStep2?prcType=laws2"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +}