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:
Mr.Z
2021-08-17 20:27:27 +08:00
parent 878c5e54bb
commit a8fc334590
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAbreakdownList.java
+1 -1
View File
@@ -27,5 +27,5 @@ public class PCAbreakdownList {
private String busStandCover; private String busStandCover;
private String responsibleUnit; private String responsibleUnit;
private String responsibleEngineer; private String responsibleEngineer;
private String productLine;
} }
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAtotal.java
+1
View File
@@ -27,6 +27,7 @@ public class PCAtotal {
private String prcCreateUser; private String prcCreateUser;
private String projectNumber; private String projectNumber;
private String projectLine; private String projectLine;
private String productLine;
private String startUserName; private String startUserName;
private String serviceManager; private String serviceManager;
private String statuteMinister; private String statuteMinister;
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
+6 -3
View File
@@ -62,11 +62,13 @@ public class PCAdlApproveAfter implements TaskListener {
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
//少一个standId 不合格原因 在研在产！ //少一个standId 不合格原因 在研在产！
sarStandUnqualified.setStandId(pcAdataList.getStandId()); sarStandUnqualified.setStandId(pcAdataList.getStandId());
sarStandUnqualified.setStandSerialNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear());
sarStandUnqualified.setStandName(pcAdataList.getStandName()); sarStandUnqualified.setStandName(pcAdataList.getStandName());
sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class));
sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCloseState(1);
sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setCreateTime(new Date());
sarStandUnqualified.setProductName(res.getProjectName()); sarStandUnqualified.setProductName(res.getProjectName());
// sarStandUnqualified.setProductLine(res.getProductLine());
sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm());
sarStandUnqualified.setProductType("research"); sarStandUnqualified.setProductType("research");
sarStandUnqualified.setReason(pcAdataList.getNoCompliance()); sarStandUnqualified.setReason(pcAdataList.getNoCompliance());
@@ -79,8 +81,10 @@ public class PCAdlApproveAfter implements TaskListener {
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
//少一个standId 不合格原因 在研在产！ //少一个standId 不合格原因 在研在产！
sarStandUnqualified.setStandId(pcAdataList.getStandId()); sarStandUnqualified.setStandId(pcAdataList.getStandId());
sarStandUnqualified.setStandSerialNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear());
sarStandUnqualified.setStandName(pcAdataList.getStandName()); sarStandUnqualified.setStandName(pcAdataList.getStandName());
sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class));
sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class));
sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCloseState(1);
sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setCreateTime(new Date());
sarStandUnqualified.setProductName(res.getProjectName()); sarStandUnqualified.setProductName(res.getProjectName());
@@ -100,9 +104,6 @@ public class PCAdlApproveAfter implements TaskListener {
sarStandard.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); sarStandard.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear());
sarStandard.setStandType(pcAdataList.getStandType()); sarStandard.setStandType(pcAdataList.getStandType());
sarStandard.setType(pcAdataList.getTypeId()); sarStandard.setType(pcAdataList.getTypeId());
System.out.println(uuid);
System.out.println(pcAdataList.getTypeId());
System.out.println(sarStandard.getType());
//111 //111
sarStandard.setProductionCompletionTime(pcAdataList.getZcCompletionTime()); sarStandard.setProductionCompletionTime(pcAdataList.getZcCompletionTime());
sarStandard.setProductionCountermeasures(pcAdataList.getZcCountermeasures()); sarStandard.setProductionCountermeasures(pcAdataList.getZcCountermeasures());
@@ -131,6 +132,7 @@ public class PCAdlApproveAfter implements TaskListener {
sarStandUnqualified.setStandId(pcAchildren.getStandId()); sarStandUnqualified.setStandId(pcAchildren.getStandId());
sarStandUnqualified.setStandName(pcAdataList.getStandName()); sarStandUnqualified.setStandName(pcAdataList.getStandName());
sarStandUnqualified.setItemsNum(pcAchildren.getItemsNum()); sarStandUnqualified.setItemsNum(pcAchildren.getItemsNum());
sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class));
sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class));
sarStandUnqualified.setItemsName(pcAchildren.getItemsName()); sarStandUnqualified.setItemsName(pcAchildren.getItemsName());
sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCloseState(1);
@@ -149,6 +151,7 @@ public class PCAdlApproveAfter implements TaskListener {
sarStandUnqualified.setStandId(pcAchildren.getStandId()); sarStandUnqualified.setStandId(pcAchildren.getStandId());
sarStandUnqualified.setStandName(pcAdataList.getStandName()); sarStandUnqualified.setStandName(pcAdataList.getStandName());
sarStandUnqualified.setItemsNum(pcAchildren.getItemsNum()); sarStandUnqualified.setItemsNum(pcAchildren.getItemsNum());
sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class));
sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class));
sarStandUnqualified.setItemsName(pcAchildren.getItemsName()); sarStandUnqualified.setItemsName(pcAchildren.getItemsName());
sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCloseState(1);