diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DetailedUpDto.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DetailedUpDto.java index bfcfcf21..b6970718 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DetailedUpDto.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DetailedUpDto.java @@ -42,7 +42,7 @@ public class DetailedUpDto { private String applicationScope; @ApiModelProperty(value = "附件id") - private String fileId; + private String fileIds; @ApiModelProperty(value = "更新时间") 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 352ceea4..d990236d 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 @@ -70,7 +70,6 @@ public class PEPSumAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 -// throw new ActivitiException("sshaifhiqhfka"); BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -90,6 +89,7 @@ public class PEPSumAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNew.setCommitText(object.getString("commentText")); busProcessNewNext.setUserId(nextUser); busBean.save(busProcessNewNext); } 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 a2b54a86..50cf272f 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 @@ -46,7 +46,7 @@ public class PEPffresPersonAfter implements TaskListener { List nextUserList = new ArrayList(); if (StringUtils.isNotBlank(object.getString("fenFlag"))) { - if ("1".equals(object.getString("fenFlag"))) { + if ("2".equals(object.getString("fenFlag"))) { //通过 记录通过的流程条数 if (null!=delegateTask.getVariable("PEPCount")) { String as = String.valueOf(delegateTask.getVariable("PEPCount")); @@ -54,19 +54,35 @@ public class PEPffresPersonAfter implements TaskListener { } else { delegateTask.setVariable("PEPCount", "1"); } - delegateTask.setVariable("fenFlag", object.getString("fenFlag")); + delegateTask.setVariable("fenFlag", "1"); } else { //不通过就要驳回 - nextUserList.add(object.getString("workPeople")); - delegateTask.setVariable("workPeople", object.getString("workPeople")); - delegateTask.setVariable("fenFlag", object.getString("fenFlag")); + nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); + delegateTask.setVariable("workPeople", String.valueOf(delegateTask.getVariable("workPeople"))); + delegateTask.setVariable("fenFlag", "2"); + + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setCommitText(object.getString("commentText")); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(String.valueOf(delegateTask.getVariable("workPeople"))); + busBean.save(busProcessNewNext); } } //截止时间 流程描述 创建人 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 = "标准项目合规评估-汇总审批"; + String prcName=""; + if ("2".equals(object.getString("fenFlag"))) { + prcName= "标准项目合规评估-汇总审批"; + }else { + prcName="标准项目合规评估-合规性评估"; + } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -89,8 +105,9 @@ public class PEPffresPersonAfter implements TaskListener { busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(busProcessNew); - - oneStep1(delegateTask, busBean, object, nextUserList); + if ("1".equals(object.getString("fenFlag"))) { + oneStep1(delegateTask, busBean, object, nextUserList); + } } 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 62ca835a..6517aaba 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 @@ -37,7 +37,6 @@ public class PEPmanagerApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); PEPDTO pepdto = JSONObject.parseObject(datas.getFormValsJson(), PEPDTO.class); delegateTask.setVariable("objectJson", object); - delegateTask.setVariable("passFlag",object.getString("passFlag")); //后续节点所需要的数据 List liablePeopleList = new ArrayList<>(); //获取对象中的项目的数据 @@ -65,9 +64,11 @@ public class PEPmanagerApproveAfter implements TaskListener { //生成任务信息 Map map=new HashMap<>(); //是否审批通过 passFlag == 1 不通过 - if ("2".equals(String.valueOf(object.get("passFlag")))) { + if (null!=object.get("passFlag")) { //如果流程通过标识为1 则为不通过发送消息给用户流程结束 + delegateTask.setVariable("passFlag","2"); } else { + delegateTask.setVariable("passFlag","1"); int count=0; for (DataList da : dataList) { PEPres pePres=new PEPres(); @@ -131,7 +132,6 @@ public class PEPmanagerApproveAfter implements TaskListener { busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(busProcessNew); - if(liablePeopleList != null && !liablePeopleList.isEmpty()){ for(String liable : liablePeopleList){ BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java index 06e11ecf..f2513bc3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java @@ -70,15 +70,15 @@ public class PEPstartAfter implements TaskListener { } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.saveOrUpdate(busProcessNew); +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.saveOrUpdate(busProcessNew); if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { 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 ea167089..db5979bf 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 @@ -86,6 +86,7 @@ public class PEPtaskEstimateAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNew.setCommitText(object.getString("commentText")); busProcessNewNext.setUserId(nextUser); busBean.save(busProcessNewNext); } 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 5b8040f4..ae5db504 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 @@ -89,17 +89,17 @@ public class PEPtaskLssueAfter implements TaskListener { } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - PEPres pePres=new PEPres(); - pePres.setStep3DTOS(res); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(JSONObject.toJSONString(pePres)); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.saveOrUpdate(busProcessNew); +// BusProcessNew busProcessNew = new BusProcessNew(); +// PEPres pePres=new PEPres(); +// pePres.setStep3DTOS(res); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(JSONObject.toJSONString(pePres)); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.saveOrUpdate(busProcessNew); //更改遍历方式！！遍历生成的数据条数 每条都要判断！！ if (workPeoples != null && !workPeoples.isEmpty()) { for (String nextUser : workPeoples) { 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 81d19e47..0c03eae0 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 @@ -68,7 +68,7 @@ public class SRPManagerApproveAfter implements TaskListener{ DetailedUpDto detailed=new DetailedUpDto(); detailed.setId(object.getString("standId")); detailed.setApplicationScope(object.getString("applyRegion")); - detailed.setFileId(object.getString("model")); + detailed.setFileIds(object.getString("model")); detailed.setRemark(object.getString("descriptionList")); detailed.setInforlist(object.getString("inforlist")); detailed.setDetailedListState("1");