From bde97a99ba232c291e140c911e6a8b00d69d88a4 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 14 Feb 2022 10:37:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3=E5=A4=8D?=
 =?UTF-8?q?=E5=8E=9F=20=E8=A7=A3=E8=AF=BB-=E5=85=A5=E5=BA=93=20=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=90=8D=E7=A7=B0=20=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business_activiti/task/TodoTaskController.java | 12 ++++++------
 .../listener/standardLibrary/SLApplicantAfter.java | 14 +++++++-------
 .../wkflow/listener/standardRead/ResolveAfter.java |  6 ++++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
index 649acafc..561a0e11 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
@@ -173,12 +173,12 @@ public class TodoTaskController extends BaseAction {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     String data = sdf.format(entry.getValue().get(0).get("createTime"));
                     res.setAcceptTime(data);
-                    //获取新的流程名称
-                    QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
-                    queryWrapper1.eq("P_ID",res.getPrcId());
-                    queryWrapper1.eq("TASK_ID",res.getTaskIds());
-                    BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
-                    res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" );
+//                    //获取新的流程名称
+//                    QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
+//                    queryWrapper1.eq("P_ID",res.getPrcId());
+//                    queryWrapper1.eq("TASK_ID",res.getTaskIds());
+//                    BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
+//                    res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" );
                     todoList.add(res);
                 }
             }
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java
index 1a92707a..d46197d2 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java
@@ -77,19 +77,19 @@ public class SLApplicantAfter implements TaskListener{
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
-        String standName = "";
-        if(object.getString("standInData").equals("0")){
-            standName = "国内";
-        }else {
-            standName = "海外";
-        }
+        String standName = object.getString("standName");
+//        if(object.getString("standInData").equals("0")){
+//            standName = "国内";
+//        }else {
+//            standName = "海外";
+//        }
         String standAllName = "";
         if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
             standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
         }else {
             standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
         }
-        String prcName = standAllName+"-"+standName+"标准入库";
+        String prcName = standAllName+"-"+standName+"-入库";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
index 920cbf49..c6acc07a 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
@@ -66,13 +66,15 @@ public class ResolveAfter implements TaskListener{
         delegateTask.setVariable("createDate",new Date());
         String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1");
         delegateTask.setVariable("titles",title);
-        String prcName = title+"-标准解读流程-选择执行人";
+//        String prcName = title+"-标准解读流程-选择执行人";
+        String prcName = title+"-标准解读流程-解读";
+        String prcName1 = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
             one1.setPrcType("9");
-            one1.setPrcName(prcName);
+            one1.setPrcName(prcName1);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);