diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 649acafc..561a0e11 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -173,12 +173,12 @@ public class TodoTaskController extends BaseAction { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String data = sdf.format(entry.getValue().get(0).get("createTime")); res.setAcceptTime(data); - //获取新的流程名称 - QueryWrapper queryWrapper1=new QueryWrapper<>(); - queryWrapper1.eq("P_ID",res.getPrcId()); - queryWrapper1.eq("TASK_ID",res.getTaskIds()); - BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1); - res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" ); +// //获取新的流程名称 +// QueryWrapper queryWrapper1=new QueryWrapper<>(); +// queryWrapper1.eq("P_ID",res.getPrcId()); +// queryWrapper1.eq("TASK_ID",res.getTaskIds()); +// BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1); +// res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" ); todoList.add(res); } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java index fb8f1e18..c7ce232b 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java @@ -53,7 +53,7 @@ public class BusProcessModelHisController { @ApiOperation(value = "|onlyOffice接收文件") @PostMapping("/recieveFile") - public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String pid, String taskId){ + public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String fileId){ logger.info("**********进入onlyoffice接收文档接口************"); try { PrintWriter writer = response.getWriter(); @@ -77,6 +77,70 @@ public class BusProcessModelHisController { logger.info("**********onlyoffice接收文档接口获得结果body************" + body); int status = (Integer) jsonObj.get("status"); + int saved = 0; + if (status == 2 || status == 3)//MustSave, Corrupted + { + String downloadUri = (String) jsonObj.get("url"); + + try { + logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); + if (StringUtils.isNotEmpty(downloadUri)) { + StringBuilder builder=new StringBuilder(); + builder.append(standEditFilePath); + builder.append(standNo).append("/"); + builder.append(fileNm); + String saveFileUrl = builder.toString(); + File file = new File(saveFileUrl); + downloadNetFile(downloadUri, file); + // 更新在线编辑当前节点编辑状态 + busProcessModelHisService.modelHisOneUpdStatusById(fileId); + } + } catch (Exception ex) { + saved = 1; + logger.info("**********onlyoffice接收文档接口异常************" + ex.getMessage()); + logger.error(ex.getMessage(),ex); + } + } else if (status == 4) { + logger.info("**********onlyoffice接收文档接口开始修改文件状态状态4************"); + + logger.info("**********onlyoffice接收文档接口修改文件状态成功状态4************"); + } + logger.info("onlyoffice编辑完成--------------"); + writer.write("{\"error\":" + saved + "}"); + + } catch (IOException e) { + logger.info("**********onlyoffice接收文档接口异常************" + e.getMessage()); + logger.error(e.getMessage(),e); + return; + } + } + + @ApiOperation(value = "|onlyOffice接收文件") + @PostMapping("/recieveFileBefore") + public void recieveFileBefore(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String pid, String taskId){ + logger.info("**********进入onlyoffice接收文档接口************"); + try { + PrintWriter writer = response.getWriter(); + String body = ""; + try { + Scanner scanner = new Scanner(request.getInputStream()); + scanner.useDelimiter("\\A"); + body = scanner.hasNext() ? scanner.next() : ""; + scanner.close(); + } catch (Exception ex) { + writer.write("get request.getInputStream error:" + ex.getMessage()); + return; + } + + if (body.isEmpty()) { + writer.write("empty request.getInputStream"); + return; + } + + net.sf.json.JSONObject jsonObj = net.sf.json.JSONObject.fromObject(body); + logger.info("**********onlyoffice接收文档接口获得结果body************" + body); + int status = (Integer) jsonObj.get("status"); + int saved = 0; if (status == 2 || status == 3)//MustSave, Corrupted { @@ -139,9 +203,10 @@ public class BusProcessModelHisController { return modelHisOne; } + @ApiOperation(value = "|model| 传入 模板文档名称（不带后缀）默认 docx") @GetMapping("/saveEditFile") - public BusProcessModelHis saveEditFile() { - return busProcessModelHisService.saveEditFile(); + public BusProcessModelHis saveEditFile(String model) { + return busProcessModelHisService.saveEditFile(model); } @GetMapping("/processModelHisOneUpdStatus") diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java index 01b9c20f..2d83050d 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java @@ -17,6 +17,8 @@ import java.util.List; */ public interface IBusProcessModelHisService extends IService { + BusProcessModelHis modelHisOneUpdStatusById(String id); + BusProcessModelHis modelHisOneUpdStatus(String pid,String taskId); BusProcessModelHis modelHisOneCount(String pid); @@ -25,7 +27,7 @@ public interface IBusProcessModelHisService extends IService BusProcessModelHis modelHisOne(String pid,String taskId); - BusProcessModelHis saveEditFile(); + BusProcessModelHis saveEditFile(String model); List modelHisList(String pid); diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java index 8fc04b8d..200e9d04 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java @@ -49,7 +49,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl userList = new ArrayList<>(dockUserList); -// userList.add(object.getString("dockUser")); userList.add(object.getString("ministerUser")); delegateTask.setVariable("userList",userList); @@ -63,19 +62,17 @@ public class StartSurveyAfter implements TaskListener { //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("startUser"); String username = object.getString("startUserName"); delegateTask.setVariable("startId",user); delegateTask.setVariable("startName",username); - String standName = object.getString("title"); + String standName = object.getString("processName"); delegateTask.setVariable("title",standName); - String prcName = standName+"-标准调研流程"; + String prcName = standName; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ -// one1.setOverTime(OVERTIME); one1.setPrcType("2"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -118,7 +115,7 @@ public class StartSurveyAfter implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("责任对接人选择责任人"); + busProcessNewNext.setTaskInfo("任务分发"); busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class)); busBean.save(busProcessNewNext); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java index e8a5f690..b1404707 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java @@ -58,7 +58,7 @@ public class SummarySurveyAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("2"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java index 4151ec07..5a99dda1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java @@ -74,7 +74,7 @@ public class UploadResearchResultAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("2"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -87,7 +87,7 @@ public class UploadResearchResultAfter implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("责任对接人审批"); + busProcessNewNext.setTaskInfo("调研结果审批"); busProcessNewNext.setUserId(os.getString("dockUser")); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java index fbeb6c7f..f56b1308 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java @@ -62,7 +62,7 @@ public class ProcessStep1After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java index afe97b04..6db9d0a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java @@ -70,7 +70,7 @@ public class ProcessStep2After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java index a843aa97..bc9657e2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java @@ -47,7 +47,7 @@ public class ProcessStep3After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java index 982a7850..92e80583 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java @@ -58,7 +58,7 @@ public class ProcessStep4After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java index 0252988a..d6971ddd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java @@ -58,7 +58,7 @@ public class ProcessStep5After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java index 98b0d4cd..cce7bd37 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java @@ -73,7 +73,7 @@ public class ProcessStep6After implements TaskListener { one1.setOverTime(OVERTIME); } one1.setPrcType("24"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java index d5e848ee..b201c6f7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java @@ -43,7 +43,7 @@ public class BussFs2After implements TaskListener{ delegateTask.setVariable("bussFsUser3",object.getString("bussFsUser3")); nextUserList.add(object.getString("bussFsUser3")); }else { - throw new ActivitiException("1#2发起人不存在,请配置相关人员"); + throw new ActivitiException("1#2标准法规部高级经理不存在,请配置相关人员"); } @@ -54,7 +54,7 @@ public class BussFs2After implements TaskListener{ String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "企标复审流程-发起人汇总结果"; + String prcName = "企标复审流程-标准法规部高级经理批准"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); @@ -68,16 +68,6 @@ public class BussFs2After implements TaskListener{ busProcessNameService.saveOrUpdate(one1); } - /** - * 当子任务结束时存储 - */ - Integer commentCount=delegateTask.getVariable("commentCount",Integer.class); - if(commentCount==null)commentCount=0; - commentCount++; - delegateTask.setVariable("count",commentCount); - - Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class); - // 存储当前节点意见 BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); @@ -90,35 +80,18 @@ public class BussFs2After implements TaskListener{ busProcessNew.setTaskInfo(delegateTask.getName()); busBean.save(busProcessNew); - if(commentCount>=commentUserList.size()){ - 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); - } - } - }else { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one2 = busBean.getOne(queryWrapper1); - if (one1 != null) { - one2.setMsgType("clause"); - one2.setPId(delegateTask.getProcessInstanceId()); - one2.setMesg(object.toJSONString()); - one2.setFinishFlag("0"); - one2.setTaskInfo(delegateTask.getName()); - one2.setPrcName(prcName); - one2.setCommitFlag("0"); - one2.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(one2); + 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); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java index 91d42dc8..fc064629 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java @@ -1,5 +1,8 @@ package com.ydw.bat.wkflow.listener.bussFs; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; @@ -28,17 +31,17 @@ public class BussFs2Before implements TaskListener{ /** * 汇总企标编写文件列表 */ -// String msg = one1.getMesg(); -// JSONObject jsonObject = JSON.parseObject(msg); -// JSONArray fileList=delegateTask.getVariable("fileModelList",JSONArray.class); -// jsonObject.put("fileModelList",fileList); -// one1.setMesg(jsonObject.toJSONString()); + String msg = one1.getMesg(); + JSONObject jsonObject = JSON.parseObject(msg); + JSONArray fileList=delegateTask.getVariable("fileModelList",JSONArray.class); + jsonObject.put("fileModelList",fileList); + one1.setMesg(jsonObject.toJSONString()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFs2?prcType=buss3"); + one1.setLink("bussFs2?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java index 403ae5e5..030b09ed 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java @@ -2,9 +2,11 @@ package com.ydw.bat.wkflow.listener.bussFs; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; 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.entity.EsRevisePlanDTO; 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; @@ -30,6 +32,7 @@ public class BussFs3After implements TaskListener{ IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -49,6 +52,7 @@ public class BussFs3After implements TaskListener{ String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String standSort = object.get("standSort") == null ? "" : object.get("standSort").toString(); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -72,6 +76,7 @@ public class BussFs3After implements TaskListener{ if(StringUtils.isNotBlank(approvalOpinion)){ if ("0".equalsIgnoreCase(approvalOpinion)) { BussUtils.endFunAll(delegateTask, prcName,busBean, object, "0", busProcessNameService,"buss3"); + delegateTask.setVariable("bussFs3Flag", 0); } else { if(StringUtils.isNotBlank(object.getString("bussFsUserC2"))) { BusProcessNew busProcessNew = new BusProcessNew(); @@ -81,8 +86,8 @@ public class BussFs3After implements TaskListener{ busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("xdUserId")); - busProcessNew.setPrcName(prcName); + busProcessNew.setUserId(object.getString("bussFsUserC2")); + busProcessNew.setPrcName("企标复审流程-重新发起人汇总结果"); busBean.save(busProcessNew); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java index a2485ad4..9961819f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java @@ -38,7 +38,7 @@ public class BussFs3Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFs3?prcType=buss3"); + one1.setLink("bussFs3?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java index 21eba1bb..c8cbaac6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java @@ -60,7 +60,7 @@ public class BussFsC2After implements TaskListener{ if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("buss3"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java index bff623ef..1268de35 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java @@ -38,7 +38,7 @@ public class BussFsC2Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFsC2?prcType=buss3"); + one1.setLink("bussFsC2?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java index 2f393cd6..7cd280eb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java @@ -41,7 +41,7 @@ public class BussFsSub1Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFsSub1?prcType=buss3"); + one1.setLink("bussFsSub1?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java index 18a1be50..fa9b7fe0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.bussFs; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; @@ -54,7 +55,16 @@ public class BussFsSub2After implements TaskListener{ String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "企标复审流程-复审人选择复审结果"; + String prcName = "企标复审流程-发起人汇总结果"; + + + Integer commentCount=delegateTask.getVariable("count",Integer.class); + if(commentCount==null)commentCount=0; + commentCount++; + delegateTask.setVariable("count",commentCount); + + Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class); + QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); @@ -62,7 +72,9 @@ public class BussFsSub2After implements TaskListener{ if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("buss3"); - one1.setPrcName(prcName); + if(commentCount>=commentUserList.size()) { + one1.setPrcName(prcName); + } one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -71,12 +83,13 @@ public class BussFsSub2After implements TaskListener{ /** * 当子任务结束时存储 */ - Integer commentCount=delegateTask.getVariable("commentCount",Integer.class); - if(commentCount==null)commentCount=0; - commentCount++; - delegateTask.setVariable("count",commentCount); + JSONArray fileList =delegateTask.getVariable("fileModelList", JSONArray.class); + if (fileList==null) { + fileList=new JSONArray(); + } - Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class); + fileList.addAll(object.getJSONArray("fileModelList")); + delegateTask.setVariable("fileModelList",fileList); // 存储当前节点意见 BusProcessNew busProcessNew = new BusProcessNew(); @@ -108,8 +121,10 @@ public class BussFsSub2After implements TaskListener{ }else { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one2 = busBean.getOne(queryWrapper1); - if (one1 != null) { + queryWrapper.isNotNull("PRC_NAME"); + List list = busBean.list(queryWrapper1); + if (!list.isEmpty()) { + BusProcessNew one2 = list.get(0); one2.setMsgType("clause"); one2.setPId(delegateTask.getProcessInstanceId()); one2.setMesg(object.toJSONString()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java index 9cca52b1..5f51a679 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java @@ -38,7 +38,7 @@ public class BussFsSub2Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFsSub2?prcType=buss3"); + one1.setLink("bussFsSub2?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java index 6ba4b440..ce0ae598 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java @@ -53,7 +53,7 @@ public class ProcessStep1After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("23"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java index 3016f0cf..1d9a4d1b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java @@ -70,7 +70,7 @@ public class ProcessStep2After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("23"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java index 756d2ada..44a7b03a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java @@ -64,7 +64,7 @@ public class ProcessStep1After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("25"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java index 978a3bb7..57455402 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java @@ -67,7 +67,7 @@ public class ProcessStep2After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("25"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java index 9b16909d..5f0db003 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java @@ -59,7 +59,7 @@ public class ProcessStep3After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("25"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); 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 ec0f82bf..dd4ecec0 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 @@ -149,7 +149,7 @@ public class ProcessStep4After implements TaskListener { one1.setOverTime(OVERTIME); } one1.setPrcType("25"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java index 070e4902..3469e53a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java @@ -47,7 +47,7 @@ public class ProcessStep5After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("25"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java index 5cfefa12..1901e95a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java @@ -13,7 +13,9 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class ProcessstartAfter implements TaskListener { @@ -48,7 +50,20 @@ public class ProcessstartAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String prcName = "企标制修订计划-部门高级经理审批"; + //1合并 2延期 3取消 4更名 5立项 + String prcName = ""; + String type=object.getString("type"); + if ("5".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + }else if ("2".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + }else if ("1".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + }else if ("3".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; + }else { + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + } 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/itemlistvalidationprocess/Step1After.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java index 491542c9..6e648ee3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java @@ -56,7 +56,7 @@ public class Step1After implements TaskListener { one1.setOverTime(OVERTIME); } one1.setPrcType("10"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java index dd5c96e5..8f0704bf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java @@ -50,7 +50,7 @@ public class Step3After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("10"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java index 01d708bf..be4396c5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java @@ -72,7 +72,7 @@ public class bzApproveAfter implements TaskListener { one1.setOverTime(OVERTIME); } one1.setPrcType("10"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java index 6247069e..4ea91c9c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java @@ -97,7 +97,7 @@ public class confirmAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("10"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java index af032498..b86028c4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java @@ -57,7 +57,7 @@ public class DirectorAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("1"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java index ea7e09be..df2efd86 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java @@ -73,7 +73,7 @@ public class DistributionAfter implements TaskListener { if(one1!=null){ one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java index 96f93b90..97cac22c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java @@ -63,7 +63,7 @@ public class DockerReviewAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java index 331be057..188274fc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java @@ -73,7 +73,7 @@ public class EngineerReviewAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java index 3026f420..d7b97d53 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java @@ -61,7 +61,7 @@ public class EngineerRevisionAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java index c774bc6a..4b41a489 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java @@ -62,7 +62,7 @@ public class FillCommentAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java index 36345396..7a20e24f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java @@ -65,7 +65,7 @@ public class MinisterReviewAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java index ffd0a1ba..1ef736a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java @@ -65,7 +65,7 @@ public class ViceDirectorAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java index 8824cc97..b07ac3e0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java @@ -100,7 +100,7 @@ public class ApprovalAfter implements TaskListener { one1.setOverTime(OVERTIME); } one1.setPrcType("19"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java index b43429a2..447d891f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java @@ -52,7 +52,7 @@ public class InputInformationAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("19"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java index 1ee02716..a92fe89c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java @@ -52,7 +52,7 @@ public class RevisionInformationAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("19"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java index c69608ef..e65964a9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java @@ -65,7 +65,7 @@ public class MinisterApprovalAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("18"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java index 1f4a2b2e..4e9c63f1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -96,7 +96,7 @@ public class PresidentApprovalAfter implements TaskListener { one1.setOverTime(OVERTIME); } one1.setPrcType("18"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java index 8ca49f6b..ca258538 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java @@ -53,7 +53,7 @@ public class RevisionInformationAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("18"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java index 63478fd0..497bdb7c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -112,7 +112,7 @@ public class PGREPresidentApprovalAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("17"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java index 730f633f..2c7a5249 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java @@ -88,7 +88,7 @@ public class PRGEInspectorApprovalAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("17"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java index ad64a474..ac5df7e1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java @@ -92,7 +92,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("17"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java index be17daa3..ece669f3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java @@ -58,7 +58,7 @@ public class RevisonInformationAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("17"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); 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 4e6ef412..49994ac2 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 @@ -80,7 +80,7 @@ public class PEPstartAfter implements TaskListener { delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("stands",object.getString("standNumber")); - String prcName = String.valueOf(object.getString("standNumber"))+"-标准项目合规评估流程-审核(标准法规业务经理)"; + String prcName = String.valueOf(object.getString("standNumber"))+"-"+object.getString("standName")+"-合规评估"; 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/projectEvaluationNewProcess/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2After.java index 877ec64b..1fe0b4c0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2After.java @@ -56,7 +56,7 @@ public class Step2After implements TaskListener { object1= JSON.parseObject(object.toJSONString()); JSONArray jsonArray1=new JSONArray(); jsonArray1.add(jsonObject); - object1.put("dataList",jsonArray); + object1.put("dataList",jsonArray1); map.put(jsonObject.getString("distributePersonId"),object1); nextUserList.add(jsonObject.getString("distributePersonId")); } @@ -83,7 +83,7 @@ public class Step2After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -96,6 +96,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/projectEvaluationNewProcess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java index 225bc3a0..7108a9ba 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java @@ -95,7 +95,7 @@ public class Step3After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -108,6 +108,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/projectEvaluationNewProcess/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java index 66f9eacb..3015f0fe 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java @@ -54,17 +54,42 @@ public class Step4After implements TaskListener { if (null!=array && array.size()>0){ for (Object o:array) { JSONObject object1= JSON.parseObject(o.toString()); - if (null!=map.get(delegateTask.getAssignee()+"-"+object1.getString("implementerId"))){ - map.get(delegateTask.getAssignee()+"-"+object1.getString("implementerId")).getJSONArray("dataList").add(object1); - }else { - JSONObject object2=JSON.parseObject(object.toJSONString()); - JSONArray array1=new JSONArray(); - array1.add(object1); - object2.put("dataList",array1); - object2.put("keys",delegateTask.getAssignee()+"-"+object1.getString("implementerId")); - map.put(delegateTask.getAssignee()+"-"+object1.getString("implementerId"),object2); - nextUserList.add(object1.getString("implementerId")); - order.add(delegateTask.getAssignee()+"-"+object1.getString("implementerId")); + if (null!=object1.getString("implementerId") && !object1.getString("implementerId").isEmpty()) { + if (object1.getString("implementerId").contains(",")) { + String[] name=object1.getString("implementer").split(","); + int i=0; + for (String ss:object1.getString("implementerId").split(",")) { + JSONObject object3=JSON.parseObject(object1.toJSONString()); + object3.put("implementerId",ss); + object3.put("implementer",name[i]); + if (null != map.get(delegateTask.getAssignee() + "-" + ss)) { + map.get(delegateTask.getAssignee() + "-" + ss).getJSONArray("dataList").add(object3); + } else { + JSONObject object2 = JSON.parseObject(object.toJSONString()); + JSONArray array1 = new JSONArray(); + array1.add(object3); + object2.put("dataList", array1); + object2.put("keys", delegateTask.getAssignee() + "-" + ss); + map.put(delegateTask.getAssignee() + "-" + ss, object2); + nextUserList.add(ss); + order.add(delegateTask.getAssignee() + "-" + ss); + } + i++; + } + } else { + if (null != map.get(delegateTask.getAssignee() + "-" + object1.getString("implementerId"))) { + map.get(delegateTask.getAssignee() + "-" + object1.getString("implementerId")).getJSONArray("dataList").add(object1); + } else { + JSONObject object2 = JSON.parseObject(object.toJSONString()); + JSONArray array1 = new JSONArray(); + array1.add(object1); + object2.put("dataList", array1); + object2.put("keys", delegateTask.getAssignee() + "-" + object1.getString("implementerId")); + map.put(delegateTask.getAssignee() + "-" + object1.getString("implementerId"), object2); + nextUserList.add(object1.getString("implementerId")); + order.add(delegateTask.getAssignee() + "-" + object1.getString("implementerId")); + } + } } } } @@ -92,7 +117,7 @@ public class Step4After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -105,6 +130,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); @@ -114,16 +140,18 @@ public class Step4After implements TaskListener { if (nextUserList != null && !nextUserList.isEmpty()) { int i=0; for (String nextUser : nextUserList) { - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(map.get(order.get(i)).toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); + if (null!=nextUser && !nextUser.isEmpty()) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(map.get(order.get(i)).toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } i++; } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java index b263e68c..f0f19ca6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java @@ -56,7 +56,7 @@ public class Step5After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -69,6 +69,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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java index 630d209f..2a968b40 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java @@ -40,7 +40,7 @@ public class Step6After implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList=new ArrayList<>(); - if (null!=delegateTask.getVariable("SDIdList")){ + if (null!=delegateTask.getVariable("SDIdList") && "0".equals(object.getString("passFlag"))){ nextUserList=delegateTask.getVariable("SDIdList",List.class); } Map map=new HashMap<>(); @@ -77,12 +77,16 @@ public class Step6After implements TaskListener { delegateTask.setVariable("passFlag","0"); delegateTask.setVariable("res6",map); }else { + if (null == delegateTask.getVariable("count6")) { + delegateTask.setVariable("count6", 0); + } + nextUserList.add(s[1]); delegateTask.setVariable("passFlag","1"); } //截止时间 流程描述 创建人 - 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("stands",String.class)+"-标准项目合规评估-审定（项目群负责人）"; @@ -91,7 +95,7 @@ public class Step6After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -104,6 +108,7 @@ public class Step6After 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/projectEvaluationNewProcess/Step7After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java index b90dedd4..c5d1cc79 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java @@ -65,7 +65,7 @@ public class Step7After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -78,6 +78,7 @@ public class Step7After 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); @@ -89,7 +90,7 @@ public class Step7After implements TaskListener { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setMesg(delegateTask.getVariable("Step7Res",JSONObject.class).toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); 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 87fea41f..add35353 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 @@ -133,7 +133,7 @@ public class Step8After implements TaskListener { if (one1 != null) { one1.setOverTime(OVERTIME); one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -146,6 +146,7 @@ public class Step8After 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/projectEvaluationNewProcess/Step9After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java index c74072f3..eeec03c7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java @@ -67,7 +67,7 @@ public class Step9After implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); if (null!=object.getJSONObject("newText")){ @@ -76,19 +76,18 @@ public class Step9After implements TaskListener { busProcessNameService.saveOrUpdate(one1); } - if (null != object.getString("commentText")) { - BusProcessNew busProcessNews = new BusProcessNew(); - busProcessNews.setMsgType("clause"); - busProcessNews.setPId(delegateTask.getProcessInstanceId()); - busProcessNews.setMesg(object.toJSONString()); - busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNews.setFinishFlag("0"); - busProcessNews.setTaskInfo(delegateTask.getName()); - busProcessNews.setTaskId(delegateTask.getId()); - busProcessNews.setUserId("start"); - busProcessNews.setPrcName(prcName); - busProcessNews.setCommitText(object.getString("commentText")); - busBean.save(busProcessNews); + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + 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); + } } if (nextUserList != null && !nextUserList.isEmpty()) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java index 36e03071..89f4e00a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java @@ -186,7 +186,7 @@ public class PEPDepartLeaderAfter implements TaskListener { if (one1 != null) { one1.setOverTime(OVERTIME); one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java index 4fd3900d..bb236a45 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java @@ -63,7 +63,7 @@ public class PEPSumAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java index 9fcc201b..97bff023 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java @@ -87,7 +87,7 @@ public class PEPffresPersonAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java index 52496095..df65e3ef 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java @@ -62,7 +62,7 @@ public class PEPmanagerApproveAfter implements TaskListener { one1.setOverTime(OVERTIME); } one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java index 32f62cab..98a86c0e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java @@ -87,7 +87,7 @@ public class PEPtaskEstimateAfter implements TaskListener { if (one1 != null) { // one1.setOverTime(OVERTIME); one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java index fc1ab3ec..511bf29b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java @@ -93,7 +93,7 @@ public class PEPtaskLssueAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("5"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index 713b8569..3190c7a5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -109,7 +109,7 @@ public class ChargeVerifyAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("20"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index ce8be6c1..76f8aa46 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -109,7 +109,7 @@ public class DirectorChooseAfter implements TaskListener { one1.setOverTime(OVERTIME); } one1.setPrcType("20"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 93a1299e..5249a64e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -57,7 +57,7 @@ public class EngineerReviseAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("20"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index 199c05c8..1e046c9e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -121,7 +121,7 @@ public class EngineerReviseDoneAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("20"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setOverTime(OVERTIME); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index a3ca73a5..fa4816bd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -86,7 +86,7 @@ public class LeaderVerifyAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("20"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index d8e53aad..73721a27 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -87,7 +87,7 @@ public class ManageSignAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("20"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 5b551e2c..58cd263e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -75,7 +75,7 @@ public class PresidentVerifyAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("20"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index b1be2da6..91eb7967 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -56,7 +56,7 @@ public class WriteMemberInfoAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("20"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); 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 b60058cd..2f83d3f6 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 @@ -76,7 +76,7 @@ public class ApplyApplicantAfter implements TaskListener{ if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("1"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); 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 1d3a29e9..99f9879c 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 @@ -73,7 +73,7 @@ public class CountersignAfter implements TaskListener{ if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("1"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); 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 1a92707a..d46197d2 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 @@ -77,19 +77,19 @@ public class SLApplicantAfter implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") - String standName = ""; - if(object.getString("standInData").equals("0")){ - standName = "国内"; - }else { - standName = "海外"; - } + String standName = object.getString("standName"); +// if(object.getString("standInData").equals("0")){ +// standName = "国内"; +// }else { +// standName = "海外"; +// } String standAllName = ""; if(object.getString("standYear") != null && !object.getString("standYear").equals("")){ standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear")); }else { standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")); } - String prcName = standAllName+"-"+standName+"标准入库"; + String prcName = standAllName+"-"+standName+"-入库"; 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/ChooseZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java index 4315e440..7f1e0d9c 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 @@ -53,7 +53,7 @@ public class ChooseZrAfter implements TaskListener{ if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("9"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 96e632d9..13e977b0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -144,7 +144,7 @@ public class DeptApplayAfter implements TaskListener{ one1.setOverTime(OVERTIME); } one1.setPrcType("9"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java index 92a2692d..69d6b7c6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java @@ -66,7 +66,7 @@ public class DeptZrAfter implements TaskListener{ BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("9"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java index f021bfc6..4eb4b01c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java @@ -66,7 +66,7 @@ public class EngineerApplayAfter implements TaskListener{ if (one1 != null) { // one1.setOverTime(OVERTIME); one1.setPrcType("9"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java index 54e1ce48..0b33530a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java @@ -49,7 +49,7 @@ public class ExpainAfter implements TaskListener{ if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("9"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); 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 920cbf49..c6acc07a 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 @@ -66,13 +66,15 @@ public class ResolveAfter implements TaskListener{ delegateTask.setVariable("createDate",new Date()); String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1"); delegateTask.setVariable("titles",title); - String prcName = title+"-标准解读流程-选择执行人"; +// String prcName = title+"-标准解读流程-选择执行人"; + String prcName = title+"-标准解读流程-解读"; + String prcName1 = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("9"); - one1.setPrcName(prcName); + one1.setPrcName(prcName1); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java index 0fe889c7..f07c02f1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java @@ -65,7 +65,7 @@ public class ZrApplayAfter implements TaskListener{ BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("9"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); 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 feeade29..d6973e39 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 @@ -58,7 +58,7 @@ public class CountersignSRPAfter implements TaskListener{ BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("4"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); 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 ccfe1efe..9d1d20f3 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 @@ -56,7 +56,7 @@ public class SRPApplyApplicantAfter implements TaskListener{ BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setPrcType("4"); - one1.setPrcName(prcName); +// one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); 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 725d1766..32d0b8f0 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 @@ -88,8 +88,12 @@ public class SRPManagerApproveAfter implements TaskListener{ } detailed.setInforlist(info.substring(0,info.length()-1)); detailed.setInforlist1(putTime.substring(0,putTime.length()-1)); - detailed.setInforlist2(zccTime.substring(0,zccTime.length()-1)); - detailed.setInforlist3(xcxTime.substring(0,xcxTime.length()-1)); + if (!zccTime.isEmpty()) { + detailed.setInforlist2(zccTime.substring(0, zccTime.length() - 1)); + } + if (!xcxTime.isEmpty()) { + detailed.setInforlist3(xcxTime.substring(0, xcxTime.length() - 1)); + } detailed.setDetailedListState("1"); detailed.setReNewPeople(delegateTask.getVariable("createUser",String.class)); Date date=new Date(); 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 000a532b..0725d19c 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 @@ -91,12 +91,7 @@ public class SRPstartAfter implements TaskListener { delegateTask.setVariable("createUserName",username); String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); - String prcName=""; - if(object.getString("signFlag").equals("1")) { - prcName = standName + "-标准法规清单申请-会签"; - }else { - prcName = standName + "-标准法规清单申请-经理审批"; - } + String prcName=object.getString("listName")+"-清单确认"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);