Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -38,6 +39,14 @@ public class BussLibrary5After implements TaskListener{
 
         List<String> nextUserList = new ArrayList();
 
+        JSONArray ideaList =delegateTask.getVariable("ideaList", JSONArray.class);
+        if (ideaList==null) {
+            ideaList=new JSONArray();
+        }
+
+        ideaList.addAll(object.getJSONArray("infoList"));
+        delegateTask.setVariable("ideaList",ideaList);
+
         if(StringUtils.isNotBlank(object.getString("xdUserId"))){
             delegateTask.setVariable("xdUserId",object.getString("xdUserId"));
             nextUserList.add(object.getString("xdUserId"));

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java

@@ -1,5 +1,8 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
@@ -25,6 +28,16 @@ public class BussLibrary6Before implements TaskListener{
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+
+            /**
+             * 汇总已审批通过的意见
+             */
+            String msg = one1.getMesg();
+            JSONObject jsonObject = JSON.parseObject(msg);
+            JSONArray ideaList=delegateTask.getVariable("ideaList",JSONArray.class);
+            jsonObject.put("infoList",ideaList);
+            one1.setMesg(jsonObject.toJSONString());
+
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -43,6 +44,11 @@ public class BussLibrary7After implements TaskListener{
             throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
         }
 
+        JSONArray evaluationData =delegateTask.getVariable("evaluationList", JSONArray.class);
+        if (evaluationData==null) {
+            throw new ActivitiException("1#2评分关联数据不存在");
+        }
+
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");