From 447b2cabb72c55958c18d007a0ec031284b4e2d3 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Tue, 13 Dec 2022 16:47:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95=20/get=5Fg?= =?UTF-8?q?ather=5Fby=5Finstance=20=E5=B7=B2=E5=8A=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=B1=87=E6=80=BB=E5=8A=9F=E8=83=BD=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6=E5=8F=AF=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index 969015ec..9a269232 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -3,7 +3,6 @@ package com.ydw.bat.wkflow.business_activiti.task; import java.text.SimpleDateFormat; import java.util.*; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.*; @@ -255,55 +254,55 @@ public class TaskController { historicTaskInstance.put("commentText",""); } //判断是否可汇总功能 - String prcType=(String)historicTaskInstance.get("prcType"); - String name=(String)historicTaskInstance.get("name"); - String endTime=(String)historicTaskInstance.get("endTime"); - if (prcType.equals("1") && name.equals("起草") && !endTime.isEmpty()) { + String prcType=historicTaskInstance.get("prcType").toString(); + String name=historicTaskInstance.get("name").toString(); + Boolean endTime=historicTaskInstance.get("endTime")!=null; + if (prcType.equals("1") && name.equals("起草") && endTime) { // 标准入库流程数据 isGather=true; - }else if(prcType == "buss1"&& name.equals("批准") && !endTime.isEmpty()){ + }else if(prcType == "buss1"&& name.equals("批准") && endTime){ //企标入库 isGather=true; - }else if(prcType == "buss2"&& name.equals("意见汇总修订") && !endTime.isEmpty()){ + }else if(prcType == "buss2"&& name.equals("意见汇总修订") && endTime){ //企标入库 isGather=true; - }else if(prcType == "buss3"&& name.equals("汇总") && !endTime.isEmpty()){ + }else if(prcType == "buss3"&& name.equals("汇总") && endTime){ //企标复审 isGather=true; - }else if(prcType == "4"&& name.equals("起草") && !endTime.isEmpty()){ + }else if(prcType == "4"&& name.equals("起草") && endTime){ //标准清单发布流程数据 isGather=true; - }else if (prcType == "5"&& name.equals("批准") && !endTime.isEmpty()){ + }else if (prcType == "5"&& name.equals("批准") && endTime){ //标准项目合规评估 isGather=true; - }else if(prcType == "6"&& name.equals("批准") && !endTime.isEmpty()){ + }else if(prcType == "6"&& name.equals("批准") && endTime){ //标准项目合规评估 项目维度 isGather=true; - } else if (prcType == "8"&& name.equals("合规排查(上传合规举证材料)") && !endTime.isEmpty()) { + } else if (prcType == "8"&& name.equals("合规排查(上传合规举证材料)") && endTime) { // 未符合项整改 isGather=true; - } else if(prcType == "9" && name.equals("批准") && !endTime.isEmpty()){ + } else if(prcType == "9" && name.equals("批准") && endTime){ // 标准解读流程 isGather=true; - }else if(prcType == "2"&& name.equals("调研结果处理") && !endTime.isEmpty()){ + }else if(prcType == "2"&& name.equals("调研结果处理") && endTime){ //标准调研流程 isGather=true; - }else if(prcType == "3"&& name.equals("意见处理") && !endTime.isEmpty()){ + }else if(prcType == "3"&& name.equals("意见处理") && endTime){ //标准征求意见 isGather=true; - }else if(prcType == "10"&& name.equals("批准") && !endTime.isEmpty()){ + }else if(prcType == "10"&& name.equals("清单发布") && endTime){ //项目清单确认 isGather=true; - }else if(prcType == "24"&& name.equals("起草人修改标准状态") && !endTime.isEmpty()){ + }else if(prcType == "24"&& name.equals("起草人修改标准状态") && endTime){ //企标废止 isGather=true; - }else if(prcType == "25"&& name.equals("起草") && !endTime.isEmpty()){ + }else if(prcType == "25"&& name.equals("起草") && endTime){ //企标制修订计划管控 isGather=true; - }else if(prcType == "26"&& name.equals("起草") && !endTime.isEmpty()){ + }else if(prcType == "26"&& name.equals("起草") && endTime){ //企标制修订立项计划 isGather=true; - } else if(prcType == "23"&& name.equals("汇总") && !endTime.isEmpty()){ + } else if(prcType == "23"&& name.equals("汇总") && endTime){ //企标复审 isGather=true; }