项目流程

src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java

@@ -36,22 +36,21 @@ public class Step3After implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
-        if ("0".equals(object.getString("passFlag"))) {
+        //设计一个确认人的计数器
-            delegateTask.setVariable("passFlag","0");
+        if (null!=delegateTask.getVariable("count")){
-            List<StandProjectRelationDto> standProjectRelationDtos = new ArrayList<>();
+            delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)+1);
-            JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList"));
-            for (Object os : jsonArray) {
-                JSONObject jsonObject = JSONObject.parseObject(os.toString());
-                StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto();
-                standProjectRelationDto.setProjectId(object.getString("projectId"));
-                standProjectRelationDto.setStandId(jsonObject.getString("id"));
-                standProjectRelationDtos.add(standProjectRelationDto);
-            }
-            lawsUserInfoService.batchInsert(standProjectRelationDtos);
         }else {
-            delegateTask.setVariable("passFlag","1");
+            delegateTask.setVariable("count",1);
-            nextUserList.add(delegateTask.getVariable("confirmId",String.class));
         }
+        //判断是否为最后一步 决定数据是否需要合并***---***
+
+
+
+
+
+
+
+
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("startId",String.class);
@@ -61,17 +60,12 @@ public class Step3After implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            if ("0".equals(object.getString("passFlag"))) {
-                one1.setOverTime(OVERTIME);
-            }
             one1.setPrcType("10");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
-
-
         if(!nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java

@@ -45,7 +45,10 @@ public class PEPffresPersonAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         String prcName = "";
-        if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
+        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)+"-标准项目合规评估-合规性评估";
@@ -69,7 +72,7 @@ public class PEPffresPersonAfter implements TaskListener {
                 nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople")));
                 delegateTask.setVariable("workPeople", String.valueOf(delegateTask.getVariable("workPeople")));
                 delegateTask.setVariable("fenFlag", "2");
-
+                object.put("mark","back");
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -125,7 +128,7 @@ public class PEPffresPersonAfter implements TaskListener {
         List<BusProcessNew> busProcessNews=busBean.findLastworkPeople("projectEvaluationProcess5",delegateTask.getProcessInstanceId());
         for (BusProcessNew b:busProcessNews) {
             JSONObject object=JSONObject.parseObject(b.getMesg());
-            if (!"1".equals(object.getString("fenFlag"))) {
+            if ("".equals(b.getCommitText())) {
                 JSONArray jsonArray = JSONArray.parseArray(object.getString("step3DTOS"));
                 JSONArray dataList = JSONArray.parseArray(object.getString("dataList"));
                 //去除jaonArry中的无效数据

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java

@@ -45,9 +45,7 @@ public class PEPtaskEstimateAfter implements TaskListener {
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
 
         JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList"));
-        //代码放这不带数据
+        JSONArray ne = JSONArray.parseArray(object.getString("dataList"));
-        JSONArray ne=new JSONArray();
-        ne.addAll(jsonArray);
         //操作数据库
         JSONArray remove = new JSONArray();
         for (Object json : jsonArray) {
@@ -59,9 +57,9 @@ public class PEPtaskEstimateAfter implements TaskListener {
         }
         String uuid = String.valueOf(UUID.randomUUID());
         //代码放这带数据
-        delegateTask.setVariable(uuid, ne);
+        delegateTask.setVariable(uuid, jsonArray);
-        jsonArray.removeAll(remove);
+        ne.removeAll(remove);
-        object.put("dataList", jsonArray);
+        object.put("dataList", ne);
         object.put("key", uuid);
         //设置分发负责人
         List<String> nextUserList = new ArrayList();