From 12458dae4f1b6eda1951674233e35b727f68582f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 6 Aug 2021 11:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E5=92=8C?= =?UTF-8?q?=20=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8Bbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/StandardSurvey/DirectorSignAfter.java | 2 +- .../listener/StandardSurvey/DockingApprovalAfter.java | 2 +- .../StandardSurvey/MinisterAndDockerSignAfter.java | 2 +- .../listener/StandardSurvey/PresidentSignAfter.java | 2 +- .../listener/StandardSurvey/ResponUserSignAfter.java | 2 +- .../listener/StandardSurvey/SummarySurveyAfter.java | 2 +- .../StandardSurvey/UploadResearchResultAfter.java | 2 +- .../bat/wkflow/listener/standardRead/DeptApplayAfter.java | 8 ++++++-- .../bat/wkflow/listener/standardRead/ResolveAfter.java | 1 + 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java index e0b478b2..50737008 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java @@ -51,7 +51,7 @@ public class DirectorSignAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("2"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java index 3c46dcbc..3cb16342 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java @@ -50,7 +50,7 @@ public class DockingApprovalAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("2"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java index fa31bca8..cce106bf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java @@ -53,7 +53,7 @@ public class MinisterAndDockerSignAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("2"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java index 94bf4a45..11dc168d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java @@ -50,7 +50,7 @@ public class PresidentSignAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("2"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java index 3fab579f..84a61958 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java @@ -60,7 +60,7 @@ public class ResponUserSignAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("2"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java index 6c8a4f90..5578b32a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java @@ -57,7 +57,7 @@ public class SummarySurveyAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("2"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java index 94beeff8..075b6703 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java @@ -74,7 +74,7 @@ public class UploadResearchResultAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("2"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 710f7c2c..bf6db03c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -64,14 +64,18 @@ public class DeptApplayAfter implements TaskListener{ sarStandItems.add(sarStandItems1); //结果数据 SarInterpretationNationalStandard standard=new SarInterpretationNationalStandard(); - standard.setStandId(sarStandItems1.getStandId()); + standard.setStandId(object.getString("standId")); standard.setStandSort("");//GB 需要前端传 standard.setStandName(object.getString("itemsName")); standard.setComparedWithPrevious(os.getString("changePoint")); standard.setCoreTechnicalRequirement(os.getString("technicalRequir")); standard.setComplianceState(object.getString("complianceState")); standard.setCreationTime(object.getDate("creationTime")); - standard.setLastVersionNumber(object.getString("oldNumber")); + standard.setLastVersionNumber(object.getString("itemsNum1")); + standard.setComplianceState(os.getString("complianceState")); + standard.setSpecificItem(object.getString("")); + standard.setStandNumber(object.getString("itemsNum")); + standard.setInterpretationTime(delegateTask.getCreateTime()); standards.add(standard); }); lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index 87002808..3d633f2c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -51,6 +51,7 @@ public class ResolveAfter implements TaskListener{ String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); + delegateTask.setVariable("createDate",new Date()); String standName = ""; if (null == object.getString("standInData")){ standName = "未知";