From 7b54b11160641b3ea9d3da30925e657fe2f8e6ae Mon Sep 17 00:00:00 2001
From: djz8236 <djz236@163.com>
Date: Sun, 14 May 2023 09:16:42 +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

---
 supervise-business-ui/src/views/pr/index.vue  |  5 +-
 yxt_supervise/pom.xml                         | 77 +------------------
 .../biz/flowtask/FlowTaskService.java         |  8 ++
 .../PurchasingRequisitionFeignFallback.java   |  1 -
 .../PurchasingRequisitionRest.java            |  6 +-
 .../PurchasingRequisitionService.java         |  4 +-
 6 files changed, 22 insertions(+), 79 deletions(-)

diff --git a/supervise-business-ui/src/views/pr/index.vue b/supervise-business-ui/src/views/pr/index.vue
index 5c4bd2ec..222cf90e 100644
--- a/supervise-business-ui/src/views/pr/index.vue
+++ b/supervise-business-ui/src/views/pr/index.vue
@@ -84,6 +84,7 @@ export default {
   },
   data() {
     return {
+      url:"",
       centerDialogVisible:false,
       btndisabled: false,
       viewState: 1, // 1、列表 2、添加 3、修改 4、查看
@@ -133,13 +134,15 @@ export default {
   },
   methods: {
     flowRecord(row) {
+      console.log(row);
       this.centerDialogVisible = true
       var params = {
         deployId: row.procDefId,
         procInsId: row.procInstSid,
         token: getStorage()
       }
-      this.url = '/#/pr/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+      console.log(params);
+      this.url = 'http://jianguan.yyundong.com/business/#/pr/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
     },
     /** 删除按钮操作 */
     handleDelete() {
diff --git a/yxt_supervise/pom.xml b/yxt_supervise/pom.xml
index 2d0366ee..ff7f96a8 100644
--- a/yxt_supervise/pom.xml
+++ b/yxt_supervise/pom.xml
@@ -12,7 +12,7 @@
     <modules>
         <module>gateway</module>
         <module>supervise-portal</module>
-        <module>supervise-supplychain</module>
+      <!--  <module>supervise-supplychain</module>-->
         <module>supervise-system</module>
         <module>yxt_adapter</module>
         <module>supervise-rms</module>
@@ -283,36 +283,7 @@
                 <artifactId>hutool-cache</artifactId>
                 <version>${hutool.version}</version>
             </dependency>
-            <!-- hutool 图片验证码实现 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-captcha</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <!-- hutool 针对POI中Excel和Word的封装 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-poi</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <!-- hutool JSON实现 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-json</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <!-- hutool 定时任务模块，提供类Crontab表达式的定时任务 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-cron</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <!-- hutool 系统参数调用封装（JVM信息等） -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-system</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
+
             <!-- hutool 功能更强大的Setting配置文件和Properties封装 -->
             <dependency>
                 <groupId>cn.hutool</groupId>
@@ -325,48 +296,13 @@
                 <artifactId>hutool-extra</artifactId>
                 <version>${hutool.version}</version>
             </dependency>
-            <!-- hutool JDK动态代理封装，提供非IOC下的切面支持 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-aop</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <!-- hutool 布隆过滤，提供一些Hash算法的布隆过滤 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-bloomFilter</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <!-- hutool JDBC封装后的数据操作，基于ActiveRecord思想 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-db</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
+
             <!-- hutool 自动识别日志实现的日志门面 -->
             <dependency>
                 <groupId>cn.hutool</groupId>
                 <artifactId>hutool-log</artifactId>
                 <version>${hutool.version}</version>
             </dependency>
-            <!-- hutool 基于Java的NIO和AIO的Socket封装 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-socket</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <!-- hutool 基于DFA模型的多关键字查找 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-dfa</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <!-- hutool 脚本执行封装，例如Javascript -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-script</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.hibernate.validator</groupId>
                 <artifactId>hibernate-validator</artifactId>
@@ -379,13 +315,6 @@
                 <optional>true</optional>
                 <version>${lombok.version}</version>
             </dependency>
-
-            <!-- https://mvnrepository.com/artifact/com.deepoove/poi-tl -->
-            <dependency>
-                <groupId>com.deepoove</groupId>
-                <artifactId>poi-tl</artifactId>
-                <version>${poi-tl.version}</version>
-            </dependency>
             <!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
             <dependency>
                 <groupId>org.apache.poi</groupId>
diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index 1289ccc7..84ffe63e 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -81,6 +81,7 @@ import java.util.stream.Collectors;
  * @author XuanXuan
  * @date 2021-04-03
  **/
+@Slf4j
 @Service
 public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask> {
     @Resource
@@ -116,8 +117,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
    public ResultBean<UserAndOrgPath> getNextNodeUserSidsOfCreate(BusinessVariables bv){
         ResultBean rb = ResultBean.fireFail();
         String orgSidPath=bv.getOrgSidPath();
+        log.info("getNextNodeUserSidsOfCreate1:{}",JSONObject.toJSONString(bv));
         //根据业务参数取流程流转的环节 信息
         List<Map<String, Object>> list = (List<Map<String, Object>>) getProcessCirculationNodesByMap(bv).getData();
+       log.info("getNextNodeUserSidsOfCreate2:{}",JSONObject.toJSONString(list));
         if(list==null||list.size()<2){
             return rb.setMsg("流程设计问题");
         }
@@ -126,6 +129,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         if(o==null){
             return rb.setMsg("流程设计问题");
         }
+       log.info("getNextNodeUserSidsOfCreate3:{}",JSONObject.toJSONString(o));
         return getNextUserSids(rb, orgSidPath, o);
     }
     public ResultBean<UserAndOrgPath> getNextUserSids(ResultBean rb, String orgSidPath, Object o) {
@@ -136,7 +140,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         UserQuery userQuery = new UserQuery();
         userQuery.setRoleSid(roleSid);
         userQuery.setOrgSidPath(orgSidPath);
+        log.info("getNextUserSids0:{}",JSONObject.toJSONString(userQuery));
         List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+        log.info("getNextUserSids1:{}",JSONObject.toJSONString(sysUserVos));
         if(sysUserVos==null||sysUserVos.size()<1){
             return rb.fail().setMsg("环节没有用户");
         }
@@ -149,12 +155,14 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         //符合条件的用户的sid,拼接的字符串
         String nextNodeUserSids_ = nextNodeUserSids.toString();
         String nextNodeOrgPathSids_ = nextNodeOrgPathSids.toString();
+        log.info("getNextUserSids2:{}",nextNodeUserSids_);
         if(StringUtils.isBlank(nextNodeUserSids_))
             return   rb.fail().setMsg("环节没有用户");
         nextNodeUserSids_ = nextNodeUserSids_.substring(0, nextNodeUserSids_.length() - 1);
         nextNodeOrgPathSids_ = nextNodeOrgPathSids_.substring(0, nextNodeOrgPathSids_.length() - 1);
         mapParam.setUserSid(nextNodeUserSids_);
         mapParam.setOrgPath(nextNodeOrgPathSids_);
+        log.info("getNextUserSids3:{}",JSONObject.toJSONString(mapParam));
         return rb.success().setData(mapParam);
     }
     public ResultBean getProcessCirculationNodesByMap(BusinessVariables bv) {
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java
index 324a9239..eb460fee 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java
@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.supervise.system.purchasingrequisition;
 
-import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionRest.java
index db973a8a..84aa98db 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionRest.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionRest.java
@@ -66,9 +66,11 @@ public class PurchasingRequisitionRest implements PurchasingRequisitionFeign {
     }
 
     @Override
-    public ResultBean complete(BusinessVariables bv) {
+    public ResultBean complete(PrVariables bv) {
         bv.setModelId(ProcDefEnum.PR.getProDefId());
-        return purchasingRequisitionService.complete(bv);
+        BusinessVariables b=new BusinessVariables();
+        BeanUtil.copyProperties(bv,b);
+        return purchasingRequisitionService.complete(b);
     }
 
     @Override
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 60b5a48e..60420942 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
@@ -74,6 +74,7 @@ public class PurchasingRequisitionService extends MybatisBaseService<PurchasingR
     public ResultBean submit(PurchasingRequisitionDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        String taskid="";
         if (StringUtils.isBlank(sid)) {
             PurchasingRequisition productInformation = new PurchasingRequisition();
             BeanUtil.copyProperties(dto, productInformation, "sid");
@@ -81,13 +82,14 @@ public class PurchasingRequisitionService extends MybatisBaseService<PurchasingR
             baseMapper.insert(productInformation);
         } else {
             PurchasingRequisition productInformation = fetchBySid(sid);
+            taskid=productInformation.getTaskId();
             if (productInformation == null) {
                 return rb.setMsg("该商品档案不存在");
             }
             BeanUtil.copyProperties(dto, productInformation, "sid");
             baseMapper.updateById(productInformation);
         }
-        if (StringUtils.isBlank(sid)) {
+        if (StringUtils.isBlank(sid)&&StringUtils.isBlank(taskid)) {
             startProcess(dto);
         } else {
             PurchasingRequisition pr = fetchBySid(sid);