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

项目评估入库bug 修复

Browse Source
This commit is contained in:
yuezhihang
2021-12-12 10:46:42 +08:00
parent 191a8d25dd
commit 2b5e6638b0
5 changed files with 22 additions and 17 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/PCAdataList.java
+2 -2
View File
@@ -31,8 +31,8 @@ public class PCAdataList {
private String kccvppsbm;
private String kccvppscn;
private String standName;
private String xcxssrqgj;
private String zccssrqgj;
private String xcxssrq;
private String zccssrq;
private String standEnName;
private String liablePeople;
private String liablePeopleId;
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class ProcessStep5After implements TaskListener {
delegateTask.setVariable("objectJson", object);
//标准法规部业务经理Id
List<String> nextUserList = new ArrayList();
String prcName = "";
String prcName = "企标制修订计划-部门高级经理审批";
//根据意见选择 企标状态并对企标信息进行修改 bzfgId
nextUserList.add(delegateTask.getVariable("topmanagerId",String.class));
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java
+6 -6
View File
@@ -75,9 +75,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
sarStandUnqualified.setCloseState(1);
sarStandUnqualified.setCreateTime(new Date());
sarStandUnqualified.setProductName(o.getProjectName());
sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
sarStandUnqualified.setQaEngineer(o.getQualityEngineer());
sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer());
sarStandUnqualified.setDutyEngineer(o.getImplementerId());
sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
sarStandUnqualified.setProductType("research");
sarStandUnqualified.setReason(object1.getString("noCompliance"));
@@ -99,9 +99,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
sarStandUnqualified.setCloseState(1);
sarStandUnqualified.setCreateTime(new Date());
sarStandUnqualified.setProductName(o.getProjectName());
sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
sarStandUnqualified.setQaEngineer(o.getQualityEngineer());
sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer());
sarStandUnqualified.setDutyEngineer(o.getImplementerId());
sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
sarStandUnqualified.setReason(object1.getString("zcNoCompliance"));
sarStandUnqualified.setProductType("product");
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java
+8 -8
View File
@@ -45,14 +45,14 @@ public class PEPffresPersonAfter implements TaskListener {
delegateTask.setVariable("objectJson", object);
String prcName = "";
if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){
// if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){
prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
}
else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
} else {
prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估";
}
// }
// else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
// prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
// } else {
//
// }
List<String> nextUserList = new ArrayList();
@@ -114,7 +114,7 @@ public class PEPffresPersonAfter implements TaskListener {
}
}
if (String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size()))) {
prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估";
oneStep1(delegateTask, busBean, nextUserList,prcName);
}
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java
+5
View File
@@ -52,6 +52,11 @@ public class PEPstartAfter implements TaskListener {
delegateTask.setVariable("certifiedEngineerName",object.getString("certifiedEngineerName"));
delegateTask.setVariable("qualityEngineerName",object.getString("qualityEngineerName"));
//认证工程师Id
delegateTask.setVariable("certifiedEngineer",object.getString("certifiedEngineer"));
//质量工程师Id
delegateTask.setVariable("qualityEngineer",object.getString("qualityEngineer"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");