From 4fd2c5fdb8a36eed20d47146ee8faf6834506c91 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 11 Jan 2022 22:55:26 +0800
Subject: [PATCH] feat: There is no way the, buss2

---
 .../BussLibraryProduct13After.java            | 52 +------------------
 .../BussLibraryProduct5After.java             |  2 +-
 2 files changed, 3 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java
index 6a7c6e76..9f884abb 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java
@@ -8,6 +8,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.listener.bussLibrary.BussUtils;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
@@ -34,62 +35,13 @@ public class BussLibraryProduct13After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
-
-        if(StringUtils.isNotBlank(object.getString("bussUser14"))){
-            delegateTask.setVariable("bussUser14",object.getString("bussUser14"));
-            nextUserList.add(object.getString("bussUser14"));
-        }else {
-            throw new ActivitiException("1#2抄送参数不存在,请配置相关人员");
-        }
-
-        //截止时间 流程描述 创建人
-        String user = object.getString("prcCreateUser");
-        String username = object.getString("prcCreateUserName");
         String prcName = "";
         if(StringUtils.isNotBlank(object.getString("standName"))){
             prcName = object.getString("standName") + "-企标制修订-产品标准";
         }else {
             prcName = "企标制修订-产品标准";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
-        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
-        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
-        if(one1!=null){
-//            one1.setOverTime(OVERTIME);
-            one1.setPrcType("buss2");
-            one1.setPrcName(prcName);
-            one1.setCreatUser(user);
-            one1.setCreatUserName(username);
-            busProcessNameService.saveOrUpdate(one1);
-        }
-
-        // 存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
-        busProcessNew.setMsgType("clause");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
-
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
-                BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
-                busProcessNewNext.setPrcName(prcName);
-                busBean.save(busProcessNewNext);
-            }
-        }
+        BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService);
     }
 
     private String verifyObj(String str){
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java
index ab8d8beb..1f8ed83d 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java
@@ -43,7 +43,7 @@ public class BussLibraryProduct5After implements TaskListener{
             ideaList=new JSONArray();
         }
 
-        ideaList.addAll(object.getJSONArray("infoList"));
+        ideaList.addAll(object.getJSONArray("modelData"));
         delegateTask.setVariable("ideaList",ideaList);
 
         if(StringUtils.isNotBlank(object.getString("bussUser6"))){