From 7681b5f102c8fd6db98049f574c3bcd06c2480ab Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Wed, 7 Sep 2022 10:53:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=A4=96=E9=87=87=E7=9A=84?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseOutsourcingApplicationService.java    | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
index 3236fa5f6b..1fce1a0098 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@@ -26,6 +26,7 @@
 package com.yxt.anrui.base.biz.baseoutsourcingapplication;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.thread.ThreadUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -529,24 +530,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             appMap.put("sid",bv.getBusinessSid());
             bv.getFormVariables().put("app",appMap);
             //================添加app相关参数
-           /* BaseOutsourcingApplicationDto dto = baseMapper.getBySid(bv.getBusinessSid());
-            ResultBean<List<GetNodeVo>> nextNodesForSubmit = getNextNodesForSubmit(dto);
-            List<GetNodeVo> datas = nextNodesForSubmit.getData();
-            GetNodeVo getNodeVo = datas.get(0);
-            List<String> candidateGroups = getNodeVo.getCandidateGroups();
-            UserQuery userQuery = new UserQuery();
-            userQuery.setRoleSid(candidateGroups.get(0));
-            userQuery.setOrgSidPath(bv.getOrgSidPath());
-            List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
-            ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
-            if(sysUserVos.size()==0){
-                bv.setTaskDefKey(rb.getData().getTaskDefKey());
-                bv.setTaskId(rb.getData().getTaskId());
-                return complete(bv);
-            }*/
             BaseOutsourcingApplicationDto dto= baseMapper.getBySid(bv.getBusinessSid());
             ResultBean<UpdateFlowFieldVo> rb = complete_handleProsess(bv,dto);
-           /* String taskDefKey = rb.getData().getTaskDefKey();
+            String taskDefKey = rb.getData().getTaskDefKey();
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
             updateFlowFiled(stringObjectMap);
             if ("Event_end".equals(taskDefKey)) {
@@ -573,12 +559,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
                         return rb.setMsg("验车单业务模块的数据推送失败!");
                     }
                 }
-                try{
+                /*try{
                     StkInStock stkInStock= createStkInStock(booad);
                     finKingDeeFeign.draftStkInStock(stkInStock);
                 }catch (Exception e){
 
-                }
+                }*/
             }else{
                 //======================添加消息推送开始
                 UpdateFlowFieldVo uff = rb.getData();
@@ -597,7 +583,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 //                String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
                 //======================添加消息推送结束
             }
-*/
+
             return rb;
         } else {
             return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
@@ -605,10 +591,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     }
 
     public ResultBean<UpdateFlowFieldVo> complete_handleProsess(BusinessVariables bv,  BaseOutsourcingApplicationDto dto) {
-            ResultBean<List<GetNodeVo>> nextNodesForSubmit = getNextNodesForSubmit(dto);
-            List<GetNodeVo> datas = nextNodesForSubmit.getData();
-            GetNodeVo getNodeVo = datas.get(0);
-            List<String> candidateGroups = getNodeVo.getCandidateGroups();
             ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
             updateFlowFiled(stringObjectMap);