From b0cc89e4d3778192d1ac123102ccf269aaf1d6d2 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 2 Jun 2022 16:44:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=20=E6=B3=A8=E6=8E=89=20=E5=8A=A8=E6=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=BA=93=20=E9=80=BB=E8=BE=91=20=E5=9C=A8=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B3=BB=E7=BB=9F=E5=8A=A0=E7=BB=9F=E4=B8=80=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardLibrary/ManagerApproveAfter.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java index 834bc08a..4abed6f7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java @@ -75,16 +75,16 @@ public class ManagerApproveAfter implements TaskListener { func1(delegateTask, busBean, object, "1"); delegateTask.setVariable("jlFlag", 1); } else { - NewsFeed newsFeed = new NewsFeed(); - newsFeed.setId(String.valueOf(UUID.randomUUID())); - newsFeed.setRenewTime(new Date()); - newsFeed.setResourceType(object.getString("standType")); - newsFeed.setMessageType("0"); - newsFeed.setStandard(object.getString("standNumber")); - newsFeed.setStandardName(object.getString("standName")); - newsFeed.setReleaseDate(object.getString("issueTime")); - newsFeed.setTextState(object.getString("textStatus")); - lawsUserInfoService.insertNewsFeed(newsFeed); +// NewsFeed newsFeed = new NewsFeed(); +// newsFeed.setId(String.valueOf(UUID.randomUUID())); +// newsFeed.setRenewTime(new Date()); +// newsFeed.setResourceType(object.getString("standType")); +// newsFeed.setMessageType("0"); +// newsFeed.setStandard(object.getString("standNumber")); +// newsFeed.setStandardName(object.getString("standName")); +// newsFeed.setReleaseDate(object.getString("issueTime")); +// newsFeed.setTextState(object.getString("textStatus")); +// lawsUserInfoService.insertNewsFeed(newsFeed); delegateTask.setVariable("jlFlag", 0); func2(delegateTask, busBean, object, "0", busProcessNameService); } From cd4afdda0c5c929a3de7d618818d25e134a7bbb0 Mon Sep 17 00:00:00 2001 From: qk <1005180704@qq。com> Date: Tue, 7 Jun 2022 17:24:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=EF=BC=9A=E5=8A=A8=E6=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_mq/service/SendMQService.java | 2 +- .../listener/bussLibrary/BussLibrary13After.java | 12 ++++++++++++ .../BussLibraryProduct13After.java | 16 ++++++++++++++++ .../standardLibrary/ApplyApplicantAfter.java | 4 ++-- .../standardLibrary/CountersignAfter.java | 4 ++-- .../standardLibrary/ManagerApproveAfter.java | 14 ++++++++++---- 6 files changed, 43 insertions(+), 9 deletions(-) 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 1333bc26..f6635a85 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 @@ -84,7 +84,7 @@ public class SendMQService { oaTaskExec.setEndTime(object.getEndTime()); oaTaskExec.setExecStatus(0); oaTaskExecService.save(oaTaskExec); - object.setPrcName(object.getPrcName()+",请接受任务!"); + object.setPrcName(object.getPrcName()); // 3 天 外 发送 OA 接受待办 insertOrUpdateInfo(object); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java index 6a3a4e0e..6aedd95a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java @@ -2,6 +2,8 @@ package com.ydw.bat.wkflow.listener.bussLibrary; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.WG.NewsFeed; 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; @@ -18,6 +20,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; /** * 发布后 @@ -28,6 +31,7 @@ public class BussLibrary13After implements TaskListener{ IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -42,6 +46,14 @@ public class BussLibrary13After implements TaskListener{ }else { prcName = "企标制修订"; } + NewsFeed newsFeed = new NewsFeed(); + newsFeed.setId(String.valueOf(UUID.randomUUID())); + newsFeed.setRenewTime(new Date()); + newsFeed.setMessageType("2"); + newsFeed.setStandard(object.getString("standNumber")); + newsFeed.setStandardName(object.getString("standName")); + newsFeed.setReleaseDate(object.getString("issueTime")); + lawsUserInfoService.insertNewsFeed(newsFeed); BussUtils.endFunc(delegateTask, prcName,busBean, object, "0", busProcessNameService); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java index 62b7b932..77bf546b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java @@ -2,6 +2,8 @@ package com.ydw.bat.wkflow.listener.bussLibraryProduct; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.WG.NewsFeed; 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; @@ -16,7 +18,9 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.UUID; /** * 总院标准法规部产品标准工程师/各事业部标准化员发布后 @@ -27,6 +31,7 @@ public class BussLibraryProduct13After implements TaskListener{ IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -41,6 +46,17 @@ public class BussLibraryProduct13After implements TaskListener{ }else { prcName = "企标制修订"; } + if(!("3".equals(object.getString("standStatus")))) { + NewsFeed newsFeed = new NewsFeed(); + newsFeed.setId(String.valueOf(UUID.randomUUID())); + newsFeed.setRenewTime(new Date()); +// newsFeed.setResourceType(object.getString("standType")); + newsFeed.setMessageType("2"); + newsFeed.setStandard(object.getString("standNumber")); + newsFeed.setStandardName(object.getString("standName")); + newsFeed.setReleaseDate(object.getString("issueTime")); + lawsUserInfoService.insertNewsFeed(newsFeed); + } BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java index a41febb7..6b43d033 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java @@ -56,9 +56,9 @@ public class ApplyApplicantAfter implements TaskListener{ // object.getString("standName") String standName = ""; if(object.getString("standInData").equals("0")){ - standName = "国内"; + standName = object.getString("standName"); }else { - standName = "海外"; + standName = object.getString("standEnName"); } String standAllName = ""; if(object.getString("standYear") != null && !object.getString("standYear").equals("")){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java index cbdb9769..31483f90 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java @@ -55,9 +55,9 @@ public class CountersignAfter implements TaskListener{ // object.getString("standName") String standName = ""; if(object.getString("standInData").equals("0")){ - standName = "国内"; + standName = object.getString("standName"); }else { - standName = "海外"; + standName = object.getString("standEnName"); } String standAllName = ""; if(object.getString("standYear") != null && !object.getString("standYear").equals("")){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java index 4abed6f7..92e40b41 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java @@ -40,9 +40,9 @@ public class ManagerApproveAfter implements TaskListener { String standName = ""; if(object.getString("standInData").equals("0")){ - standName = "国内"; + standName = object.getString("standName"); }else { - standName = "海外"; + standName = object.getString("standEnName"); } String standAllName = ""; if(object.getString("standYear") != null && !object.getString("standYear").equals("")){ @@ -79,12 +79,18 @@ public class ManagerApproveAfter implements TaskListener { // newsFeed.setId(String.valueOf(UUID.randomUUID())); // newsFeed.setRenewTime(new Date()); // newsFeed.setResourceType(object.getString("standType")); -// newsFeed.setMessageType("0"); // newsFeed.setStandard(object.getString("standNumber")); // newsFeed.setStandardName(object.getString("standName")); // newsFeed.setReleaseDate(object.getString("issueTime")); // newsFeed.setTextState(object.getString("textStatus")); -// lawsUserInfoService.insertNewsFeed(newsFeed); +// if("hc99551723c".equals(object.getString("textStatus"))){ +// newsFeed.setMessageType("0"); +// lawsUserInfoService.insertNewsFeed(newsFeed); +// }else if("8rjsx83ows".equals(object.getString("textStatus")) ||"hya6gay4vx".equals(object.getString("textStatus")) +// ||"ncb6osftj8".equals(object.getString("textStatus")) ||"3dx7oy5jff".equals(object.getString("textStatus"))){ +// newsFeed.setMessageType("1"); +// lawsUserInfoService.insertNewsFeed(newsFeed); +// } delegateTask.setVariable("jlFlag", 0); func2(delegateTask, busBean, object, "0", busProcessNameService); } From d7fe850dbc53c9a847c38723fdbf0e9fdfeaeb1f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 9 Jun 2022 10:46:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=B3=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussLibrary/BussLibrary13After.java | 16 +++++++------- .../BussLibraryProduct13After.java | 22 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java index 6aedd95a..51eb220d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java @@ -46,14 +46,14 @@ public class BussLibrary13After implements TaskListener{ }else { prcName = "企标制修订"; } - NewsFeed newsFeed = new NewsFeed(); - newsFeed.setId(String.valueOf(UUID.randomUUID())); - newsFeed.setRenewTime(new Date()); - newsFeed.setMessageType("2"); - newsFeed.setStandard(object.getString("standNumber")); - newsFeed.setStandardName(object.getString("standName")); - newsFeed.setReleaseDate(object.getString("issueTime")); - lawsUserInfoService.insertNewsFeed(newsFeed); +// NewsFeed newsFeed = new NewsFeed(); +// newsFeed.setId(String.valueOf(UUID.randomUUID())); +// newsFeed.setRenewTime(new Date()); +// newsFeed.setMessageType("2"); +// newsFeed.setStandard(object.getString("standNumber")); +// newsFeed.setStandardName(object.getString("standName")); +// newsFeed.setReleaseDate(object.getString("issueTime")); +// lawsUserInfoService.insertNewsFeed(newsFeed); BussUtils.endFunc(delegateTask, prcName,busBean, object, "0", busProcessNameService); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java index 77bf546b..fa1da863 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java @@ -46,17 +46,17 @@ public class BussLibraryProduct13After implements TaskListener{ }else { prcName = "企标制修订"; } - if(!("3".equals(object.getString("standStatus")))) { - NewsFeed newsFeed = new NewsFeed(); - newsFeed.setId(String.valueOf(UUID.randomUUID())); - newsFeed.setRenewTime(new Date()); -// newsFeed.setResourceType(object.getString("standType")); - newsFeed.setMessageType("2"); - newsFeed.setStandard(object.getString("standNumber")); - newsFeed.setStandardName(object.getString("standName")); - newsFeed.setReleaseDate(object.getString("issueTime")); - lawsUserInfoService.insertNewsFeed(newsFeed); - } +// if(!("3".equals(object.getString("standStatus")))) { +// NewsFeed newsFeed = new NewsFeed(); +// newsFeed.setId(String.valueOf(UUID.randomUUID())); +// newsFeed.setRenewTime(new Date()); +//// newsFeed.setResourceType(object.getString("standType")); +// newsFeed.setMessageType("2"); +// newsFeed.setStandard(object.getString("standNumber")); +// newsFeed.setStandardName(object.getString("standName")); +// newsFeed.setReleaseDate(object.getString("issueTime")); +// lawsUserInfoService.insertNewsFeed(newsFeed); +// } BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService); } From 908d178ee090803153c7097ade7c1f044c7790c4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 10 Jun 2022 15:36:46 +0800 Subject: [PATCH 4/4] feat: bug #52889 --- .../wkflow/listener/itemlistvalidationprocess/Step1After.java | 2 +- .../wkflow/listener/itemlistvalidationprocess/Step2After.java | 2 +- .../wkflow/listener/itemlistvalidationprocess/Step3After.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java index 947b4473..c1fba450 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java @@ -42,7 +42,7 @@ public class Step1After implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String prcName = "项目清单确认流程-确认人确认"; + String prcName = object.getString("projectNumber")+object.getString("projectName")+"清单确认"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step2After.java index a72ee61d..6156ed96 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step2After.java @@ -40,7 +40,7 @@ public class Step2After implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String prcName = "项目清单确认流程-确认人确认"; + String prcName = object.getString("projectNumber")+object.getString("projectName")+"清单确认"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java index d03b1ae0..73d6acb0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java @@ -53,7 +53,7 @@ public class Step3After implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String prcName = "项目清单确认流程-标准法规部经理审批"; + String prcName = object.getString("projectNumber")+object.getString("projectName")+"清单确认"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);