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-08-17 18:21:56 +08:00
parent af87ee07b2
commit 878c5e54bb
12 changed files with 14 additions and 11 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/PCAchildren.java
+2
View File
@@ -31,4 +31,6 @@ public class PCAchildren {
private Date completionTime;
private String zcComplianceReasons;
private String typeId;
private Date xcxssrq;
private Date zccssrq;
}
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class PCAbafgManagerApproveAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class PCAbzManagerApproveAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class PCAffLiableApproveAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java
+2 -1
View File
@@ -16,6 +16,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.DealWithDate;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -109,7 +110,7 @@ public class PCAffLiableDistributeAfter implements TaskListener {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(String.valueOf(JSONObject.toJSON(map.get(userId))));
busProcessNewNext.setMesg(String.valueOf(DealWithDate.delWithTimePCA(map.get(userId))));
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class PCAgcManagerApproveAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class PCAgcManagerDeliverAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class PCAjgManagerApproveAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class PCAjgManagerDistributeAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class PCAstartAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumAfter.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class PCAsumAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
one1.setCreatUser(user);