From 3705d691d1db9e676a433597a289e69259ddcd89 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 28 Jan 2022 10:58:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=95=B4=E6=94=B9=20=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=A8=20=E5=92=8C=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/projectEvaluationNewProcess/Step8After.java | 1 + .../listener/projectEvaluationNewProcess/Step9After.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java index 353f3f13..87fea41f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java @@ -131,6 +131,7 @@ public class Step8After implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { + one1.setOverTime(OVERTIME); one1.setPrcType("5"); one1.setPrcName(prcName); one1.setCreatUser(user); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java index 9d6cad32..c74072f3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java @@ -70,6 +70,9 @@ public class Step9After implements TaskListener { one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); + if (null!=object.getJSONObject("newText")){ + one1.setMes(object.getJSONObject("newText").toJSONString()); + } busProcessNameService.saveOrUpdate(one1); } From 00680c86aa2754efb26b261b61bffa962389d492 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 28 Jan 2022 15:14:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardLibrary/ApplyApplicantAfter.java | 5 +++- .../standardLibrary/ManagerApproveAfter.java | 26 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) 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 5ab74711..b60058cd 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 @@ -66,7 +66,10 @@ public class ApplyApplicantAfter implements TaskListener{ }else { standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")); } - String prcName = standAllName+"-"+standName+"标准入库"; + /** + * 流程名称 标准号+"标准入库" + 下一个节点名称 + */ + String prcName = standAllName+"-"+standName+"标准入库"+" " + "经理人审批"; 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/standardLibrary/ManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java index dee88f09..9f468a81 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 @@ -35,6 +35,20 @@ public class ManagerApproveAfter implements TaskListener { String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String standName = ""; + if(object.getString("standInData").equals("0")){ + standName = "国内"; + }else { + standName = "海外"; + } + String standAllName = ""; + if(object.getString("standYear") != null && !object.getString("standYear").equals("")){ + standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear")); + }else { + standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")); + } + + if ("1".equalsIgnoreCase(approvalOpinion)) { delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId")); @@ -46,7 +60,13 @@ public class ManagerApproveAfter implements TaskListener { busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setUserId(object.getString("applyUpdUserId")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + + /** + * 流程名称 标准号+"标准入库" + 下一个节点名称 + */ + String prcName = standAllName+"-"+standName+"标准入库"+" " + "申请人修订"; + busProcessNew.setPrcName(prcName); +// busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); busBean.save(busProcessNew); func1(delegateTask, busBean, object, "1"); @@ -89,4 +109,8 @@ public class ManagerApproveAfter implements TaskListener { busBean.saveOrUpdate(one1); } } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } }