From 803ca23719bee46cdef36ff48622bae7bdf8d0c5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 7 Jan 2022 10:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_main/datas/dto/SarStandUnqualified.java | 4 ++-- .../ProjectComplianceAssessment/PCAdlApproveAfter.java | 8 ++++---- .../projectEvaluationProcess/PEPDepartLeaderAfter.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) 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 7d19fd9e..1c6f7b4f 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 @@ -97,8 +97,8 @@ public class SarStandUnqualified { @TableField("DUTY_ENGINEER") private String dutyEngineer; - @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") - private String productType; +// @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") +// private String productType; @ApiModelProperty(value = "主键") private String id; 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 249f7dea..725eadfc 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 @@ -69,7 +69,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setProductName(res.getProjectName()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); - sarStandUnqualified.setProductType("research"); +// sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(pcAdataList.getNoCompliance()); sarStandUnqualified.setPlanCloseTime(pcAdataList.getCompletionTime()); sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class)); @@ -90,7 +90,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setProductName(res.getProjectName()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); sarStandUnqualified.setReason(pcAdataList.getZcNoCompliance()); - sarStandUnqualified.setProductType("product"); +// sarStandUnqualified.setProductType("product"); sarStandUnqualified.setPlanCloseTime(pcAdataList.getZcCompletionTime()); sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); @@ -145,7 +145,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setProductName(res.getProjectName()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); - sarStandUnqualified.setProductType("research"); +// sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(pcAchildren.getNoCompliance()); sarStandUnqualified.setPlanCloseTime(pcAchildren.getCompletionTime()); sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); @@ -168,7 +168,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); sarStandUnqualified.setReason(pcAchildren.getZcNoCompliance()); - sarStandUnqualified.setProductType("product"); +// sarStandUnqualified.setProductType("product"); sarStandUnqualified.setPlanCloseTime(pcAchildren.getZcCompletionTime()); sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); 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 47b1f0f5..36e03071 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 @@ -79,7 +79,7 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setAuthEngineer(delegateTask.getVariable("certifiedEngineerName",String.class)); sarStandUnqualified.setDutyEngineer(o.getImplementerId()); sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit()); - sarStandUnqualified.setProductType("research"); +// sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(object1.getString("noCompliance")); sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("completionTime")),Date.class)); sarStandUnqualified.setProductId(o.getProjectNumber()); @@ -104,7 +104,7 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setDutyEngineer(o.getImplementerId()); sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit()); sarStandUnqualified.setReason(object1.getString("zcNoCompliance")); - sarStandUnqualified.setProductType("product"); +// sarStandUnqualified.setProductType("product"); sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("zcCompletionTime")),Date.class)); sarStandUnqualified.setProductId(o.getProjectNumber()); sarStandUnqualifieds.add(sarStandUnqualified);