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..6df44073 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); @@ -42,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()))) 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 = "企标复审"; } 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标准法规部高级经理不存在,请配置相关人员"); } //截止时间 流程描述 创建人 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"))){ 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); }