From 78430da00e1e43f2ae32ae4923e792cfce4f82e7 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 11 Jan 2022 10:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=20=E4=B8=A2=E5=A4=B1=E7=9A=84=E4=BB=A3=E7=A0=81=E6=89=BE?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/controller/BusProcessNewController.java | 7 +++++++ .../datas/mapper/BusProcessNewMapper.java | 2 ++ .../datas/service/IBusProcessNewService.java | 1 + .../service/impl/BusProcessNewServiceImpl.java | 6 ++++++ .../StandardAfterMeetProcess/AutoStartAfter.java | 14 ++++++++++++-- .../EngineerReviseDoneAfter.java | 2 +- .../resources/mapper/datas/BusProcessNewMapper.xml | 13 +++++++++++++ 7 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index e589fd93..d0638029 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -54,6 +54,13 @@ public class BusProcessNewController extends BaseAction { return findtodotask; } + @ApiOperation(value = "每天十点需要启动 标准化活动参会流程") + @GetMapping("/everyDayTenOlockSAM") + public List everyDayTenOlockSAM() { + List findtodotask = iBusProcessNewService.everyDayTenOlockSAM(); + return findtodotask; + } + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java index d2cd2539..9743050e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java @@ -32,4 +32,6 @@ public interface BusProcessNewMapper extends BaseMapper { List everyDayTenOlock(); + List everyDayTenOlockSAM(); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index 9a8a641d..96d479ee 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -34,5 +34,6 @@ public interface IBusProcessNewService extends IService { List findLastworkPeople2(@Param("key")String key, @Param("pId")String pId); List everyDayTenOlock(); + List everyDayTenOlockSAM(); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index 6cfec6b9..539cb7f2 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -83,4 +83,10 @@ public class BusProcessNewServiceImpl extends ServiceImpl everyDayTenOlock() { return baseMapper.everyDayTenOlock(); } + + @Override + public List everyDayTenOlockSAM() { + return baseMapper.everyDayTenOlockSAM(); + } + } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java index eec0084a..97ebe1e8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -42,11 +42,21 @@ public class AutoStartAfter implements TaskListener { if(StringUtils.isNotBlank(object.getString("member"))) { prcName = prcName + "参会人上传会议资料，填写标准及议题"; nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", object.getString("member")); + prcName = prcName + "参会人上传会议资料，填写标准及议题"; + if ("1".equals(object.getString("auto"))) { + delegateTask.setVariable("member", object.getString("member")); + nextUserList.add(object.getString("member")); + } else { + if (StringUtils.isNotBlank(object.getString("memberId"))) { + delegateTask.setVariable("member", object.getString("memberId")); + nextUserList.add(object.getString("memberId")); + } + } } - //截止时间 流程描述 创建人 + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); String username = object.getString("prcCreateUserName"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index 2098f030..a4baf874 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -194,7 +194,7 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("标准化活动参会流程-流程结束"); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); infoService.addMeeting(sapMeeting); diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index b7e9b4db..e3a7a9b0 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -50,4 +50,17 @@ CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束' + + +