From fffab0eae18d3947c4042fe5da9b3664e2d0de87 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 10 Oct 2023 10:39:25 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=94=BF=E7=AD=96=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lawsLibrary/LLApplicantAfter.java         | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java
index 967699c6..5653aab3 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java
@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.lawsLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -36,9 +37,15 @@ public class LLApplicantAfter implements TaskListener{
         Datas datas = datasService.getOne(queryWrapper);
 
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+        // 添加关联流程编号
+        String processInstanceId = delegateTask.getProcessInstanceId();
+        LambdaQueryWrapper<BusProcessName> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BusProcessName::getPrcId,processInstanceId);
+        BusProcessName processName = busProcessNameService.getOne(wrapper);
+        object.put("prcNum",processName.getPrcNum());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         // 逻辑判断是否会签 signFlag
 //        JSONObject array = object.getJSONObject("hqsqForm");
@@ -80,17 +87,18 @@ public class LLApplicantAfter implements TaskListener{
 //        object.getString("standName")
         String standName = "";
         Object lawsName = object.get("lawsName");
-        Object lawsNumber = object.get("lawsNumber");
-        String lawsInfoName = "";
-        if(lawsName != null && lawsNumber != null){
-            String name = lawsName.toString()+"-";
-            String number = lawsNumber.toString()+"-";
-            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
-                lawsInfoName =  number+name;
-            }
-        }
-        String prcName = lawsInfoName+"政策入库流程";
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+//        Object lawsNumber = object.get("lawsNumber");
+//        String lawsInfoName = "";
+//        if(lawsName != null){
+//            String name = lawsName.toString()+"-";
+//            String number = lawsNumber.toString()+"-";
+//            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+//                lawsInfoName =  number+name;
+//            }
+//        }
+//        String prcName = lawsInfoName+"政策入库流程";
+        String prcName = lawsName + "-政策入库流程";
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -114,19 +122,17 @@ public class LLApplicantAfter implements TaskListener{
         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);
-            }
+        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);
         }
     }