From e416b2585e29c4674b899a3702aab7d7b86472c9 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Jun 2022 15:06:14 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardCommentProcess/UploadResearchResultBefore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From 53450033c11067d3e8f1dbe021d2069858b2115a Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Jun 2022 16:12:35 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E5=85=A8=E7=A8=8B?= =?UTF-8?q?=E5=8A=A0oa=E5=BE=85=E5=8A=9E=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/projectEvaluationNewProcess/Step2Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step3Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step4Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step5Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step6Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step7Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step8Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step9Before.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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..f26ed52e 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("xmpgStep6?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..00d3b9f8 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("xmpgStep6?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..acefd8c7 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("xmpgStep6?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..48de42f9 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("xmpgStep6?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..5480c4a6 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("xmpgStep6?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..ecb6c1f6 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("xmpgStep6?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..653c015b 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("xmpgStep6?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } From 0271e493f60306db3a5c139eb2d8c3e72a1cbeb3 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 23 Jun 2022 18:10:09 +0800 Subject: [PATCH 03/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B5=B7=E4=BC=81=E6=A0=87=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=20=E8=87=AA=E5=8A=A8=E5=AD=98=E5=85=A5=E8=8D=89?= =?UTF-8?q?=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 + .../business_auth/LawsUserInfoService.java | 11 ++ .../datas/controller/TbTaskController.java | 94 ++++++++++++++ .../entity/SarBussionessStandStatePage.java | 72 +++++++++++ .../business_main/datas/entity/TbTask.java | 58 +++++++++ .../datas/entity/standState/ModelData.java | 40 ++++++ .../datas/entity/standState/QbfsForm.java | 95 ++++++++++++++ .../datas/entity/standState/RoleForm.java | 110 ++++++++++++++++ .../entity/standState/StandStateDraft.java | 46 +++++++ .../datas/mapper/TbTaskMapper.java | 18 +++ .../datas/service/ITbTaskService.java | 16 +++ .../datas/service/impl/TbTaskServiceImpl.java | 20 +++ .../ydw/bat/wkflow/config/GetBeanUtil.java | 28 +++++ .../wkflow/config/ScheduledJobStandState.java | 112 +++++++++++++++++ .../ydw/bat/wkflow/config/SchedulerConf.java | 119 ++++++++++++++++++ 15 files changed, 844 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/TbTaskController.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStandStatePage.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/TbTask.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/QbfsForm.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/RoleForm.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/StandStateDraft.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/TbTaskMapper.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ITbTaskService.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/TbTaskServiceImpl.java create mode 100644 src/main/java/com/ydw/bat/wkflow/config/GetBeanUtil.java create mode 100644 src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java create mode 100644 src/main/java/com/ydw/bat/wkflow/config/SchedulerConf.java diff --git a/pom.xml b/pom.xml index d5255b7f..05b23d50 100644 --- a/pom.xml +++ b/pom.xml @@ -203,6 +203,11 @@ spring-boot-starter-test test + + com.google.code.gson + gson + 2.8.6 + diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 523a8f1e..fb4473b0 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -7,6 +7,7 @@ import com.ydw.bat.wkflow.business_main.datas.dto.WG.NewsFeed; import com.ydw.bat.wkflow.business_main.datas.dto.WG.ProductDeptIssue; import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgWorkGroupShowDTO; 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_slrs.dao.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.format.annotation.DateTimeFormat; @@ -31,6 +32,16 @@ public interface LawsUserInfoService { @GetMapping("sys/org/getOrgByUserId") public ResponseMessage getOrgByUserId(@RequestParam("userId") String userId); + /** + * 废止（企标复审） + * @param + * @param page + * @return + */ + @GetMapping("/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList") + public List getSarBussionessStandStateProcessList(SarBussionessStandStatePage page); + + /** * 废止（企标复审） * @param diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/TbTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/TbTaskController.java new file mode 100644 index 00000000..f8f3b1b8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/TbTaskController.java @@ -0,0 +1,94 @@ +package com.ydw.bat.wkflow.business_main.datas.controller; + + +import com.ydw.bat.wkflow.business_main.datas.entity.TbTask; +import com.ydw.bat.wkflow.business_main.datas.service.ITbTaskService; +import com.ydw.bat.wkflow.config.SchedulerConf; +import io.swagger.annotations.Api; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +/** +*

+ * 动态定时任务表 前端控制器 + *

+* +* @author super_liu +* @since 2022-05-27 +*/ +@RestController +@Api(tags = "动态定时任务表") +@RequestMapping("/tsTask") +public class TbTaskController{ + + @Autowired + private SchedulerConf schedulerConf; + + @Autowired + private ITbTaskService iTbTaskService; + + /** + * 启动一个动态定时任务 + * http://localhost:10085/tbTask/start/2 + */ + @GetMapping("start/{taskId}") + public String start(@PathVariable("taskId") String taskId){ + schedulerConf.start(taskId); + return "操作成功"; + } + + /** + * 停止一个动态定时任务 + * http://localhost:10085/tbTask/stop/2 + */ + @GetMapping("stop/{taskId}") + public String stop(@PathVariable("taskId") String taskId){ + schedulerConf.stop(taskId); + return "操作成功"; + } + + /** + * 更新一个动态定时任务 + * http://localhost:10085/tbTask/save?taskId=2&taskExp=0/2 * * * * ?&taskClass=cn.huanzi.qch.springboottimer.task.MyRunnable3 + */ + @PostMapping("save") + public String save(TbTask task) throws IllegalAccessException { + //先更新表数据 + TbTask tbTask = iTbTaskService.getById(task.getId()); + + //null值忽略 + List ignoreProperties = new ArrayList<>(7); + + //反射获取Class的属性（Field表示类中的成员变量） + for (Field field : task.getClass().getDeclaredFields()) { + //获取授权 + field.setAccessible(true); + //属性名称 + String fieldName = field.getName(); + //属性的值 + Object fieldValue = field.get(task); + + //找出值为空的属性，我们复制的时候不进行赋值 + if(null == fieldValue){ + ignoreProperties.add(fieldName); + } + } + + //org.springframework.beans BeanUtils.copyProperties(A,B)：A中的值付给B + BeanUtils.copyProperties(task, tbTask,ignoreProperties.toArray(new String[0])); + iTbTaskService.updateById(tbTask); + schedulerConf.tasks.clear(); + + //停止旧任务 + schedulerConf.stop(tbTask.getId()); + + //重新启动 + schedulerConf.start(tbTask.getId()); + return "操作成功"; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStandStatePage.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStandStatePage.java new file mode 100644 index 00000000..ffbc88b9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStandStatePage.java @@ -0,0 +1,72 @@ +package com.ydw.bat.wkflow.business_main.datas.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * 企业标准信息复审表 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +@Data +@ApiModel(value="SarBussionessStandStatePage对象", description="企业标准信息复审表分页") +public class SarBussionessStandStatePage{ + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键/企业标准信息主键") + private String id; + + @ApiModelProperty(value = "企标ID") + private String standId; + + @ApiModelProperty(value = "名称") + private String standName; + + @ApiModelProperty(value = "企标编号") + private String standCode; + + @ApiModelProperty(value = "复审时间") + private Date reviewTime; + + @ApiModelProperty(value = "发布日期") + private Date issueTime; + + @ApiModelProperty(value = "复审结果 1 修订、2 废止、3 继续有效") + private Integer reviewResults; + + @ApiModelProperty(value = "复审关联流程编号") + private String reviewProcessNum; + + @ApiModelProperty(value = "创建日期") + private Date creationTime; + + @ApiModelProperty(value = "更新日期") + private Date modifyTime; + + private Integer validFlag; + + @ApiModelProperty(value = "参数1") + private Integer param1; + + @ApiModelProperty(value = "参数2") + private String param2; + + private String reviewTimeStart; + private String reviewTimeEnd; + + private String issueTimeStart; + private String issueTimeEnd; + + private String QCDW; + private String QCRBUSS; + private String standSort; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/TbTask.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/TbTask.java new file mode 100644 index 00000000..faa10c45 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/TbTask.java @@ -0,0 +1,58 @@ +package com.ydw.bat.wkflow.business_main.datas.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * 动态定时任务表 + *

+ * + * @author super_liu + * @since 2022-05-27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="TbTask对象", description="动态定时任务表") +public class TbTask implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "定时任务id") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "定时任务名称") + private String taskName; + + @ApiModelProperty(value = "定时任务描述") + private String taskDesc; + + @ApiModelProperty(value = "定时任务Cron表达式") + private String taskExp; + + @ApiModelProperty(value = "定时任务状态，0停用 1启用") + private Integer taskStatus; + + @ApiModelProperty(value = "定时任务的Runnable任务类完整路径") + private String taskClass; + + @ApiModelProperty(value = "更新时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date updateTime; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date createTime; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java new file mode 100644 index 00000000..56862814 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java @@ -0,0 +1,40 @@ +/** + * Copyright 2022 bejson.com + */ +package com.ydw.bat.wkflow.business_main.datas.entity.standState; +import lombok.Data; + +import java.util.Date; + +/** + * Auto-generated: 2022-06-23 15:31:2 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +@Data +public class ModelData { + + private String id; + private String standId; + private String standName; + private String standCode; + private Date reviewTime; + private Date issueTime; + private String reviewResults; + private String reviewProcessNum; + private Date creationTime; + private Date modifyTime; + private int validFlag; + private String param1; + private String param2; + private Date putTime; + private String standSort; + private String qcdw; + private String fsrqbuss; + private String qcrbuss; + private String processStatus; + private String bussFsSubUser1; + private String bussFsSubUser1Name; + +} \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/QbfsForm.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/QbfsForm.java new file mode 100644 index 00000000..e05401c5 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/QbfsForm.java @@ -0,0 +1,95 @@ +/** + * Copyright 2022 bejson.com + */ +package com.ydw.bat.wkflow.business_main.datas.entity.standState; +import java.util.List; + +/** + * Auto-generated: 2022-06-23 15:31:2 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class QbfsForm { + + private List modelData; + private String entNumber= ""; + private String cnName= ""; + private String enName= ""; + private String entCategory= ""; + private String replaceNumber= ""; + private String replacedNumber= ""; + private String releaseDate= ""; + private String implementDate= ""; + private String reviewDate= ""; + public void setModelData(List modelData) { + this.modelData = modelData; + } + public List 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..1d4786d9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java @@ -0,0 +1,112 @@ +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); + 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("每天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); + } +} From e16a72d4fe875d2a39d7b72a498cccad9f00246a Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 24 Jun 2022 13:22:48 +0800 Subject: [PATCH 04/13] =?UTF-8?q?feat:=20bug=20#55972=20=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B5=B7=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8F=91=E8=B5=B7=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 2 +- .../datas/entity/standState/ModelData.java | 16 ++++++--- .../wkflow/config/ScheduledJobStandState.java | 33 +++++++++++-------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index fb4473b0..6d8b1bdc 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -38,7 +38,7 @@ public interface LawsUserInfoService { * @param page * @return */ - @GetMapping("/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList") + @PostMapping("/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList") public List getSarBussionessStandStateProcessList(SarBussionessStandStatePage page); diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java index 56862814..fbdcadac 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java @@ -2,6 +2,7 @@ * Copyright 2022 bejson.com */ package com.ydw.bat.wkflow.business_main.datas.entity.standState; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -19,16 +20,21 @@ public class ModelData { private String standId; private String standName; private String standCode; - private Date reviewTime; - private Date issueTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String reviewTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTime; private String reviewResults; private String reviewProcessNum; - private Date creationTime; - private Date modifyTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String modifyTime; private int validFlag; private String param1; private String param2; - private Date putTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String putTime; private String standSort; private String qcdw; private String fsrqbuss; diff --git a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java index 1d4786d9..d649c118 100644 --- a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java +++ b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java @@ -78,21 +78,26 @@ public class ScheduledJobStandState implements Runnable { QbfsForm qbfsForm = new QbfsForm(); SarBussionessStandStatePage page = new SarBussionessStandStatePage(); List modelDataList = lawsUserInfoService.getSarBussionessStandStateProcessList(page); - qbfsForm.setModelData(modelDataList); - standStateDraft.setQbfsForm(qbfsForm); - standStateDraft.setRoleForm(roleForm); - String json = toJson(standStateDraft); - System.out.println(json); + 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); + 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){ From 488c8cdafd5bade6a9340128c1453f1cb4c8fb0b Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 27 Jun 2022 09:47:59 +0800 Subject: [PATCH 05/13] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=20=E5=8F=91=E8=B5=B7=E5=90=8E=E8=8A=82=E7=82=B9=20?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=90=8D=E7=A7=B0=20=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/standardLibrary/SLApplicantAfter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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("")){ From 9bd59a96755b3e9838e1bd786f54cadf62b12818 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 11:08:19 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/StandardSurvey/StartSurveyAfter.java | 6 ------ .../standardRegulatoryProcess/CountersignSRPAfter.java | 2 +- .../standardRegulatoryProcess/SRPApplyApplicantAfter.java | 2 +- .../standardRegulatoryProcess/SRPManagerApproveAfter.java | 2 +- .../listener/standardRegulatoryProcess/SRPstartAfter.java | 3 +-- 5 files changed, 4 insertions(+), 11 deletions(-) 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/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); From 0e4fba793699bee0f2e353212d89a7d6a0a1a19c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 11:18:00 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java | 2 +- .../com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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); From bd7dfe8aeb3f96e4703d88d7ff7965a93c60b51e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 11:27:47 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAComplianceAssessmentAfter.java | 2 +- .../PCAbafgManagerApproveAfter.java | 4 ++-- .../ProjectComplianceAssessment/PCAbzManagerApproveAfter.java | 4 ++-- .../ProjectComplianceAssessment/PCAdlApproveAfter.java | 4 ++-- .../ProjectComplianceAssessment/PCAffLiableApproveAfter.java | 4 ++-- .../PCAffLiableDistributeAfter.java | 2 +- .../ProjectComplianceAssessment/PCAgcManagerApproveAfter.java | 4 ++-- .../ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java | 2 +- .../ProjectComplianceAssessment/PCAjgManagerApproveAfter.java | 4 ++-- .../PCAjgManagerDistributeAfter.java | 2 +- .../listener/ProjectComplianceAssessment/PCAstartAfter.java | 3 ++- .../listener/ProjectComplianceAssessment/PCAsumAfter.java | 2 +- 12 files changed, 19 insertions(+), 18 deletions(-) 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); From ae86fb2cbbc30bae4cf9a4c0dfc7047987f7e6be Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 16:09:16 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=AF=A5=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/projectEvaluationNewProcess/Step3Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step4Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step5Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step7Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step8Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step9Before.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 f26ed52e..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&routerType=oa"); + 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 00d3b9f8..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&routerType=oa"); + 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 acefd8c7..6aac2aff 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&routerType=oa"); + one1.setLink("xmpgStep5?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 5480c4a6..52923699 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&routerType=oa"); + one1.setLink("xmpgStep7?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 ecb6c1f6..2c6f6c38 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&routerType=oa"); + one1.setLink("xmpgStep8?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 653c015b..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&routerType=oa"); + one1.setLink("bzpgStep8-1?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } From cffeae5643de0846cc6691131e5100c38d60609b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 16:18:56 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/projectEvaluationNewProcess/Step5Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step6Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step7Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step8Before.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 6aac2aff..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("xmpgStep5?prcType=5&routerType=oa"); + 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 48de42f9..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&routerType=oa"); + 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 52923699..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("xmpgStep7?prcType=5&routerType=oa"); + 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 2c6f6c38..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("xmpgStep8?prcType=5&routerType=oa"); + one1.setLink("bzpgStep8?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } From d7f66d4d25f34ca4da8b68fd7847386ed3a1fc3d Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 28 Jun 2022 18:11:19 +0800 Subject: [PATCH 11/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=20=E6=94=B9=E6=94=B9=E6=94=B9=20=E4=BB=8E=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=20=E6=94=B9=E5=88=B0=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E5=8F=8A?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20=E6=94=B9=E8=87=B3=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B7=B2=E7=A1=AE=E8=AE=A4=E5=85=B3=E8=81=94=E4=B9=8B?= =?UTF-8?q?=E5=A4=9A=E2=80=A6=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStep4After.java | 3 +++ 1 file changed, 3 insertions(+) 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..0145aae5 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 @@ -52,6 +52,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"); From ab06224a36e99c2e700f757a72eb7a329c638ab8 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Jun 2022 10:41:49 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=20?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=20=E8=BF=98=E6=9C=89=E6=89=B9=E5=87=86=20?= =?UTF-8?q?=E8=8A=82=E7=82=B9=20=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java | 1 + .../bat/wkflow/listener/standardLibrary/CountersignAfter.java | 1 + 2 files changed, 2 insertions(+) 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); } From b971de19398d8351ac6f10bf05d7814b6f2e2fa3 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 29 Jun 2022 15:47:26 +0800 Subject: [PATCH 13/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=20=E6=94=B9=E6=94=B9=E6=94=B9=20=E4=BB=8E=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=20=E6=94=B9=E5=88=B0=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E5=8F=8A?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20=E6=94=B9=E8=87=B3=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B7=B2=E7=A1=AE=E8=AE=A4=E5=85=B3=E8=81=94=E4=B9=8B?= =?UTF-8?q?=E5=A4=9A=E2=80=A6=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/business_auth/LawsUserInfoService.java | 3 +++ .../ProcessStep4After.java | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 6d8b1bdc..7333f7e1 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -169,6 +169,9 @@ public interface LawsUserInfoService { @PostMapping("/esRevisePlan/es-revise-plan/modPlanByWk") public ResponseMessage modPlan(@RequestBody EsRevisePlanDTO esRevisePlan); + @PostMapping("/esRevisePlan/es-revise-plan/modPlanByProcess") + public ResponseMessage modStatePlan(@RequestBody EsRevisePlanDTO esRevisePlan); + @PostMapping("/esRevisePlan/es-revise-plan/addPlanByWk") public ResponseMessage addPlan(@RequestBody EsRevisePlanDTO esRevisePlan); 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 0145aae5..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.*; @@ -129,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="企标制修订计划整改";