From f54595d7e733b24e8ef2f2747a8e414b5ce705d5 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 16 Aug 2021 23:29:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E6=A0=87?= =?UTF-8?q?=E5=87=86=20=E5=85=A5=E5=88=B0=E6=9C=AA=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E6=95=B4=E6=94=B9=E5=BA=93=E4=B8=AD=EF=BC=8C=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E3=80=81=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=EF=BC=8C=E8=B4=A8=E9=87=8F=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=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/PCAtotal.java | 1 + .../datas/dto/SarStandUnqualified.java | 8 ++++++++ .../wkflow/business_main/datas/dto/Step3DTO.java | 3 +++ .../PEPDepartLeaderAfter.java | 14 ++++++++------ 4 files changed, 20 insertions(+), 6 deletions(-) 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 c004c00c..67122326 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 @@ -26,6 +26,7 @@ public class PCAtotal { private List breakdownList; private String prcCreateUser; private String projectNumber; + private String projectLine; private String startUserName; private String serviceManager; private String statuteMinister; diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java index 2c822c5c..bae35d09 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java @@ -31,6 +31,10 @@ public class SarStandUnqualified { @ApiModelProperty(value = "标准ID") private String standId; + @ApiModelProperty(value = "标准号") + @TableField("STAND_SERIAL_NUMBER") + private String standSerialNumber; + @ApiModelProperty(value = "标准名称") private String standName; @@ -41,6 +45,7 @@ public class SarStandUnqualified { private String itemsName; @ApiModelProperty(value = "产品线") + @TableField("PRODUCT_LINE") private String productLine; @ApiModelProperty(value = "责任部门") @@ -78,12 +83,15 @@ public class SarStandUnqualified { private String reason; @ApiModelProperty(value = "质量工程师") + @TableField("QA_ENGINEER") private String qaEngineer; @ApiModelProperty(value = "认证工程师") + @TableField("AUTH_ENGINEER") private String authEngineer; @ApiModelProperty(value = "责任工程师") + @TableField("DUTY_ENGINEER") private String dutyEngineer; @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java index 5ddb05c5..a6349cb7 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java @@ -25,14 +25,17 @@ public class Step3DTO { private String projectManager; private String qualityEngineer; private String qualityEngineerName; + private String qaEngineer; private String distributePerson; private String certifiedEngineer; private String certifiedEngineerName; + private String authEngineer; private String distributePersonId; private String zCCSSRQ; private String xCXSSRQ; private String responsibleUnit; private String responsibleEngineer; + private String dutyEngineer; private String standId; private String standardInfo; private String typeId; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java index c00b5ffd..4317f7d2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java @@ -63,6 +63,7 @@ public class PEPDepartLeaderAfter implements TaskListener { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(delegateTask.getVariable("standId",String.class)); + sarStandUnqualified.setStandSerialNumber(o.getStandNumber()); sarStandUnqualified.setStandName(o.getStandName()); sarStandUnqualified.setItemsNum(o.getItemNum()); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); @@ -71,9 +72,9 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setProductName(o.getProjectName()); - sarStandUnqualified.setQaEngineer(o.getQualityEngineer()); - sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer()); - sarStandUnqualified.setDutyEngineer(o.getDistributePersonId()); + sarStandUnqualified.setQaEngineer(o.getQualityEngineerName()); + sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName()); + sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer()); sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit()); sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(object1.getString("noCompliance")); @@ -85,6 +86,7 @@ public class PEPDepartLeaderAfter implements TaskListener { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(delegateTask.getVariable("standId",String.class)); + sarStandUnqualified.setStandSerialNumber(o.getStandNumber()); sarStandUnqualified.setStandName(o.getStandName()); sarStandUnqualified.setItemsNum(o.getItemNum()); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); @@ -93,9 +95,9 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setProductName(o.getProjectName()); - sarStandUnqualified.setQaEngineer(o.getQualityEngineer()); - sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer()); - sarStandUnqualified.setDutyEngineer(o.getDistributePersonId()); + sarStandUnqualified.setQaEngineer(o.getQualityEngineerName()); + sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName()); + sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer()); sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit()); sarStandUnqualified.setReason(object1.getString("zcNoCompliance")); sarStandUnqualified.setProductType("product");