diff --git a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java new file mode 100644 index 00000000..9526cf8c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java @@ -0,0 +1,136 @@ +package com.ydw.bat.wkflow.listener.KCSTPReviewProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +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.util.SpringContextUtil; +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 SubViceDirectorAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + + /** + * next 结束 + */ + List nextUserList = new ArrayList(); + if ("0".equals(object.getString("actionFlag"))){ + delegateTask.setVariable("lawsProveViceChiefVerify",0); + + //流程结束 + func2(delegateTask, busBean, object, "0", busProcessNameService); + + }else { + //TODO 驳回 + String startUser = object.getString("startUser"); + delegateTask.setVariable("startUser",startUser); + nextUserList = Arrays.asList(startUser.split(",")); + + + delegateTask.setVariable("lawsProveViceChiefVerify",1); + + + } + + + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); +// object.getString("standName") + String standName = ""; + String prcName = "重点认证标准/政策合规性项目审查流程-责任部门领导任务下发"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("laws3"); + 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); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } + + //流程结束 + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + //one2.setPrcName("入库流程结束"); + one2.setOverTime(OVERTIME); + one2.setPrcType("laws3"); + busProcessNameService.saveOrUpdate(one2); + } + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java index 41f7f0ce..568c6525 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java @@ -37,7 +37,7 @@ public class UploadCommentBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("wfhxzgStep4?prcType=8&routerType=oa"); + one1.setLink("wfhxzgStep4?prcType=8"); one1.setTaskInfo(delegateTask.getName()); // 干活节点流程 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java index 268c4a8d..a6dbc9c4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java @@ -133,11 +133,13 @@ public class StartSurveyAfter implements TaskListener { } JSONArray res=new JSONArray(); JSONArray object1=JSONArray.parseArray(object.getString("filesId")); - object1.forEach(o -> { - JSONObject object2=JSONObject.parseObject(o.toString()); - object2.put("standFileClassify",object.getString("textType")); - res.add(object2); - }); +// if(null!=object1 && object1.size()>0) { + object1.forEach(o -> { + JSONObject object2 = JSONObject.parseObject(o.toString()); + object2.put("standFileClassify", object.getString("textType")); + res.add(object2); + }); +// } //发起公开征求意见 SarPublicIdea sarPublicIdea = SarPublicIdea.builder() .id(UUID.randomUUID().toString()) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/PEPstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/PEPstartAfter.java index 49994ac2..9cdd872c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/PEPstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/PEPstartAfter.java @@ -63,7 +63,7 @@ public class PEPstartAfter implements TaskListener { for (Object o:array) { JSONObject jsonObject=JSONObject.parseObject(o.toString()); if (null!=people_project.get(jsonObject.getString("projectGroupPeopleId"))){ - people_project.get("projectGroupPeopleId").add(jsonObject.getString("projectGroup")); + people_project.get(jsonObject.getString("projectGroupPeopleId")).add(jsonObject.getString("projectGroup")); }else { List strings=new ArrayList<>(); strings.add(jsonObject.getString("projectGroup")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java index add35353..d0b781c5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java @@ -84,7 +84,7 @@ public class Step8After implements TaskListener { sarStandard.setProductLineId(object1.getString("projectGroup")); sarStandard.setStandName(object.getString("standName")); sarStandard.setStandNumber(object.getString("standNumber")); - sarStandard.setStandardItem(object1.getString("itemsName")); + sarStandard.setStandardItem(object1.getString("itemsNum")); sarStandard.setType(String.valueOf(UUID.randomUUID())); sarStandard.setStandId(delegateTask.getVariable("standsId", String.class)); sarStandard.setStandType(delegateTask.getVariable("standType", String.class)); @@ -99,8 +99,8 @@ public class Step8After implements TaskListener { sarStandard.setResearchCountermeasures(object1.getString("countermeasures")); sarStandard.setResearchNonCompliance(object1.getString("noCompliance")); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - sarStandard.setEvaluationPeople(object1.getString("implementer")); - sarStandard.setEvaluationPeopleName(object1.getString("implementerId")); + sarStandard.setEvaluationPeople(object1.getString("implementerId")); + sarStandard.setEvaluationPeopleName(object1.getString("implementer")); sarStandard.setEvaluationTime(simpleDateFormat.format(new Date())); i++; productAssesses.add(sarStandard); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2After.java index d0c1636a..4cbb6112 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2After.java @@ -143,6 +143,7 @@ public class Step2After implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3After.java index 591269b3..c3c50740 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3After.java @@ -60,6 +60,7 @@ public class Step3After implements TaskListener { List list = busBean.list(queryWrapper3); if(!list.isEmpty()){ BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java index bf31abe3..be5ec208 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java @@ -85,6 +85,7 @@ public class Step4After implements TaskListener { List list = busBean.list(queryWrapper3); if(!list.isEmpty()){ BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java index eaafddc9..947c748e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java @@ -85,6 +85,8 @@ public class Step5After implements TaskListener { sarStandUnqualified.setPlanCloseTime(jsonObject.getDate("completionTime")); sarStandUnqualified.setProductLine(object.getString("productLine")); sarStandUnqualified.setProductId(object.getString("projectNumber")); + sarStandUnqualified.setItemsNum(jsonObject.getString("itemsNum")); + sarStandUnqualified.setStandName(jsonObject.getString("itemsName")); standUnqualifieds.add(sarStandUnqualified); } if (null!=jsonObject.getString("remarks") || null!=jsonObject.getString("complianceReasons") || null!= jsonObject.getString("noCompliance")) { @@ -149,6 +151,7 @@ public class Step5After implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews);