From a4e1a1116b59664ed4ea59b572d2ef97853bdb18 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 4 Nov 2021 10:17:25 +0800 Subject: [PATCH] =?UTF-8?q?zcr:=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E8=B5=B7?= 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 | 2 ++ .../service/impl/BusProcessNewServiceImpl.java | 5 +++++ .../listener/RecommendedApproval/RAstartAfter.java | 1 + .../StandardAfterMeetProcess/AutoStartAfter.java | 13 +++++++++---- .../DirectorVerifyAfter.java | 2 ++ .../EngineerReviseDoneAfter.java | 8 +++++--- .../resources/mapper/datas/BusProcessNewMapper.xml | 12 ++++++++++++ 9 files changed, 45 insertions(+), 7 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 250e500a..cc446b52 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 @@ -30,4 +30,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 c699cf84..688fd2c1 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,4 +34,6 @@ public interface IBusProcessNewService extends IService { 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 85e6da57..90bb6c40 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 @@ -78,4 +78,9 @@ 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/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index c4780aa4..48997e50 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; //外部署名推荐批准 public class RAstartAfter implements TaskListener { 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 bc386aa2..3d99d30a 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 @@ -39,12 +39,17 @@ public class AutoStartAfter implements TaskListener { List nextUserList = new ArrayList(); String prcName ="标准化活动会后流程-"; - if(StringUtils.isNotBlank(object.getString("member"))) { - prcName = prcName + "参会人上传会议资料，填写标准及议题"; - nextUserList.add(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"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java index 6f0bf4f3..3e4ca1cb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -51,6 +51,8 @@ public class DirectorVerifyAfter implements TaskListener { if(StringUtils.isNotBlank(object.getString("member"))) { nextUserList.add(object.getString("member")); delegateTask.setVariable("member", object.getString("member")); + }else{ + nextUserList.add(delegateTask.getVariable("member",String.class)); } } 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 c71ef580..2ff9da91 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 @@ -29,7 +29,6 @@ public class EngineerReviseDoneAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -42,7 +41,10 @@ public class EngineerReviseDoneAfter implements TaskListener { // prcName = "标准化活动参会流程-" + "会议结束"; prcName = prcName + "流程结束"; - + //把ch_pageData(前端的) 中的 meetingStartTime取出，放入最外层大JSON里(object) +// JSONObject o1 = object.getJSONObject("ch_pageData"); +// String meetingStartTime = o1.getString("meetingStartTime"); +// object.put("meetingStartTime",meetingStartTime); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); @@ -86,7 +88,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); } diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index 56294e89..f2c9bf4e 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -45,4 +45,16 @@ CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束' + +