From 16814c6fc6c20e9c5f745046bee00306f016fdea Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Mon, 1 Nov 2021 14:10:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JoinStandardFiling/JSFApproveAfter.java | 43 +++++----- .../JoinStandardFiling/JSFAuditAfter.java | 32 +++----- .../JSFFillinformationAfter.java | 7 +- .../JoinStandardFiling/JSFstartAfter.java | 5 +- .../PRFApproveAfter.java | 43 +++++----- .../PRFEngineerreviewAfter.java | 25 ++---- .../PRFFillinformationAfter.java | 81 +++++++++++-------- .../PRFReviewdockAfter.java | 23 ++---- .../PRFUnderengineerAfter.java | 11 ++- .../PRFstartAfter.java | 9 ++- .../RecommendedApproval/RAApproveAfter.java | 44 +++++----- .../RecommendedApproval/RAAuditAfter.java | 29 ++----- .../RAModifyInformationAfter.java | 8 +- .../RecommendedApproval/RASignAfter.java | 29 ++----- .../RAValidationAfter.java | 33 ++------ .../RecommendedApproval/RAstartAfter.java | 18 +++-- 16 files changed, 194 insertions(+), 246 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java index 22f14184..b59abcb7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java @@ -36,11 +36,15 @@ public class JSFApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + List nextUserList = new ArrayList(); + String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User")); + delegateTask.setVariable("bzFlag", 1); + func1(delegateTask, busBean, object, "1", busProcessNameService); + } else { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -48,41 +52,38 @@ public class JSFApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("Standardizer2User")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setUserId(object.getString("passUser")); + busProcessNew.setPrcName("加入标准化协会信息备案-修改入会信息"); busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("bzFlag", 2); - } else { - delegateTask.setVariable("bzFlag", 1); - func2(delegateTask, busBean, object, "0", busProcessNameService); + delegateTask.setVariable("statuteengineer",delegateTask.getVariable("prcCreateUser",String.class)); } } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - 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); - } - } - - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + private void func1(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.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("加入标准化协会信息备案-入库流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java index f612e18d..869acb21 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java @@ -38,34 +38,22 @@ public class JSFAuditAfter implements TaskListener { if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("gcsFlag", 1); - if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) { - - if (object.getString("statuteministerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("statuteministerUser").split(",")); - } else { - nextUserList.add(object.getString("statuteministerUser")); - } - } + delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteminister1",String.class)); } else { - delegateTask.setVariable("gcsFlag", 2); - if (StringUtils.isNotBlank(object.getString("dockUser"))) { - delegateTask.setVariable("Standardizer2", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - } + delegateTask.setVariable("gcsFlag", 0); + delegateTask.setVariable("Standardizer2",delegateTask.getVariable("Standardizer1",String.class)); + nextUserList.add(delegateTask.getVariable("Standardizer1",String.class)); } //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("prcCreateUser", user); - delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=""; + String user = delegateTask.getVariable("prcCreateUser", String.class); + String username = delegateTask.getVariable("prcCreateUserName",String.class); + String prcName; if(object.getString("signFlag").equals("1")) { - prcName = "-加入标准化协会信息备案-批准"; + prcName = "加入标准化协会信息备案-批准"; }else { - prcName = "-加入标准化协会信息备案-填写入会信息"; + prcName = "加入标准化协会信息备案-修改入会信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java index 8351933c..37423642 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java @@ -41,6 +41,7 @@ public class JSFFillinformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { @@ -53,11 +54,12 @@ public class JSFFillinformationAfter implements TaskListener { busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setUserId(object.getString("passUser")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setPrcName("加入标准化协会信息备案-标准法规工程师审核"); busBean.save(busProcessNew); func1(delegateTask, busBean, object, "1"); delegateTask.setVariable("dlFlag", 1); + delegateTask.setVariable("statuteengineer",delegateTask.getVariable("prcCreateUser",String.class)); } else { delegateTask.setVariable("dlFlag", 0); func2(delegateTask, busBean, object, "0", busProcessNameService); @@ -81,7 +83,7 @@ public class JSFFillinformationAfter implements TaskListener { BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - //one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); @@ -91,6 +93,7 @@ public class JSFFillinformationAfter implements TaskListener { queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if (one1 != null) { + one1.setPrcName("加入标准化协会信息备案-流程结束"); one1.setCommitFlag(commitFlag); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java index 04625532..8bf72c52 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java @@ -44,7 +44,10 @@ public class JSFstartAfter implements TaskListener { // 配置多实例 delegateTask.setVariable("Standardizer2list",nextUserList); - delegateTask.setVariable("Standardizer2", object.getString("dockUser")); + delegateTask.setVariable("Standardizer1", object.getString("dockUser")); + delegateTask.setVariable("statuteengineer1", object.getString("passUser")); + delegateTask.setVariable("statuteminister1", object.getString("directorUser")); + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java index ff7b7501..aa466e21 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java @@ -32,11 +32,13 @@ public class PRFApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); + delegateTask.setVariable("bzFlag", 1); + func1(delegateTask, busBean, object, "1", busProcessNameService); + } else { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -44,41 +46,38 @@ public class PRFApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("LiabilityengineerUser")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setUserId(object.getString("sonUser")); + busProcessNew.setPrcName("参与外部标准制修订备案-修改入会信息"); busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("bzFlag", 2); - } else { - delegateTask.setVariable("bzFlag", 1); - func2(delegateTask, busBean, object, "0", busProcessNameService); + delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); } } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - 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); - } - } - - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + private void func1(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.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("参与外部标准制修订备案-入库流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java index 30d27127..1a00c702 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java @@ -35,30 +35,15 @@ public class PRFEngineerreviewAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteminister", object.getString("statuteministerUser")); - nextUserList.add(object.getString("statuteministerUser")); - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); - -// 逻辑判断是否会签 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("gcsFlag", 1); - if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) { - - if (object.getString("statuteministerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("statuteministerUser").split(",")); - } else { - nextUserList.add(object.getString("statuteministerUser")); - } - } + delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteminister1",String.class)); } else { delegateTask.setVariable("gcsFlag", 2); - if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) { - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); - } + delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class)); } //截止时间 流程描述 创建人 @@ -72,7 +57,7 @@ public class PRFEngineerreviewAfter implements TaskListener { if(object.getString("signFlag").equals("1")) { prcName = standName + "-参与外部标准制修订备案-部长批准"; }else { - prcName = standName + "-参与外部标准制修订备案-填写备案信息"; + prcName = standName + "-参与外部标准制修订备案-修改备案信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java index 3d61c3cd..92c25931 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java @@ -12,7 +12,9 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; public class PRFFillinformationAfter implements TaskListener { @@ -32,46 +34,61 @@ public class PRFFillinformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("Buttpeople2", object.getString("Buttpeople2User")); - nextUserList.add(object.getString("Buttpeople2User")); + String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString(); + if ("1".equalsIgnoreCase(approvalOpinion)) { - //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("prcCreateUser", user); - delegateTask.setVariable("prcCreateUserName", username); -// delegateTask.setVariable("stId",object.getString("projectNumber")); + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(object.getString("passUser")); + busProcessNew.setPrcName("参与外部标准制修订备案-责任部门对接人审核"); + busBean.save(busProcessNew); - String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-对接人审核"; + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("dlFlag", 1); + delegateTask.setVariable("Buttpeople2",delegateTask.getVariable("Buttpeople3",String.class)); + } else { + delegateTask.setVariable("dlFlag", 2); + func2(delegateTask, busBean, object, "0", busProcessNameService); + } + } + + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { + 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); + } + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); - BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - - if(one1!=null){ - one1.setPrcType("14"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + one2.setOverTime(OVERTIME); + one2.setPrcType("1"); + busProcessNameService.saveOrUpdate(one2); } - 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); - } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("参与外部标准制修订备案-流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java index 650a95d9..42c889ae 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java @@ -35,28 +35,15 @@ public class PRFReviewdockAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteengineer", object.getString("statuteengi6neerUser")); - nextUserList.add(object.getString("statuteengineerUser")); - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("djrFlag", 1); - if (StringUtils.isNotBlank(object.getString("statuteengineerUser"))) { - - if (object.getString("statuteengineerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("statuteengineerUser").split(",")); - } else { - nextUserList.add(object.getString("statuteengineerUser")); - } - } + delegateTask.setVariable("statuteengineer",delegateTask.getVariable("statuteengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer1",String.class)); } else { delegateTask.setVariable("djrFlag", 2); - if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) { - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); - } + delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class)); } //截止时间 流程描述 创建人 @@ -70,7 +57,7 @@ public class PRFReviewdockAfter implements TaskListener { if(object.getString("signFlag").equals("1")) { prcName = standName + "-参与外部标准制修订备案-工程师审核"; }else { - prcName = standName + "-参与外部标准制修订备案-填写备案信息"; + prcName = standName + "-参与外部标准制修订备案-修改备案信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java index 05946437..72a84b3c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java @@ -13,6 +13,7 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class PRFUnderengineerAfter implements TaskListener { @@ -33,13 +34,15 @@ public class PRFUnderengineerAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); + String ids=object.getString("sonUser"); + if(ids.contains(",")){ + nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); + }else { + nextUserList.add(ids); + } // 配置多实例 delegateTask.setVariable("Liabilityengineerlist",nextUserList); -// 赋值 - delegateTask.setVariable("Liabilityengineer", object.getString("sonUser")); - nextUserList.add(object.getString("sonUser")); - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java index 6e0aefe4..ab4313db 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java @@ -40,17 +40,22 @@ public class PRFstartAfter implements TaskListener { }else { nextUserList.add(ids); } + // 配置多实例 delegateTask.setVariable("Buttpeoplelist",nextUserList); + delegateTask.setVariable("Buttpeople3", object.getString("passUser")); + delegateTask.setVariable("Liabilityengineer1", object.getString("sonUser")); + delegateTask.setVariable("statuteengineer1", object.getString("statuteengineerUser")); + delegateTask.setVariable("statuteminister1", object.getString("statuteministerUser")); + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); -// delegateTask.setVariable("stId",object.getString("projectNumber")); - String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-备案任务下发"; + String prcName = "参与外部标准制修订备案-备案任务下发"; 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/RecommendedApproval/RAApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java index e3a7a1c1..4111278e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java @@ -43,10 +43,13 @@ public class RAApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String approvalOpinion = object.get("yzFlag") == null ? "" : object.get("yzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); + delegateTask.setVariable("yzFlag", 1); + func1(delegateTask, busBean, object, "1", busProcessNameService); + + } else { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -54,41 +57,38 @@ public class RAApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("prcCreateUser")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setUserId(object.getJSONObject("roleForm").getString("passUser")); + busProcessNew.setPrcName("外部署名推荐批准-修改信息"); busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("yzFlag", 2); - } else { - delegateTask.setVariable("yzFlag", 1); - func2(delegateTask, busBean, object, "0", busProcessNameService); + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); } } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - 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); - } - } - - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + private void func1(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.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("外部署名推荐批准-入库流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java index 75578a70..40c2e9fa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java @@ -43,30 +43,15 @@ public class RAAuditAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("director", object.getString("directorUser")); - nextUserList.add(object.getString("directorUser")); - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - -// 逻辑判断 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("bzFlag", 1); - if (StringUtils.isNotBlank(object.getString("directorUser"))) { - - if (object.getString("directorUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("directorUser").split(",")); - } else { - nextUserList.add(object.getString("directorUser")); - } - } + delegateTask.setVariable("director",delegateTask.getVariable("director1",String.class)); + nextUserList.add(delegateTask.getVariable("director1",String.class)); } else { delegateTask.setVariable("bzFlag", 2); - if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - } + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class)); } //截止时间 流程描述 创建人 @@ -74,13 +59,11 @@ public class RAAuditAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-外部署名推荐批准-审核"; + prcName = "外部署名推荐批准-审核"; }else { - prcName = standName + "-外部署名推荐批准-修改信息"; + prcName = "外部署名推荐批准-修改信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java index 72420410..13229507 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java @@ -43,11 +43,9 @@ public class RAModifyInformationAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("leadership", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - + delegateTask.setVariable("leadership",delegateTask.getVariable("leadership1",String.class)); + nextUserList.add(delegateTask.getVariable("leadership1",String.class)); //截止时间 流程描述 创建人 @@ -56,7 +54,7 @@ public class RAModifyInformationAfter implements TaskListener { delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签"; + String prcName = "外部署名推荐批准-署名领导会签"; 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/RecommendedApproval/RASignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java index f725c571..8aadfbe9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java @@ -43,28 +43,15 @@ public class RASignAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteminister", object.getString("ministerUser")); - nextUserList.add(object.getString("ministerUser")); - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("ldFlag", 1); - if (StringUtils.isNotBlank(object.getString("ministerUser"))) { - - if (object.getString("ministerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("ministerUser").split(",")); - } else { - nextUserList.add(object.getString("ministerUser")); - } - } + delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteminister1",String.class)); } else { - delegateTask.setVariable("ldFlag", 2); - if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - } + delegateTask.setVariable("ldFlag", 2); + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class)); } //截止时间 流程描述 创建人 @@ -72,13 +59,11 @@ public class RASignAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-外部署名推荐批准-审核"; + prcName = "外部署名推荐批准-审核"; }else { - prcName = standName + "-外部署名推荐批准-修改信息"; + prcName = "外部署名推荐批准-修改信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java index afa5b5e5..79be14a2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java @@ -44,31 +44,15 @@ public class RAValidationAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("dean", object.getString("president")); - nextUserList.add(object.getString("president")); - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - -// 逻辑判断是否审核 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("zrFlag", 1); - - if (StringUtils.isNotBlank(object.getString("president"))) { - - if (object.getString("president").contains(",")) { - nextUserList = Arrays.asList(object.getString("president").split(",")); - } else { - nextUserList.add(object.getString("president")); - } - } + delegateTask.setVariable("dean",delegateTask.getVariable("dean1",String.class)); + nextUserList.add(delegateTask.getVariable("dean1",String.class)); } else { delegateTask.setVariable("zrFlag", 2); - if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - } + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class)); } //截止时间 流程描述 创建人 @@ -76,13 +60,12 @@ public class RAValidationAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=""; + + String prcName; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-外部署名推荐批准-批准"; + prcName = "外部署名推荐批准-批准"; }else { - prcName = standName + "-外部署名推荐批准-修改信息"; + prcName = "外部署名推荐批准-修改信息"; } QueryWrapper queryWrapper2 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index ad69ddd7..e3749a83 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -42,23 +42,31 @@ public class RAstartAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + List nextUserList = new ArrayList(); + String ids= object.getJSONObject("roleForm").getString("dockUser"); + if(ids.contains(",")){ + nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); + }else { + nextUserList.add(ids); + } // 配置多实例 delegateTask.setVariable("leadershiplist",nextUserList); // 赋值 - delegateTask.setVariable("leadership", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - + delegateTask.setVariable("leadership1", object.getJSONObject("roleForm").getString("dockUser")); + delegateTask.setVariable("director1", object.getJSONObject("roleForm").getString("directorUser")); + delegateTask.setVariable("statuteminister1", object.getJSONObject("roleForm").getString("ministerUser")); + delegateTask.setVariable("dean1", object.getJSONObject("roleForm").getString("president")); + delegateTask.setVariable("statuteengineer3", object.getJSONObject("roleForm").getString("passUser")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); -// delegateTask.setVariable("stId",object.getString("projectNumber")); - String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签"; + String prcName = "外部署名推荐批准-署名领导会签"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);