From 494ba638a1b4301cd7c753432d0e55cd628b9c4b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 9 Dec 2021 16:57:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=92=8C=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/business_main/datas/dto/BreakdownList.java | 6 ++---- .../ydw/bat/wkflow/business_main/datas/dto/DataList.java | 6 ++---- .../ydw/bat/wkflow/business_main/datas/dto/PEPDTO.java | 6 ++---- .../ydw/bat/wkflow/business_slrs/dao/SarStandItems.java | 4 ++-- .../ProjectComplianceAssessment/PCAdlApproveAfter.java | 8 ++++---- .../ProcessStep2After.java | 4 ++-- .../ProcessStep3After.java | 2 +- .../ProcessStep4After.java | 2 +- .../bat/wkflow/listener/standardRead/DeptApplayAfter.java | 4 ++-- 9 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java index 01b879d3..9267eb40 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java @@ -28,10 +28,8 @@ public class BreakdownList { private String responsibleEngineer; private String technicalRequir; private String changePoint; - @JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss") - private Date xcxssrq; - @JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss") - private Date zccssrq; + private String xcxssrq; + private String zccssrq; public void setId(String id) { this.id = id; } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java index f64ca260..8aedd552 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java @@ -26,10 +26,8 @@ public class DataList { //合规评估添加的数据 private String itemNum; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - private Date xCXSSRQ; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - private Date zCCSSRQ; + private String xCXSSRQ; + private String zCCSSRQ; private String itemsName; private String standName; private String implementer; diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PEPDTO.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PEPDTO.java index 4006b683..7dc22821 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PEPDTO.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PEPDTO.java @@ -34,10 +34,8 @@ public class PEPDTO { private String workPeople; //在研在产字段！！！ 待定中 下发落实人需要使用 //时间字段 - @JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss") - private Date ZCCSSRQ; - @JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss") - private Date XCXSSRQ; + private String ZCCSSRQ; + private String XCXSSRQ; private String commentText; diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java index cd1be6b4..155bd896 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java @@ -98,11 +98,11 @@ public class SarStandItems { @ApiModelProperty(value = "新车型实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - private Date xccssrq; + private String xccssrq; @ApiModelProperty(value = "在产车实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "相对于上一版本变化点") private String comparedWithPrevious; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java index 674a560c..2bf32c4f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java @@ -58,7 +58,7 @@ public class PCAdlApproveAfter implements TaskListener { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); res.getDataList().forEach(pcAdataList -> { //标准一级别 - if (null != pcAdataList.getNoCompliance()) { + if (null != pcAdataList.getNoCompliance() && !"".equals(pcAdataList.getNoCompliance())) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(pcAdataList.getStandId()); @@ -77,7 +77,7 @@ public class PCAdlApproveAfter implements TaskListener { standUnqualifieds.add(sarStandUnqualified); } - if (null != pcAdataList.getZcNoCompliance()) { + if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAdataList.getZcNoCompliance())) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(pcAdataList.getStandId()); @@ -131,7 +131,7 @@ public class PCAdlApproveAfter implements TaskListener { //遍历条目 for (PCAchildren pcAchildren : pcAdataList.getChildren()) { - if (null != pcAchildren.getNoCompliance()) { + if (null != pcAchildren.getNoCompliance() && !"".equals(pcAdataList.getNoCompliance())) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(pcAchildren.getStandId()); @@ -152,7 +152,7 @@ public class PCAdlApproveAfter implements TaskListener { standUnqualifieds.add(sarStandUnqualified); } - if (null != pcAdataList.getZcNoCompliance()) { + if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAdataList.getZcNoCompliance())) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(pcAchildren.getStandId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java index 94c4267e..3c501592 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java @@ -37,7 +37,7 @@ public class ProcessStep2After implements TaskListener { List nextUserList = new ArrayList(); //计算最后的会签结果 使用的与运算啦啦啦啦 String prcName =""; - if (null == delegateTask.getVariable("deptCenterFlag")) { + if (null == delegateTask.getVariable("count")) { delegateTask.setVariable("deptCenterFlag", object.getInteger("deptCenterFlag")); delegateTask.setVariable("count",1); } else { @@ -55,7 +55,7 @@ public class ProcessStep2After implements TaskListener { nextUserList.add(delegateTask.getVariable("prcCreateUser", String.class)); delegateTask.setVariable("createUser", delegateTask.getVariable("prcCreateUser", String.class)); prcName = "企标制修订计划整改"; - delegateTask.setVariable("deptCenterFlag", null); + delegateTask.setVariable("deptCenterFlag", "1"); delegateTask.setVariable("count",null); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java index db1c2325..5f4ceb13 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java @@ -47,7 +47,7 @@ public class ProcessStep3After implements TaskListener { delegateTask.setVariable("bzFlag",1); nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class)); - delegateTask.setVariable("deptCenterFlag", null); + delegateTask.setVariable("deptCenterFlag", "1"); delegateTask.setVariable("count",null); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index 2376c544..62859964 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java @@ -93,7 +93,7 @@ public class ProcessStep4After implements TaskListener { delegateTask.setVariable("bzfgbzFlag",1); nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class)); - delegateTask.setVariable("deptCenterFlag", null); + delegateTask.setVariable("deptCenterFlag", "1"); delegateTask.setVariable("count",null); } 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 3e28572b..b14a44f0 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 @@ -60,8 +60,8 @@ public class DeptApplayAfter implements TaskListener{ sarStandItems1.setResponsibleUnit(os.getString("responsibleUnitShow")); sarStandItems1.setDutyEngineer(os.getString("zxUserIdName")); sarStandItems1.setTermsConditions(os.getString("itermsConditions")); - sarStandItems1.setXccssrq(os.getDate("newData")); - sarStandItems1.setZccssrq(os.getDate("onlineData")); + sarStandItems1.setXccssrq(os.getString("newData")); + sarStandItems1.setZccssrq(os.getString("onlineData")); sarStandItems1.setComparedWithPrevious(os.getString("changePoint")); sarStandItems1.setComplianceState(os.getString("complianceState")); sarStandItems1.setApplyArctic(os.getString("applyArctic"));