From 4f40329a92f2e8a01cfc670d016fd118ab835141 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 4 Jan 2023 15:37:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug293=E4=B8=AD=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8A=A0=E4=B8=8A=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java index 4eb726c9..78669ed8 100644 --- a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java +++ b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java @@ -9,6 +9,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IEsPrcRelationService; import com.ydw.bat.wkflow.business_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; import org.activiti.engine.TaskService; import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; @@ -16,13 +17,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.List; import java.util.stream.Collectors; +@EnableScheduling +@Component +@Slf4j public class ScheduledJobEsPlan { Logger logger = LoggerFactory.getLogger(ScheduledJobEsPlan.class); From a1ae597899792e8e99701cb55d9b259fd3a47b29 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 5 Jan 2023 11:02:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?bug293=20=E6=97=B6=E9=97=B4=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java index 78669ed8..6df44073 100644 --- a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java +++ b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java @@ -48,7 +48,7 @@ public class ScheduledJobEsPlan { // 计划标准初稿时间前一个月的企标计划 SimpleDateFormat sdfQuery = new SimpleDateFormat("yyyy-MM-dd"); Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.MONTH, -1); + calendar.add(Calendar.MONTH, 1); String endDate = sdfQuery.format(calendar.getTime()); List esRevisePlanDTOList2 = esRevisePlanDTOList.stream() .filter(e -> endDate.equals(sdfQuery.format(e.getDraftTime()))) From c9dacaa97cf78d6a8ffc7d686ca90ec5558297a8 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Mon, 9 Jan 2023 10:10:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?bug64804=20=E5=BE=85=E5=8A=9E=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterpriseStandardSystemRevisionPlan/ProcessStep5After.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java index ac0547d6..d91c232f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java @@ -75,6 +75,7 @@ public class ProcessStep5After implements TaskListener { // one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); + one1.setPrcName(prcName); busProcessNameService.saveOrUpdate(one1); } From 1514d8ba16b51e49a510a5aa29227dffce68eb2e Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Tue, 10 Jan 2023 16:14:09 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=BD=AC=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8E=9F=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ydw/bat/wkflow/listener/bussFs/BussFs5After.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs5After.java index 27591214..76ff45f2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs5After.java @@ -30,8 +30,8 @@ public class BussFs5After implements TaskListener { //截止时间 流程描述 创建人 String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standCode"))){ - prcName = object.getString("standCode")+"-"+object.getString("standName") + "-企标复审"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审"; }else { prcName = "企标复审"; } From 99d4f17b5573a163a41bf013d71724699a1a647f Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Tue, 10 Jan 2023 17:35:29 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E8=8A=82=E7=82=B9=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussLibraryProduct/BussLibraryProduct5After.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java index 30d0b155..78bc3bb5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.bussLibraryProduct; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -43,7 +44,9 @@ public class BussLibraryProduct5After implements TaskListener{ ideaList=new JSONArray(); } - ideaList.addAll(object.getJSONArray("modelData")); + if (ObjectUtils.isNotEmpty(object.getJSONArray("modelData"))) { + ideaList.addAll(object.getJSONArray("modelData")); + } delegateTask.setVariable("ideaList",ideaList); if(StringUtils.isNotBlank(object.getString("bussUser6"))){ From 8d693fc408cbe5562c430cdbcf448d372cb255c5 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 11 Jan 2023 14:57:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=B1=87=E6=80=BB=E9=A1=B5=E9=9D=A2=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java index 389eb5c6..355ffb34 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java @@ -39,11 +39,11 @@ public class BussFsC2After implements TaskListener{ List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("bussFsSubUser2"))){ - delegateTask.setVariable("bussFsSubUser2",object.getString("bussFsSubUser2")); - nextUserList.add(object.getString("bussFsSubUser2")); + if(StringUtils.isNotBlank(object.getString("bussFsUser3"))){ + delegateTask.setVariable("bussFsUser3",object.getString("bussFsUser3")); + nextUserList.add(object.getString("bussFsUser3")); }else { - throw new ActivitiException("1#2发起人不存在,请配置相关人员"); + throw new ActivitiException("1#2标准法规部高级经理不存在,请配置相关人员"); } //截止时间 流程描述 创建人