getModelData() {
+ return modelData;
+ }
+
+ public void setEntNumber(String entNumber) {
+ this.entNumber = entNumber;
+ }
+ public String getEntNumber() {
+ return entNumber;
+ }
+
+ public void setCnName(String cnName) {
+ this.cnName = cnName;
+ }
+ public String getCnName() {
+ return cnName;
+ }
+
+ public void setEnName(String enName) {
+ this.enName = enName;
+ }
+ public String getEnName() {
+ return enName;
+ }
+
+ public void setEntCategory(String entCategory) {
+ this.entCategory = entCategory;
+ }
+ public String getEntCategory() {
+ return entCategory;
+ }
+
+ public void setReplaceNumber(String replaceNumber) {
+ this.replaceNumber = replaceNumber;
+ }
+ public String getReplaceNumber() {
+ return replaceNumber;
+ }
+
+ public void setReplacedNumber(String replacedNumber) {
+ this.replacedNumber = replacedNumber;
+ }
+ public String getReplacedNumber() {
+ return replacedNumber;
+ }
+
+ public void setReleaseDate(String releaseDate) {
+ this.releaseDate = releaseDate;
+ }
+ public String getReleaseDate() {
+ return releaseDate;
+ }
+
+ public void setImplementDate(String implementDate) {
+ this.implementDate = implementDate;
+ }
+ public String getImplementDate() {
+ return implementDate;
+ }
+
+ public void setReviewDate(String reviewDate) {
+ this.reviewDate = reviewDate;
+ }
+ public String getReviewDate() {
+ return reviewDate;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/RoleForm.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/RoleForm.java
new file mode 100644
index 00000000..98b184ea
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/RoleForm.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2022 bejson.com
+ */
+package com.ydw.bat.wkflow.business_main.datas.entity.standState;
+
+/**
+ * Auto-generated: 2022-06-23 15:31:2
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class RoleForm {
+
+ private String prcCreateUserName = "";
+ private String prcCreateUser= "";
+ private String dockUser= "";
+ private String dockUserName= "";
+ private String bussFsSubUser2= "";
+ private String bussFsSubUser2Name= "";
+ private String bussFsUser2= "";
+ private String bussFsUser2Name= "";
+ private String bussFsUserC2= "";
+ private String bussFsUserC2Name= "";
+ private String bussFsUser3= "";
+ private String bussFsUser3Name= "";
+ public void setPrcCreateUserName(String prcCreateUserName) {
+ this.prcCreateUserName = prcCreateUserName;
+ }
+ public String getPrcCreateUserName() {
+ return prcCreateUserName;
+ }
+
+ public void setPrcCreateUser(String prcCreateUser) {
+ this.prcCreateUser = prcCreateUser;
+ }
+ public String getPrcCreateUser() {
+ return prcCreateUser;
+ }
+
+ public void setDockUser(String dockUser) {
+ this.dockUser = dockUser;
+ }
+ public String getDockUser() {
+ return dockUser;
+ }
+
+ public void setDockUserName(String dockUserName) {
+ this.dockUserName = dockUserName;
+ }
+ public String getDockUserName() {
+ return dockUserName;
+ }
+
+ public void setBussFsSubUser2(String bussFsSubUser2) {
+ this.bussFsSubUser2 = bussFsSubUser2;
+ }
+ public String getBussFsSubUser2() {
+ return bussFsSubUser2;
+ }
+
+ public void setBussFsSubUser2Name(String bussFsSubUser2Name) {
+ this.bussFsSubUser2Name = bussFsSubUser2Name;
+ }
+ public String getBussFsSubUser2Name() {
+ return bussFsSubUser2Name;
+ }
+
+ public void setBussFsUser2(String bussFsUser2) {
+ this.bussFsUser2 = bussFsUser2;
+ }
+ public String getBussFsUser2() {
+ return bussFsUser2;
+ }
+
+ public void setBussFsUser2Name(String bussFsUser2Name) {
+ this.bussFsUser2Name = bussFsUser2Name;
+ }
+ public String getBussFsUser2Name() {
+ return bussFsUser2Name;
+ }
+
+ public void setBussFsUserC2(String bussFsUserC2) {
+ this.bussFsUserC2 = bussFsUserC2;
+ }
+ public String getBussFsUserC2() {
+ return bussFsUserC2;
+ }
+
+ public void setBussFsUserC2Name(String bussFsUserC2Name) {
+ this.bussFsUserC2Name = bussFsUserC2Name;
+ }
+ public String getBussFsUserC2Name() {
+ return bussFsUserC2Name;
+ }
+
+ public void setBussFsUser3(String bussFsUser3) {
+ this.bussFsUser3 = bussFsUser3;
+ }
+ public String getBussFsUser3() {
+ return bussFsUser3;
+ }
+
+ public void setBussFsUser3Name(String bussFsUser3Name) {
+ this.bussFsUser3Name = bussFsUser3Name;
+ }
+ public String getBussFsUser3Name() {
+ return bussFsUser3Name;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/StandStateDraft.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/StandStateDraft.java
new file mode 100644
index 00000000..4b887ee3
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/StandStateDraft.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2022 bejson.com
+ */
+package com.ydw.bat.wkflow.business_main.datas.entity.standState;
+
+/**
+ * Auto-generated: 2022-06-23 15:31:2
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class StandStateDraft {
+
+ private String taskInfo="起草";
+ private RoleForm roleForm;
+ private QbfsForm qbfsForm;
+ private String commentText= "";
+ public void setTaskInfo(String taskInfo) {
+ this.taskInfo = taskInfo;
+ }
+ public String getTaskInfo() {
+ return taskInfo;
+ }
+
+ public void setRoleForm(RoleForm roleForm) {
+ this.roleForm = roleForm;
+ }
+ public RoleForm getRoleForm() {
+ return roleForm;
+ }
+
+ public void setQbfsForm(QbfsForm qbfsForm) {
+ this.qbfsForm = qbfsForm;
+ }
+ public QbfsForm getQbfsForm() {
+ return qbfsForm;
+ }
+
+ public void setCommentText(String commentText) {
+ this.commentText = commentText;
+ }
+ public String getCommentText() {
+ return commentText;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/TbTaskMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/TbTaskMapper.java
new file mode 100644
index 00000000..284cd61a
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/TbTaskMapper.java
@@ -0,0 +1,18 @@
+package com.ydw.bat.wkflow.business_main.datas.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.TbTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * 动态定时任务表 Mapper 接口
+ *
+ *
+ * @author super_liu
+ * @since 2022-05-27
+ */
+@Repository
+public interface TbTaskMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ITbTaskService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ITbTaskService.java
new file mode 100644
index 00000000..27ba3271
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ITbTaskService.java
@@ -0,0 +1,16 @@
+package com.ydw.bat.wkflow.business_main.datas.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydw.bat.wkflow.business_main.datas.entity.TbTask;
+
+/**
+ *
+ * 动态定时任务表 服务类
+ *
+ *
+ * @author super_liu
+ * @since 2022-05-27
+ */
+public interface ITbTaskService extends IService {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/TbTaskServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/TbTaskServiceImpl.java
new file mode 100644
index 00000000..ecafaef1
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/TbTaskServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ydw.bat.wkflow.business_main.datas.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydw.bat.wkflow.business_main.datas.entity.TbTask;
+import com.ydw.bat.wkflow.business_main.datas.mapper.TbTaskMapper;
+import com.ydw.bat.wkflow.business_main.datas.service.ITbTaskService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 动态定时任务表 服务实现类
+ *
+ *
+ * @author super_liu
+ * @since 2022-05-27
+ */
+@Service
+public class TbTaskServiceImpl extends ServiceImpl implements ITbTaskService {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/config/GetBeanUtil.java b/src/main/java/com/ydw/bat/wkflow/config/GetBeanUtil.java
new file mode 100644
index 00000000..18f6ecb6
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/config/GetBeanUtil.java
@@ -0,0 +1,28 @@
+package com.ydw.bat.wkflow.config;
+
+/**
+ * @Description: TODO
+ * @author: super_liu
+ * @date: 2022年05月27日 14:26
+ */
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class GetBeanUtil implements ApplicationContextAware {
+ private static ApplicationContext applicationContext;
+
+ public void setApplicationContext(ApplicationContext context) {
+ GetBeanUtil.applicationContext = context;
+ }
+
+ public static Object getBean(String name) {
+ return applicationContext.getBean(name);
+ }
+
+ public static ApplicationContext getApplicationContext() {
+ return applicationContext;
+ }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java
new file mode 100644
index 00000000..d649c118
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java
@@ -0,0 +1,117 @@
+package com.ydw.bat.wkflow.config;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
+import com.ydw.bat.wkflow.business_main.datas.entity.*;
+import com.ydw.bat.wkflow.business_main.datas.entity.standState.ModelData;
+import com.ydw.bat.wkflow.business_main.datas.entity.standState.QbfsForm;
+import com.ydw.bat.wkflow.business_main.datas.entity.standState.RoleForm;
+import com.ydw.bat.wkflow.business_main.datas.entity.standState.StandStateDraft;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
+import com.ydw.bat.wkflow.business_main.datas.service.IOaTaskExecService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.history.HistoricTaskInstanceQuery;
+import org.activiti.engine.task.Task;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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.Date;
+import java.util.List;
+
+
+@Slf4j
+public class ScheduledJobStandState implements Runnable {
+
+ Logger logger = LoggerFactory.getLogger(ScheduledJobStandState.class);
+
+ /**
+ * 根据配置文件设置是否开启定时器
+ *
+ */
+
+ private LawsUserInfoService lawsUserInfoService;
+
+ private IBusProcessNameService iBusProcessNameService;
+
+ @Value("${isNotScheduled}")
+ private boolean isNotScheduled; //是否开启定时器
+
+
+ public ScheduledJobStandState(){
+ lawsUserInfoService = GetBeanUtil.getApplicationContext().getBean(LawsUserInfoService.class);
+ iBusProcessNameService = GetBeanUtil.getApplicationContext().getBean(IBusProcessNameService.class);
+ }
+
+ @Override
+ public void run() {
+ /**
+ * 创建草稿参数 buss3 复审流程
+ * id:
+ * createUser:
+ * createUserName:
+ * prcType: buss3
+ * json:
+ */
+ try{
+ Thread.sleep(2000);
+ logger.info("每天0点1分执行 自动发起复审流程自动存入草稿:"+Thread.currentThread().getName() + " cron=0 1 0 * * ? --- " + new Date()+"---START-01");
+
+ StandStateDraft standStateDraft = new StandStateDraft();
+ RoleForm roleForm = new RoleForm();
+ QbfsForm qbfsForm = new QbfsForm();
+ SarBussionessStandStatePage page = new SarBussionessStandStatePage();
+ List modelDataList = lawsUserInfoService.getSarBussionessStandStateProcessList(page);
+ if(!modelDataList.isEmpty()){
+ qbfsForm.setModelData(modelDataList);
+ standStateDraft.setQbfsForm(qbfsForm);
+ standStateDraft.setRoleForm(roleForm);
+ String json = toJson(standStateDraft);
+ System.out.println(json);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String time = sdf.format(new Date());
+ BusProcessName busProcessName = new BusProcessName();
+ busProcessName.setPrcType("buss3");
+ busProcessName.setCreatUser("chenchunmei");
+ busProcessName.setCreatTime(time);
+ busProcessName.setMes(json);
+ busProcessName.setCreatUserName("陈春梅");
+ iBusProcessNameService.save(busProcessName);
+ logger.info("自动发起复审流程---已存入草稿");
+ }else{
+ logger.info("自动发起复审流程---没有复审数据不发起草稿");
+ }
+
+ logger.info("每天0点1分执行 自动发起复审流程自动存入草稿:"+Thread.currentThread().getName() + " cron=0 1 0 * * ? --- " + new Date()+"---End-01");
+ }catch(Exception e){
+ logger.info(e.getMessage());
+ }
+ }
+
+ public static String toJson(StandStateDraft standStateDraft){
+ GsonBuilder gsonBuilder = getGsonBuilder();
+ Gson json = gsonBuilder.create();
+ return json.toJson(standStateDraft);
+ }
+
+ private static GsonBuilder getGsonBuilder() {
+ return new GsonBuilder().disableHtmlEscaping().serializeNulls().enableComplexMapKeySerialization().serializeSpecialFloatingPointValues().setLenient();
+ }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/config/SchedulerConf.java b/src/main/java/com/ydw/bat/wkflow/config/SchedulerConf.java
new file mode 100644
index 00000000..e39ddb27
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/config/SchedulerConf.java
@@ -0,0 +1,119 @@
+package com.ydw.bat.wkflow.config;
+
+/**
+ * @Description: TODO
+ * @author: super_liu
+ * @date: 2022年05月27日 10:17
+ */
+
+import com.ydw.bat.wkflow.business_main.datas.entity.TbTask;
+import com.ydw.bat.wkflow.business_main.datas.mapper.TbTaskMapper;
+import com.ydw.bat.wkflow.business_main.datas.service.ITbTaskService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
+
+/**
+ * 动态定时器
+ */
+@Slf4j
+@Component
+public class SchedulerConf {
+
+ //数据库的任务
+ public static ConcurrentHashMap tasks = new ConcurrentHashMap<>(50);
+
+ //正在运行的任务
+ public static ConcurrentHashMap runTasks = new ConcurrentHashMap<>(50);
+
+ //线程池任务调度
+ private ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+
+ @Autowired
+ TbTaskMapper tbTaskDao;
+
+ @Autowired
+ ITbTaskService iTbTaskService;
+
+ /**
+ * 初始化线程池任务调度
+ */
+ @Autowired
+ public SchedulerConf(){
+ this.threadPoolTaskScheduler.setPoolSize(50);
+ this.threadPoolTaskScheduler.setThreadNamePrefix("task-thread-");
+ this.threadPoolTaskScheduler.setWaitForTasksToCompleteOnShutdown(true);
+ this.threadPoolTaskScheduler.initialize();
+ }
+
+ /**
+ * 获取所有数据库里的定时任务
+ */
+ private void getAllTbTask(){
+ //查询所有，并put到tasks
+ SchedulerConf.tasks.clear();
+ List list = iTbTaskService.list();
+ list.forEach((task)-> SchedulerConf.tasks.put(task.getId(),task));
+ }
+
+ /**
+ * 根据定时任务id，启动定时任务
+ */
+ public void start(String taskId){
+ try {
+ //重新获取最新执行任务周期
+ this.getAllTbTask();
+
+ TbTask tbTask = SchedulerConf.tasks.get(taskId);
+
+ //获取并实例化Runnable任务类
+ Class clazz = Class.forName(tbTask.getTaskClass());
+ Runnable runnable = (Runnable)clazz.newInstance();
+
+ //Cron表达式
+ CronTrigger cron = new CronTrigger(tbTask.getTaskExp());
+
+ //执行，并put到runTasks
+ SchedulerConf.runTasks.put(taskId, Objects.requireNonNull(this.threadPoolTaskScheduler.schedule(runnable, cron)));
+
+ this.updateTaskStatus(taskId,1);
+
+ log.info("{}，任务启动！",taskId);
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+ log.error("{}，任务启动失败...",taskId);
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * 根据定时任务id，停止定时任务
+ */
+ public void stop(String taskId){
+ SchedulerConf.runTasks.get(taskId).cancel(true);
+
+ SchedulerConf.runTasks.remove(taskId);
+
+ this.updateTaskStatus(taskId,0);
+
+ log.info("{}，任务停止...",taskId);
+ }
+
+ /**
+ * 更新数据库动态定时任务状态
+ */
+ private void updateTaskStatus(String taskId,int status){
+ TbTask task = iTbTaskService.getById(taskId);
+ task.setTaskStatus(status);
+ task.setUpdateTime(new Date());
+ iTbTaskService.updateById(task);
+ }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java
index e4639cd2..83f8c061 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java
@@ -74,7 +74,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName",String.class);
- String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-审批";
+ String prcName = delegateTask.getVariable("prcName", String.class);
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/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java
index 81b1dca2..99c184cf 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java
@@ -64,9 +64,9 @@ public class PCAbafgManagerApproveAfter implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName="";
if ("1".equals(object.getString("bzFlag"))) {
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-汇总审批";
+ prcName = delegateTask.getVariable("prcName", String.class);
}else {
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈";
+ prcName = delegateTask.getVariable("prcName", String.class);
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
index 4a9ae0ae..0232ae69 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
@@ -55,9 +55,9 @@ public class PCAbzManagerApproveAfter implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName="";
if ("1".equals(object.getString("BZFlag"))) {
- prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-工程经理转办";
+ prcName= delegateTask.getVariable("prcName", String.class);
}else {
- prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-流程结束";
+ prcName= delegateTask.getVariable("prcName", String.class);
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
index 783c5614..3550ada6 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
@@ -216,9 +216,9 @@ public class PCAdlApproveAfter implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName",String.class);
String prcName="";
if ("1".equals(object.get("dlFlag"))) {
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-流程结束";
+ prcName = delegateTask.getVariable("prcName", String.class);
}else {
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规工程师汇总审核";
+ prcName = delegateTask.getVariable("prcName", String.class);
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java
index 7394777c..5c47b23b 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java
@@ -54,9 +54,9 @@ public class PCAffLiableApproveAfter implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName",String.class);
String prcName="";
if ("1".equals(object.getString("ffFlag"))){
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-架构经理审批";
+ prcName = delegateTask.getVariable("prcName", String.class);
}else {
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈";
+ prcName = delegateTask.getVariable("prcName", String.class);
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java
index e0b26618..e67dc3d1 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java
@@ -162,7 +162,7 @@ public class PCAffLiableDistributeAfter implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
- String prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-合规性评估";
+ String prcName = delegateTask.getVariable("prcName", String.class);
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/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java
index c374f13c..dab93d55 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java
@@ -55,9 +55,9 @@ public class PCAgcManagerApproveAfter implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName",String.class);
String prcName="";
if ("1".equals(object.getString("gcFlag"))) {
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规部经理审批";
+ prcName = delegateTask.getVariable("prcName", String.class);
}else {
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈";
+ prcName = delegateTask.getVariable("prcName", String.class);
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java
index b1f84e1f..a6de470a 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java
@@ -49,7 +49,7 @@ public class PCAgcManagerDeliverAfter implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName",String.class);
- String prcName = delegateTask.getVariable("stId",String.class)+"-合规评估流程-架构经理任务分发";
+ String prcName = delegateTask.getVariable("prcName", String.class);
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/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java
index 156dfca6..f1719775 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java
@@ -55,9 +55,9 @@ public class PCAjgManagerApproveAfter implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName",String.class);
String prcName="";
if ("1".equals(object.getString("jgFlag"))) {
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-工程经理审批";
+ prcName = delegateTask.getVariable("prcName", String.class);
}else {
- prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈";
+ prcName = delegateTask.getVariable("prcName", String.class);
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java
index 3dac4a0e..f65fc15e 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java
@@ -76,7 +76,7 @@ public class PCAjgManagerDistributeAfter implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName",String.class);
- String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-流程下发";
+ String prcName = delegateTask.getVariable("prcName",String.class);
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/ProjectComplianceAssessment/PCAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java
index 4bedb316..524310e0 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java
@@ -54,7 +54,8 @@ public class PCAstartAfter implements TaskListener {
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
delegateTask.setVariable("stId",object.getString("projectNumber"));
- String prcName = object.getString("projectNumber")+"-项目合规评估流程-项目维度";
+ String prcName = object.getString("projectNumber")+"-合规评估";
+ delegateTask.setVariable("prcName",prcName);
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/ProjectComplianceAssessment/PCAsumAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumAfter.java
index c8ca0662..b69e672c 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumAfter.java
@@ -43,7 +43,7 @@ public class PCAsumAfter implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName",String.class);
- String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-标准法规部部长审核";
+ String prcName = delegateTask.getVariable("prcName",String.class);
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/StandardCommentProcess/UploadResearchResultBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultBefore.java
index d6d4cc72..2ab1b25a 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultBefore.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultBefore.java
@@ -31,7 +31,7 @@ public class UploadResearchResultBefore implements TaskListener {
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
JSONObject object = JSONObject.parseObject(one1.getMesg());
- one1.setLink("bzzqyjStep3?prcType=3&routerType=oa");
+ one1.setLink("bzzqyjStep3?prcType=3");
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程
one1.setTaskStatus(2);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
index 48f4ee76..6351cec1 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
@@ -9,15 +9,9 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
-import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
-import org.apache.commons.lang.StringUtils;
-
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
import java.util.List;
public class StartSurveyAfter implements TaskListener {
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
index f3a7fb55..b0e17545 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
@@ -14,6 +14,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
+import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -52,6 +53,9 @@ public class ProcessStep4After implements TaskListener {
plan_status.put("修订中","2");
plan_status.put("已取消","3");
plan_status.put("已完成","4");
+ plan_status.put("立项已完成","5");
+ plan_status.put("计划已确认","6");
+
Map revise_status=new HashMap<>();
revise_status.put("制定","1");
revise_status.put("修订","2");
@@ -126,7 +130,12 @@ public class ProcessStep4After implements TaskListener {
esRevisePlanDTO.setTechnologic(object.getString("technologic"));
esRevisePlanDTO.setBussSort(object.getString("bussSort"));
esRevisePlanDTO.setLxd(object.getString("LXD"));
- lawsUserInfoService.addPlan(esRevisePlanDTO);
+ if(StringUtils.isNotBlank(object.getString("planId"))){
+ esRevisePlanDTO.setId(object.getString("planId"));
+ lawsUserInfoService.modStatePlan(esRevisePlanDTO);
+ }else {
+ lawsUserInfoService.addPlan(esRevisePlanDTO);
+ }
}
}else {
prcName="企标制修订计划整改";
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2Before.java
index dc6dadb3..fdb1474d 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2Before.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2Before.java
@@ -28,7 +28,7 @@ public class Step2Before implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
- one1.setLink("bzpgStep2?prcType=5");
+ one1.setLink("bzpgStep2?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3Before.java
index 87b218ec..01744917 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3Before.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3Before.java
@@ -28,7 +28,7 @@ public class Step3Before implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
- one1.setLink("xmpgStep6?prcType=5");
+ one1.setLink("bzpgStep3?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4Before.java
index 660a6949..070ff1dd 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4Before.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4Before.java
@@ -28,7 +28,7 @@ public class Step4Before implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
- one1.setLink("xmpgStep6?prcType=5");
+ one1.setLink("bzpgStep4?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java
index 77e65a43..00799f63 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java
@@ -28,7 +28,7 @@ public class Step5Before implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
- one1.setLink("xmpgStep6?prcType=5");
+ one1.setLink("bzpgStep5?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java
index 1ba0ebfb..db80fbd9 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java
@@ -28,7 +28,7 @@ public class Step6Before implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
- one1.setLink("xmpgStep6?prcType=5");
+ one1.setLink("bzpgStep6?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java
index 77084aea..889c6e21 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java
@@ -28,7 +28,7 @@ public class Step7Before implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
- one1.setLink("xmpgStep6?prcType=5");
+ one1.setLink("bzpgStep7?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java
index 00416fa3..65997dde 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java
@@ -28,7 +28,7 @@ public class Step8Before implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
- one1.setLink("xmpgStep6?prcType=5");
+ one1.setLink("bzpgStep8?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java
index 37b9c42d..9ec842d3 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java
@@ -28,7 +28,7 @@ public class Step9Before implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
- one1.setLink("xmpgStep6?prcType=5");
+ one1.setLink("bzpgStep8-1?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java
index 6b43d033..3f63bde7 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java
@@ -88,6 +88,7 @@ public class ApplyApplicantAfter implements TaskListener{
if(!list.isEmpty()){
BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId());
+ busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNew);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java
index 31483f90..b0ec8b17 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java
@@ -85,6 +85,7 @@ public class CountersignAfter implements TaskListener{
if(!list.isEmpty()){
BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId());
+ busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNew);
}
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 ed51dd54..e36c7c63 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
@@ -78,10 +78,10 @@ public class SLApplicantAfter implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
- if (null!=object.getString("standName") && !"".equals(object.getString("standName"))){
- standName=object.getString("standName");
+ if("0".equals(object.getString("standInData"))){
+ standName = object.getString("standName");
}else {
- standName=object.getString("standEnName");
+ standName = object.getString("standEnName");
}
String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java
index 7f1e0d9c..d2f2979a 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java
@@ -46,7 +46,7 @@ public class ChooseZrAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
- String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
+ String prcName = delegateTask.getVariable("prcName",String.class);
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 321ab87c..32c28626 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
@@ -70,6 +70,7 @@ public class ResolveAfter implements TaskListener{
// String prcName = title+"-标准解读流程-选择执行人";
String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
String prcName1 = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
+ delegateTask.setVariable("prcName",prcName);
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/standardRegulatoryProcess/CountersignSRPAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java
index 54b0b572..2063a781 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java
@@ -52,7 +52,7 @@ public class CountersignSRPAfter implements TaskListener{
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
// object.getString("standName")
- String prcName = delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订";
+ String prcName = delegateTask.getVariable("prcName",String.class);
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/standardRegulatoryProcess/SRPApplyApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java
index e38b711f..25a9f595 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java
@@ -50,7 +50,7 @@ public class SRPApplyApplicantAfter implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
- String prcName = delegateTask.getVariable("listName",String.class)+"-标准法规清单申请-经理人审批";
+ String prcName = delegateTask.getVariable("prcName",String.class);
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/standardRegulatoryProcess/SRPManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java
index 30bf5e03..7affa1eb 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java
@@ -55,7 +55,7 @@ public class SRPManagerApproveAfter implements TaskListener{
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(delegateTask.getVariable("createUser",String.class));
- busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订");
+ busProcessNew.setPrcName(delegateTask.getVariable("prcName",String.class));
busBean.save(busProcessNew);
func1(delegateTask, busBean, object,"1");
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java
index 0725d19c..5beda0fb 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java
@@ -22,8 +22,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
public class SRPstartAfter implements TaskListener {
@@ -92,6 +90,7 @@ public class SRPstartAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName=object.getString("listName")+"-清单确认";
+ delegateTask.setVariable("prcName",prcName);
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);