From a8fc334590f900e3692dc5c802b768d4c7308648 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Tue, 17 Aug 2021 20:27:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=A1=B9=E7=9B=AE=20=E5=85=A5?= =?UTF-8?q?=E5=88=B0=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=A0=87=E5=87=86=E5=8F=B7=E3=80=81=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=BA=BF=E6=B2=A1=E5=9B=9E=E6=98=BE~~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_main/datas/dto/PCA/PCAbreakdownList.java | 2 +- .../bat/wkflow/business_main/datas/dto/PCA/PCAtotal.java | 1 + .../ProjectComplianceAssessment/PCAdlApproveAfter.java | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAbreakdownList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAbreakdownList.java index d4898ce2..6c38a64b 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAbreakdownList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAbreakdownList.java @@ -27,5 +27,5 @@ public class PCAbreakdownList { private String busStandCover; private String responsibleUnit; private String responsibleEngineer; - + private String productLine; } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAtotal.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAtotal.java index 67122326..609f93ba 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAtotal.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAtotal.java @@ -27,6 +27,7 @@ public class PCAtotal { private String prcCreateUser; private String projectNumber; private String projectLine; + private String productLine; private String startUserName; private String serviceManager; private String statuteMinister; 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 9c4bfdb6..0f8331a8 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 @@ -62,11 +62,13 @@ public class PCAdlApproveAfter implements TaskListener { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(pcAdataList.getStandId()); + sarStandUnqualified.setStandSerialNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); sarStandUnqualified.setStandName(pcAdataList.getStandName()); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setProductName(res.getProjectName()); +// sarStandUnqualified.setProductLine(res.getProductLine()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(pcAdataList.getNoCompliance()); @@ -79,8 +81,10 @@ public class PCAdlApproveAfter implements TaskListener { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(pcAdataList.getStandId()); + sarStandUnqualified.setStandSerialNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); sarStandUnqualified.setStandName(pcAdataList.getStandName()); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); + sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class)); sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setProductName(res.getProjectName()); @@ -100,9 +104,6 @@ public class PCAdlApproveAfter implements TaskListener { sarStandard.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); sarStandard.setStandType(pcAdataList.getStandType()); sarStandard.setType(pcAdataList.getTypeId()); - System.out.println(uuid); - System.out.println(pcAdataList.getTypeId()); - System.out.println(sarStandard.getType()); //111 sarStandard.setProductionCompletionTime(pcAdataList.getZcCompletionTime()); sarStandard.setProductionCountermeasures(pcAdataList.getZcCountermeasures()); @@ -131,6 +132,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setStandId(pcAchildren.getStandId()); sarStandUnqualified.setStandName(pcAdataList.getStandName()); sarStandUnqualified.setItemsNum(pcAchildren.getItemsNum()); + sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class)); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); sarStandUnqualified.setItemsName(pcAchildren.getItemsName()); sarStandUnqualified.setCloseState(1); @@ -149,6 +151,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setStandId(pcAchildren.getStandId()); sarStandUnqualified.setStandName(pcAdataList.getStandName()); sarStandUnqualified.setItemsNum(pcAchildren.getItemsNum()); + sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class)); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); sarStandUnqualified.setItemsName(pcAchildren.getItemsName()); sarStandUnqualified.setCloseState(1);