From 839bcb62c3b07510e984754742d15ef034224875 Mon Sep 17 00:00:00 2001
From: djz8236 <djz236@163.com>
Date: Tue, 16 May 2023 20:31:31 +0800
Subject: [PATCH] =?UTF-8?q?flowable=E9=9B=86=E6=88=90=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=EF=BC=8C=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingRequisitionService.java             | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionService.java
index bb90b0a8..542e499a 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionService.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionService.java
@@ -3,6 +3,7 @@ package com.yxt.supervise.system.purchasingrequisition;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -26,6 +27,7 @@ import com.yxt.supervise.system.region.RegionListVo;
 import com.yxt.supervise.system.sysstaffinfo.SysStaffinfoService;
 import com.yxt.supervise.system.sysuser.SysUserService;
 import com.yxt.supervise.system.sysuser.SysUserVo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,7 @@ import java.util.stream.Collectors;
  * @Date 2023/1/30 14:24
  * @Description
  */
+@Slf4j
 @Service
 public class PurchasingRequisitionService extends MybatisBaseService<PurchasingRequisitionMapper, PurchasingRequisition> {
 
@@ -89,7 +92,7 @@ public class PurchasingRequisitionService extends MybatisBaseService<PurchasingR
             BeanUtil.copyProperties(dto, productInformation, "sid");
             baseMapper.updateById(productInformation);
         }
-        if (StringUtils.isBlank(sid)&&StringUtils.isBlank(taskid)) {
+        if (StringUtils.isBlank(taskid)) {
             startProcess(dto);
         } else {
             PurchasingRequisition pr = fetchBySid(sid);
@@ -141,6 +144,7 @@ public class PurchasingRequisitionService extends MybatisBaseService<PurchasingR
         bv.setModelId(ProcDefEnum.PR.getProDefId());
 //        String nextNodeUserSids_ = "0331e5b5-9d60-11ed-87ce-525401028fe8";//sysOrganization.getManagerSid();
 //        bv.setNextNodeUserSids(nextNodeUserSids_);
+
         int r = submitBusinessVehicleData(dto);
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
@@ -175,12 +179,17 @@ public class PurchasingRequisitionService extends MybatisBaseService<PurchasingR
      * @return
      */
     private synchronized int submitBusinessVehicleData(PurchasingRequisitionDto dto ) {
+        log.info("PurchasingRequisitionDto:{}", JSONObject.toJSONString(dto));
         int r = 0;
         if (StringUtils.isBlank(dto.getSid())&&StringUtils.isBlank(dto.getTaskId())) {
+            log.info("PurchasingRequisitionDto1:{}", JSONObject.toJSONString(dto));
+            r = 1;
+        }else if (StringUtils.isNotBlank(dto.getSid())&&StringUtils.isBlank(dto.getTaskId())){
+            log.info("PurchasingRequisitionDto2:{}", JSONObject.toJSONString(dto));
             r = 1;
         } else {
-                    //二次提交//只有数据一致的时候才能进行下一步
-                    r = 2;
+            log.info("PurchasingRequisitionDto3:{}", JSONObject.toJSONString(dto));
+           r = 2;
         }
         return r;
     }