FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

未符合项整改

Browse Source
This commit is contained in:
yuezhihang
2022-01-07 10:50:40 +08:00
parent b4667922fc
commit 803ca23719
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java
+2 -2
View File
@@ -97,8 +97,8 @@ public class SarStandUnqualified {
@TableField("DUTY_ENGINEER") @TableField("DUTY_ENGINEER")
private String dutyEngineer; private String dutyEngineer;
@ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") // @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
private String productType; // private String productType;
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private String id;
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
+4 -4
View File
@@ -69,7 +69,7 @@ public class PCAdlApproveAfter implements TaskListener {
sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setCreateTime(new Date());
sarStandUnqualified.setProductName(res.getProjectName()); sarStandUnqualified.setProductName(res.getProjectName());
sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm());
sarStandUnqualified.setProductType("research"); // sarStandUnqualified.setProductType("research");
sarStandUnqualified.setReason(pcAdataList.getNoCompliance()); sarStandUnqualified.setReason(pcAdataList.getNoCompliance());
sarStandUnqualified.setPlanCloseTime(pcAdataList.getCompletionTime()); sarStandUnqualified.setPlanCloseTime(pcAdataList.getCompletionTime());
sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class)); sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class));
@@ -90,7 +90,7 @@ public class PCAdlApproveAfter implements TaskListener {
sarStandUnqualified.setProductName(res.getProjectName()); sarStandUnqualified.setProductName(res.getProjectName());
sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm());
sarStandUnqualified.setReason(pcAdataList.getZcNoCompliance()); sarStandUnqualified.setReason(pcAdataList.getZcNoCompliance());
sarStandUnqualified.setProductType("product"); // sarStandUnqualified.setProductType("product");
sarStandUnqualified.setPlanCloseTime(pcAdataList.getZcCompletionTime()); sarStandUnqualified.setPlanCloseTime(pcAdataList.getZcCompletionTime());
sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class));
standUnqualifieds.add(sarStandUnqualified); standUnqualifieds.add(sarStandUnqualified);
@@ -145,7 +145,7 @@ public class PCAdlApproveAfter implements TaskListener {
sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setCreateTime(new Date());
sarStandUnqualified.setProductName(res.getProjectName()); sarStandUnqualified.setProductName(res.getProjectName());
sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm());
sarStandUnqualified.setProductType("research"); // sarStandUnqualified.setProductType("research");
sarStandUnqualified.setReason(pcAchildren.getNoCompliance()); sarStandUnqualified.setReason(pcAchildren.getNoCompliance());
sarStandUnqualified.setPlanCloseTime(pcAchildren.getCompletionTime()); sarStandUnqualified.setPlanCloseTime(pcAchildren.getCompletionTime());
sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); 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.setResponsibleUnit(pcAdataList.getZrbm()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm());
sarStandUnqualified.setReason(pcAchildren.getZcNoCompliance()); sarStandUnqualified.setReason(pcAchildren.getZcNoCompliance());
sarStandUnqualified.setProductType("product"); // sarStandUnqualified.setProductType("product");
sarStandUnqualified.setPlanCloseTime(pcAchildren.getZcCompletionTime()); sarStandUnqualified.setPlanCloseTime(pcAchildren.getZcCompletionTime());
sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class));
standUnqualifieds.add(sarStandUnqualified); standUnqualifieds.add(sarStandUnqualified);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java
+2 -2
View File
@@ -79,7 +79,7 @@ public class PEPDepartLeaderAfter implements TaskListener {
sarStandUnqualified.setAuthEngineer(delegateTask.getVariable("certifiedEngineerName",String.class)); sarStandUnqualified.setAuthEngineer(delegateTask.getVariable("certifiedEngineerName",String.class));
sarStandUnqualified.setDutyEngineer(o.getImplementerId()); sarStandUnqualified.setDutyEngineer(o.getImplementerId());
sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit()); sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
sarStandUnqualified.setProductType("research"); // sarStandUnqualified.setProductType("research");
sarStandUnqualified.setReason(object1.getString("noCompliance")); sarStandUnqualified.setReason(object1.getString("noCompliance"));
sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("completionTime")),Date.class)); sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("completionTime")),Date.class));
sarStandUnqualified.setProductId(o.getProjectNumber()); sarStandUnqualified.setProductId(o.getProjectNumber());
@@ -104,7 +104,7 @@ public class PEPDepartLeaderAfter implements TaskListener {
sarStandUnqualified.setDutyEngineer(o.getImplementerId()); sarStandUnqualified.setDutyEngineer(o.getImplementerId());
sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit()); sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
sarStandUnqualified.setReason(object1.getString("zcNoCompliance")); sarStandUnqualified.setReason(object1.getString("zcNoCompliance"));
sarStandUnqualified.setProductType("product"); // sarStandUnqualified.setProductType("product");
sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("zcCompletionTime")),Date.class)); sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("zcCompletionTime")),Date.class));
sarStandUnqualified.setProductId(o.getProjectNumber()); sarStandUnqualified.setProductId(o.getProjectNumber());
sarStandUnqualifieds.add(sarStandUnqualified); sarStandUnqualifieds.add(sarStandUnqualified);