项目维度--项目评估bug修复

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java

@@ -22,7 +22,7 @@ public class PCAComplianceAssessmentBefore implements TaskListener {
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
-        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("TASK_ID","GO");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java

@@ -21,6 +21,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.apache.poi.util.LocaleID;
 import org.springframework.beans.BeanUtils;
 
 import java.text.SimpleDateFormat;
@@ -151,7 +152,12 @@ public class PCAffLiableDistributeAfter implements TaskListener {
                 nextUserList.add(s);
             }
         });
-        delegateTask.setVariable("workPeoples", nextUserList);
+        if (null!=delegateTask.getVariable("DisPeo")){
+            delegateTask.getVariable("DisPeo",List.class).addAll(nextUserList);
+        }else {
+            delegateTask.setVariable("DisPeo",nextUserList);
+        }
+        delegateTask.setVariable("workPeoples", delegateTask.getVariable("DisPeo",List.class));
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("prcCreateUser", String.class);
@@ -169,6 +175,20 @@ public class PCAffLiableDistributeAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        // 存储当前节点意见1
+        if (null!=object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if(!list.isEmpty()){
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         // 存储当前节点意见
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String userId : nextUserList) {
@@ -179,6 +199,7 @@ public class PCAffLiableDistributeAfter implements TaskListener {
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setTaskId("GO");
                 busProcessNewNext.setUserId(userId);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);