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/StandardCommentNewProcess/Step10After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java index 265be02d..e5eb5377 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java @@ -49,7 +49,6 @@ public class Step10After implements TaskListener { if (!jsonArray.isEmpty()){ jsonArray.forEach(o -> { JSONObject object1=JSONObject.parseObject(o.toString()); - if ("1".equals(object1.getString("state")) || "2".equals(object1.getString("state"))) { SarPublicIdeaAll sarPublicIdeaAll = new SarPublicIdeaAll(); if (null!=object1.get("id")){ sarPublicIdeaAll.setId(object1.getString("id")); @@ -72,7 +71,6 @@ public class Step10After implements TaskListener { sarPublicIdeaAll.setState(object1.getString("state")); sarPublicIdeaAll.setCause(object1.getString("cause")); sarPublicIdeaAlls.add(sarPublicIdeaAll); - } }); } lawsUserInfoService.savePublicIdeaBatch(sarPublicIdeaAlls); 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/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java index 4cce933a..bab0ec60 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java @@ -89,16 +89,16 @@ public class WriteMaterialAfter implements TaskListener { JSONObject object1 = object.getJSONObject("ch_pageData"); WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO(); - if (StringUtils.isNotEmpty(object1.getString("comityName"))) { - wgWorkGroupShowDTO.setId(object1.getString("comityName")); + if (StringUtils.isNotEmpty(object1.getString("associaName"))) { + wgWorkGroupShowDTO.setId(object1.getString("associaName")); wgWorkGroupShowDTO.setLevel("1"); wgWorkGroupShowDTO.setNature("1"); - if (StringUtils.isNotEmpty(object1.getString("comityNameOne"))) { - wgWorkGroupShowDTO.setId(object1.getString("comityNameOne")); + if (StringUtils.isNotEmpty(object1.getString("associaNameOne"))) { + wgWorkGroupShowDTO.setId(object1.getString("associaNameOne")); wgWorkGroupShowDTO.setLevel("2"); wgWorkGroupShowDTO.setNature("2"); - if (StringUtils.isNotEmpty(object1.getString("comityNameTwo"))) { - wgWorkGroupShowDTO.setId(object1.getString("comityNameTwo")); + if (StringUtils.isNotEmpty(object1.getString("associaNameTwo"))) { + wgWorkGroupShowDTO.setId(object1.getString("associaNameTwo")); wgWorkGroupShowDTO.setLevel("3"); wgWorkGroupShowDTO.setNature("3"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java index 6a7c6e76..9f884abb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java @@ -8,6 +8,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; 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.listener.bussLibrary.BussUtils; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; @@ -34,62 +35,13 @@ public class BussLibraryProduct13After implements TaskListener{ JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - - if(StringUtils.isNotBlank(object.getString("bussUser14"))){ - delegateTask.setVariable("bussUser14",object.getString("bussUser14")); - nextUserList.add(object.getString("bussUser14")); - }else { - throw new ActivitiException("1#2抄送参数不存在,请配置相关人员"); - } - - //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); String prcName = ""; if(StringUtils.isNotBlank(object.getString("standName"))){ prcName = object.getString("standName") + "-企标制修订-产品标准"; }else { prcName = "企标制修订-产品标准"; } - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); - BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - if(one1!=null){ -// one1.setOverTime(OVERTIME); - one1.setPrcType("buss2"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); - } - - // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); - - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); - } - } + BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService); } private String verifyObj(String str){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java index ab8d8beb..1f8ed83d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java @@ -43,7 +43,7 @@ public class BussLibraryProduct5After implements TaskListener{ ideaList=new JSONArray(); } - ideaList.addAll(object.getJSONArray("infoList")); + ideaList.addAll(object.getJSONArray("modelData")); delegateTask.setVariable("ideaList",ideaList); if(StringUtils.isNotBlank(object.getString("bussUser6"))){ 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 = '政策课题组参会流程-流程结束' + + +