From 0c08766db5d172873c3a2506538a829461757b8b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 1 Dec 2021 17:58:17 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E5=92=8C=E6=A0=87=E5=87=86=E7=BB=B4=E5=BA=A6=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=AD=A3=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/dto/SarStandUnqualified.java | 3 + .../SarStandardComplianceProductAssess.java | 12 ++ .../PCAComplianceAssessmentAfter.java | 30 +++- .../PCAbafgManagerApproveAfter.java | 4 + .../PCAdlApproveAfter.java | 14 +- .../PCAffLiableApproveAfter.java | 3 + .../PCAffLiableDistributeAfter.java | 139 +++++++++++++----- .../PCAgcManagerApproveAfter.java | 2 + .../PCAjgManagerApproveAfter.java | 2 + .../listener/aboliish/ProcessStep2After.java | 2 +- .../listener/aboliish/ProcessStep3After.java | 2 +- .../listener/aboliish/ProcessStep4After.java | 4 +- .../listener/aboliish/ProcessStep5After.java | 4 +- .../listener/aboliish/ProcessStep6After.java | 4 +- .../PEPDepartLeaderAfter.java | 16 ++ .../PEPffresPersonAfter.java | 14 ++ .../PEPmanagerApproveAfter.java | 5 +- .../PEPtaskEstimateAfter.java | 30 +++- .../PEPtaskLssueAfter.java | 24 ++- 19 files changed, 246 insertions(+), 68 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java index bae35d09..7d19fd9e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java @@ -28,6 +28,9 @@ public class SarStandUnqualified { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "产品线编号") + private String productId; + @ApiModelProperty(value = "标准ID") private String standId; diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java index 2b2c9488..adc70651 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java @@ -117,5 +117,17 @@ public class SarStandardComplianceProductAssess { @TableField("type") private String type; + @ApiModelProperty(value = "评估时间") + @TableField("evaluation_time") + private String evaluationTime; + + @ApiModelProperty(value = "评估人") + @TableField("evaluation_people") + private String evaluationPeople; + + @ApiModelProperty(value = "评估人") + @TableField("evaluation_people_name") + private String evaluationPeopleName; + } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java index 86eb7402..45cac3fd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java @@ -19,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; public class PCAComplianceAssessmentAfter implements TaskListener { @@ -41,8 +42,33 @@ public class PCAComplianceAssessmentAfter implements TaskListener { List nextUserList=new ArrayList<>(); JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList")); JSONObject jsonObject=JSONObject.parseObject(jsonArray.get(0).toString()); - nextUserList.add(jsonObject.getString("liablePeopleId")); - delegateTask.setVariable("ffUserId",jsonObject.getString("liablePeopleId")); + //新去除数据之后的结果 + JSONArray newRes=new JSONArray(); + for (Object json:jsonArray) { + JSONObject jsonObject1=JSONObject.parseObject(json.toString()); + JSONArray remove=new JSONArray(); + for (Object os:jsonObject1.getJSONArray("children")) { + JSONObject jsonObject2=JSONObject.parseObject(os.toString()); + if ("".equals(jsonObject2.get("complianceReasons"))&&"".equals(jsonObject2.get("noCompliance")) + && "".equals(jsonObject2.get("countermeasures")) && null==jsonObject2.get("completionTime")){ + remove.add(jsonObject2); + } + } + jsonObject1.getJSONArray("children").removeAll(remove); + if (jsonObject1.getJSONArray("children").size()==0 && "".equals(jsonObject1.get("complianceReasons"))&&"".equals(jsonObject1.get("noCompliance")) + && "".equals(jsonObject1.get("countermeasures")) && null==jsonObject1.get("completionTime")){ + + }else { + newRes.add(jsonObject1); + } + } + String uuid= String.valueOf(UUID.randomUUID()); + delegateTask.setVariable(uuid,object.getString("dataList")); + object.put("dataList",newRes.toJSONString()); + object.put("key",uuid); + JSONObject res=JSONObject.parseObject(newRes.get(0).toString()); + nextUserList.add(res.getString("liablePeopleId")); + delegateTask.setVariable("ffUserId",res.getString("liablePeopleId")); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser",String.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java index 7f261fa7..37a1c914 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java @@ -4,6 +4,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.tmsps.fk.common.util.JsonUtil; +import com.ydw.bat.wkflow.business_main.datas.dto.DataList; import com.ydw.bat.wkflow.business_main.datas.dto.PCA.PCAtotal; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; @@ -53,6 +54,7 @@ public class PCAbafgManagerApproveAfter implements TaskListener { delegateTask.setVariable("pass", "1"); } } else { + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("bzFlag", "2"); } @@ -101,8 +103,10 @@ public class PCAbafgManagerApproveAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskId("996"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(userId); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java index 0efa199b..fd5cc25f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java @@ -55,7 +55,7 @@ public class PCAdlApproveAfter implements TaskListener { List standUnqualifieds = new ArrayList<>(); //评估结果存储集合 List sarStandardComplianceProductAssesses = new ArrayList<>(); - + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); res.getDataList().forEach(pcAdataList -> { //标准一级别 if (null != pcAdataList.getNoCompliance()) { @@ -73,6 +73,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setReason(pcAdataList.getNoCompliance()); sarStandUnqualified.setPlanCloseTime(pcAdataList.getCompletionTime()); sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class)); + sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); } @@ -91,6 +92,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setReason(pcAdataList.getZcNoCompliance()); sarStandUnqualified.setProductType("product"); sarStandUnqualified.setPlanCloseTime(pcAdataList.getZcCompletionTime()); + sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); } @@ -119,8 +121,9 @@ public class PCAdlApproveAfter implements TaskListener { sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); sarStandard.setClauseName(pcAdataList.getItemsName()); sarStandard.setStandardItem(pcAdataList.getItemNum()); - - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + sarStandard.setEvaluationTime(simpleDateFormat.format(new Date())); + sarStandard.setEvaluationPeopleName(pcAdataList.getWorkPeople()); + sarStandard.setEvaluationPeople(pcAdataList.getWorkPeople()); sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); // simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ"))) sarStandard.setProductionImplementationTime(pcAdataList.getZccssrqgj()); @@ -145,6 +148,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(pcAchildren.getNoCompliance()); sarStandUnqualified.setPlanCloseTime(pcAchildren.getCompletionTime()); + sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); } @@ -166,6 +170,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setReason(pcAchildren.getZcNoCompliance()); sarStandUnqualified.setProductType("product"); sarStandUnqualified.setPlanCloseTime(pcAchildren.getZcCompletionTime()); + sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); } //合估评规 结果！ @@ -191,6 +196,9 @@ public class PCAdlApproveAfter implements TaskListener { sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj()); sarStandardChild.setClauseName(pcAchildren.getItemsName()); sarStandardChild.setStandardItem(pcAchildren.getItemsNum()); + sarStandardChild.setEvaluationTime(simpleDateFormat.format(new Date())); + sarStandardChild.setEvaluationPeopleName(pcAchildren.getWorkPeople()); + sarStandardChild.setEvaluationPeople(pcAchildren.getWorkPeople()); sarStandardComplianceProductAssesses.add(sarStandardChild); } }); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java index a5fd1ad4..fee4756e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java @@ -1,8 +1,10 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment; +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.dto.DataList; 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; @@ -42,6 +44,7 @@ public class PCAffLiableApproveAfter implements TaskListener { delegateTask.setVariable("JGManager", delegateTask.getVariable("JGUserId")); delegateTask.setVariable("ffFlag", "1"); }else { + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("ffFlag", "2"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index 963d8c5c..f160367a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -43,62 +43,120 @@ public class PCAffLiableDistributeAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - PCAtotal pcAtotal=JSONObject.parseObject(datas.getFormValsJson(),PCAtotal.class); + PCAtotal pcAtotal = JSONObject.parseObject(datas.getFormValsJson(), PCAtotal.class); //后续节点所需要的数据 - List nextUserList=new ArrayList<>(); + List nextUserList = new ArrayList<>(); //猜测写代码 //准备标准数据 - Map mapData=new HashMap<>(); + Map map = new HashMap<>(); + + Map mapData = new HashMap<>(); pcAtotal.getDataList().forEach(pcAdataList -> { - List pcAchildren=new ArrayList<>(); + List pcAchildren = new ArrayList<>(); pcAdataList.setChildren(pcAchildren); - mapData.put(pcAdataList.getStandId(),pcAdataList); + mapData.put(pcAdataList.getStandId(), pcAdataList); }); - Map map=new HashMap<>(); - //获取被分发的条款 + + //获取被分发的条款----人员多选修改 pcAtotal.getChildren().forEach(o -> { - if (null!=map.get(o.getWorkPeopleId())){ - map.get(o.getWorkPeopleId()).getChildren().add(o); - int flag=0; - for (PCAdataList ps: map.get(o.getWorkPeopleId()).getDataList()) { - if (ps.getStandId().equals(mapData.get(o.getKey()).getStandId())){ - ps.getChildren().add(o); - flag++; + if (null!=o && null != o.getWorkPeopleId()) { + List ids = new ArrayList(Arrays.asList(o.getWorkPeopleId().split(","))); + List names = new ArrayList(Arrays.asList(o.getWorkPeople().split(","))); + int i = 0; + for (String id : ids) { + //重组数据 + PCAchildren middle = new PCAchildren(); + BeanUtils.copyProperties(o, middle); + middle.setWorkPeopleId(id); + middle.setWorkPeople(names.get(i)); + if (null != map.get(id)) { + map.get(id).getChildren().add(middle); + int flag = 0; + for (PCAdataList ps : map.get(id).getDataList()) { + if (ps.getStandId().equals(mapData.get(middle.getKey()).getStandId())) { + ps.getChildren().add(middle); + flag++; + } + } + if (flag == 0) { + map.get(id).getDataList().add(mapData.get(middle.getKey())); + mapData.get(middle.getKey()).getChildren().add(middle); + } + } else { + PCAtotal pcs = new PCAtotal(); + BeanUtils.copyProperties(pcAtotal, pcs); + //建立空的子 为了后面遍历 + List list = new ArrayList<>(); + List list1 = new ArrayList<>(); + list.add(middle); + list1.add(middle); + pcs.setChildren(list); + List list2 = new ArrayList<>(); + PCAdataList adataLists = new PCAdataList(); + BeanUtils.copyProperties(mapData.get(middle.getKey()), adataLists); + adataLists.setWorkPeopleId(id); + adataLists.setWorkPeople(names.get(i)); + adataLists.setChildren(list1); + list2.add(adataLists); + pcs.setDataList(list2); + map.put(id, pcs); } + i++; } - if (flag==0){ - map.get(o.getWorkPeopleId()).getDataList().add(mapData.get(o.getKey())); - mapData.get(o.getKey()).getChildren().add(o); + } + }); + mapData.keySet().forEach(s -> { + if (null != mapData.get(s).getWorkPeopleId()) { + List peos = new ArrayList<>(Arrays.asList(mapData.get(s).getWorkPeopleId().split(","))); + List names = new ArrayList<>(Arrays.asList(mapData.get(s).getWorkPeople().split(","))); + int count=0; + for (String i : peos) { + if (null==map.get(i)){ + PCAtotal pcs = new PCAtotal(); + BeanUtils.copyProperties(pcAtotal, pcs); + //建立空的子 为了后面遍历 + List list = new ArrayList<>(); + List list2 = new ArrayList<>(); + PCAdataList pcAdataList = new PCAdataList(); + BeanUtils.copyProperties(mapData.get(s),pcAdataList); + pcAdataList.setChildren(list); + pcAdataList.setWorkPeopleId(i); + pcAdataList.setWorkPeople(names.get(count)); + list2.add(pcAdataList); + pcs.setDataList(list2); + map.put(i,pcs); + }else { + boolean flag=true; + for (PCAdataList pc:map.get(i).getDataList()) { + if (pc.getStandId().equals(mapData.get(s).getStandId())){ + flag=false; + } + } + if (flag){ + List list = new ArrayList<>(); + PCAdataList pcAdataList = new PCAdataList(); + BeanUtils.copyProperties(mapData.get(s),pcAdataList); + pcAdataList.setChildren(list); + pcAdataList.setWorkPeopleId(i); + pcAdataList.setWorkPeople(names.get(count)); + map.get(i).getDataList().add(pcAdataList); + } + } + count++; } - }else { - PCAtotal pcs=new PCAtotal(); - BeanUtils.copyProperties(pcAtotal,pcs); - //建立空的子 为了后面遍历 - List list=new ArrayList<>(); - List list1=new ArrayList<>(); - list.add(o); - list1.add(o); - pcs.setChildren(list); - List list2=new ArrayList<>(); - PCAdataList adataLists=new PCAdataList(); - BeanUtils.copyProperties(mapData.get(o.getKey()),adataLists); - adataLists.setChildren(list1); - list2.add(adataLists); - pcs.setDataList(list2); - map.put(o.getWorkPeopleId(),pcs); } }); map.forEach((s, pcAtotal1) -> { - if (null!=s) { + if (null != s && !"".equals(s)) { nextUserList.add(s); } }); - delegateTask.setVariable("workPeoples",nextUserList); + delegateTask.setVariable("workPeoples", nextUserList); //截止时间 流程描述 创建人 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("stId",String.class)+"-项目合规评估流程-合规性评估"; + String user = delegateTask.getVariable("prcCreateUser", String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-合规性评估"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -112,8 +170,8 @@ public class PCAffLiableDistributeAfter implements TaskListener { } // 存储当前节点意见 - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String userId : nextUserList){ + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String userId : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -126,5 +184,6 @@ public class PCAffLiableDistributeAfter implements TaskListener { busBean.save(busProcessNewNext); } } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java index 149e681e..4941983a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.dto.DataList; 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; @@ -43,6 +44,7 @@ public class PCAgcManagerApproveAfter implements TaskListener { delegateTask.setVariable("bzManager", delegateTask.getVariable("bzfgl")); delegateTask.setVariable("gcFlag","1"); }else { + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("gcFlag", "2"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java index 8c2f80f6..6352e441 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.dto.DataList; 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; @@ -44,6 +45,7 @@ public class PCAjgManagerApproveAfter implements TaskListener { delegateTask.setVariable("gcManager", delegateTask.getVariable("gcjl")); delegateTask.setVariable("jgFlag","1"); }else { + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("jgFlag", "2"); } 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 1a26796a..3c2531bf 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 @@ -60,7 +60,7 @@ public class ProcessStep2After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = "企标复审流程-起草人修改标准状态"; + String prcName = "企标废止流程-起草人修改标准状态"; 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/aboliish/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java index 40b3c171..a843aa97 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 @@ -41,7 +41,7 @@ public class ProcessStep3After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = "企标复审流程-标准法规部部长审核"; + String prcName = "企标废止流程-标准法规部部长审核"; 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/aboliish/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java index 69a5f231..982a7850 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 @@ -49,9 +49,9 @@ public class ProcessStep4After implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName=""; if ("0".equals(object.getString("bzFlag"))){ - prcName = "企标复审流程-审定责任人审定"; + prcName = "企标废止流程-审定责任人审定"; }else { - prcName = "企标复审流程-起草人修改标准状态"; + prcName = "企标废止流程-起草人修改标准状态"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 806d6533..0252988a 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 @@ -49,9 +49,9 @@ public class ProcessStep5After implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; if ("0".equals(object.getString("sdFlag"))){ - prcName = "企标复审流程-批准负责人审批"; + prcName = "企标废止流程-批准负责人审批"; }else { - prcName = "企标复审流程-起草人修改标准状态"; + prcName = "企标废止流程-起草人修改标准状态"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 b6596ff9..e159ffbc 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 @@ -49,9 +49,9 @@ public class ProcessStep6After implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; if ("0".equals(object.getString("sdFlag"))){ - prcName = "企标复审流程-批准负责人审批"; + prcName = "企标废止流程-批准负责人审批"; }else { - prcName = "企标复审流程-起草人修改标准状态"; + prcName = "企标废止流程-起草人修改标准状态"; } String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); QueryWrapper queryWrapper2 = new QueryWrapper(); 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 f51ae55d..77c0a509 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 @@ -13,6 +13,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_slrs.dao.StandProjectRelationDto; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; @@ -53,6 +54,8 @@ public class PEPDepartLeaderAfter implements TaskListener { JSONArray dataList=JSONArray.parseArray(object.getString("dataList")); List sarStandUnqualifieds=new ArrayList<>(); List productAssesses=new ArrayList<>(); + //清单和项目关联 + List standProjectRelationDtos = new ArrayList<>(); int i=0; for (Object j : jsonArray) { Step3DTO o=JSONObject.parseObject(String.valueOf(j), Step3DTO.class); @@ -79,6 +82,7 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(object1.getString("noCompliance")); sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("completionTime")),Date.class)); + sarStandUnqualified.setProductId(o.getProjectNumber()); sarStandUnqualifieds.add(sarStandUnqualified); } @@ -102,6 +106,7 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setReason(object1.getString("zcNoCompliance")); sarStandUnqualified.setProductType("product"); sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("zcCompletionTime")),Date.class)); + sarStandUnqualified.setProductId(o.getProjectNumber()); sarStandUnqualifieds.add(sarStandUnqualified); } //合估评规 结果！ @@ -128,6 +133,9 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandard.setResearchCountermeasures(object1.getString("countermeasures")); sarStandard.setResearchNonCompliance(object1.getString("noCompliance")); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + sarStandard.setEvaluationPeople(object1.getString("implementer")); + sarStandard.setEvaluationPeopleName(object1.getString("implementerId")); + sarStandard.setEvaluationTime(simpleDateFormat.format(new Date())); try { if (null!=delegateTask.getVariable("XCXSSRQ")) { sarStandard.setResearchImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ")))); @@ -139,10 +147,18 @@ public class PEPDepartLeaderAfter implements TaskListener { e.printStackTrace(); } i++; + Map map=delegateTask.getVariable("numberWithId",Map.class); + StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); + standProjectRelationDto.setProjectId(String.valueOf(map.get(o.getProjectNumber()))); + standProjectRelationDto.setStandId(delegateTask.getVariable("standsId",String.class)); + if (!standProjectRelationDtos.contains(standProjectRelationDto)) { + standProjectRelationDtos.add(standProjectRelationDto); + } //数据归类 productAssesses.add(sarStandard); } //数据入库！！！！ + lawsUserInfoService.batchInsert(standProjectRelationDtos); lawsUserInfoService.addsarStandUnqualified(sarStandUnqualifieds); lawsUserInfoService.addProduct(productAssesses); //是否审批通过 passFlag == 1 通过 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 5d26b627..c788a0f9 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 @@ -127,6 +127,20 @@ public class PEPffresPersonAfter implements TaskListener { if (!"1".equals(object.getString("fenFlag"))) { JSONArray jsonArray = JSONArray.parseArray(object.getString("step3DTOS")); JSONArray dataList = JSONArray.parseArray(object.getString("dataList")); + //去除jaonArry中的无效数据 + JSONArray remove=new JSONArray(); + List standard=new ArrayList<>(); + dataList.forEach(o -> { + JSONObject os=JSONObject.parseObject(o.toString()); + standard.add(os.getString("itemNum")+os.getString("projectNumber")); + }); + jsonArray.forEach(o -> { + JSONObject object1=JSONObject.parseObject(o.toString()); + if (!standard.contains(object1.getString("itemNum")+object1.getString("projectNumber"))){ + remove.add(o); + } + }); + jsonArray.removeAll(remove); PEPDTO res = JSONObject.parseObject(object.toString(), PEPDTO.class); int i = 0; for (Object j : jsonArray) { 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 79b49b58..fa27c72e 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 @@ -15,6 +15,7 @@ import com.ydw.bat.wkflow.util.DealWithDate; import com.ydw.bat.wkflow.util.JsonDateValueProcessor; import com.ydw.bat.wkflow.util.SpringContextUtil; import net.sf.json.JsonConfig; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.springframework.beans.BeanUtils; @@ -57,7 +58,6 @@ public class PEPmanagerApproveAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { -// one1.setOverTime(OVERTIME); one1.setPrcType("5"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -65,6 +65,7 @@ public class PEPmanagerApproveAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } //生成任务信息 + Map numberWithId=new HashMap<>(); Map map=new HashMap<>(); //是否审批通过 passFlag == 1 不通过 if (null!=object.get("passFlag")) { @@ -77,6 +78,7 @@ public class PEPmanagerApproveAfter implements TaskListener { PEPres pePres=new PEPres(); List pepdtos=new ArrayList<>(); for (SarStandProjectLibraries sa:da.getSarStandProjectLibraries()) { + numberWithId.put(sa.getProjectNumber(),sa.getId()); for (BreakdownList breakdownList1:breakdownList) { //造数据 //项目 @@ -120,6 +122,7 @@ public class PEPmanagerApproveAfter implements TaskListener { } } + delegateTask.setVariable("numberWithId",numberWithId); delegateTask.setVariable("liablePeopleList",liablePeopleList); delegateTask.setVariable("PEPAllCount",count); } 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 0c7a9910..0a57464c 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 @@ -20,6 +20,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; public class PEPtaskEstimateAfter implements TaskListener { @@ -42,19 +43,34 @@ public class PEPtaskEstimateAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); - JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList")); + JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); + + //操作数据库 + JSONArray remove = new JSONArray(); + for (Object json : jsonArray) { + JSONObject jsonObject1 = JSONObject.parseObject(json.toString()); + if ("".equals(jsonObject1.get("complianceReasons")) && "".equals(jsonObject1.get("noCompliance")) + && "".equals(jsonObject1.get("countermeasures")) && "".equals(jsonObject1.get("completionTime"))) { + remove.add(jsonObject1); + } + } + String uuid = String.valueOf(UUID.randomUUID()); + delegateTask.setVariable(uuid, object.getString("dataList")); + jsonArray.removeAll(remove); + object.put("dataList", jsonArray); + object.put("key", uuid); //设置分发负责人 List nextUserList = new ArrayList(); - JSONObject object1=JSONObject.parseObject(jsonArray.getString(0)); + JSONObject object1 = JSONObject.parseObject(jsonArray.getString(0)); if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) { delegateTask.setVariable("ffUserId", object1.getString("distributePersonId")); - nextUserList.add(delegateTask.getVariable("ffUserId",String.class)); + nextUserList.add(delegateTask.getVariable("ffUserId", String.class)); } //截止时间 流程描述 创建人 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)+"-标准项目合规评估-分发负责人审批"; + String prcName = delegateTask.getVariable("stands", String.class) + "-标准项目合规评估-分发负责人审批"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -67,12 +83,12 @@ public class PEPtaskEstimateAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - if (null!=object.getString("commentText")) { + if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); - queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); List list = busBean.list(queryWrapper3); - if(!list.isEmpty()){ + if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); 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 24c4aa3d..fc1ab3ec 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 @@ -16,6 +16,7 @@ import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; import java.text.SimpleDateFormat; import java.util.*; @@ -52,20 +53,28 @@ public class PEPtaskLssueAfter implements TaskListener { res.addAll(JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class)); JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class).forEach(step3DTO -> { List users = new ArrayList<>(Arrays.asList(step3DTO.getImplementerId().split(","))); - users.forEach(s1 -> { - step3DTO.setCertifiedEngineerName(String.valueOf(delegateTask.getVariable("certifiedEngineerName"))); - step3DTO.setQualityEngineerName(String.valueOf(delegateTask.getVariable("qualityEngineerName"))); + List names = new ArrayList<>(Arrays.asList(step3DTO.getImplementer().split(","))); + int i = 0; + + for (String s1 : users) { + Step3DTO result = new Step3DTO(); + BeanUtils.copyProperties(step3DTO, result); + result.setCertifiedEngineerName(String.valueOf(delegateTask.getVariable("certifiedEngineerName"))); + result.setQualityEngineerName(String.valueOf(delegateTask.getVariable("qualityEngineerName"))); + result.setImplementerId(s1); + result.setImplementer(names.get(i)); if (!workPeoples.contains(s1)) { workPeoples.add(s1); } if (null != maps.get(s1)) { - maps.get(s1).add(step3DTO); + maps.get(s1).add(result); } else { List dtos = new ArrayList<>(); - dtos.add(step3DTO); + dtos.add(result); maps.put(s1, dtos); } - }); + i++; + } }); } } @@ -74,10 +83,11 @@ public class PEPtaskLssueAfter implements TaskListener { } else { delegateTask.getVariable("workPeoples", List.class).addAll(workPeoples); } + //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估"; + String prcName = delegateTask.getVariable("stands", String.class) + "-标准项目合规评估-合规性评估"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From f81729eae7d78b654c57e9f7ee71d0b990c05a6d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 1 Dec 2021 18:22:58 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=96=B0=E4=BB=A3=E5=8A=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAComplianceAssessmentAfter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java index 45cac3fd..34395bd4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java @@ -64,7 +64,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener { } String uuid= String.valueOf(UUID.randomUUID()); delegateTask.setVariable(uuid,object.getString("dataList")); - object.put("dataList",newRes.toJSONString()); + object.put("dataList",newRes); object.put("key",uuid); JSONObject res=JSONObject.parseObject(newRes.get(0).toString()); nextUserList.add(res.getString("liablePeopleId")); From 036e413204382ffab2621269791fe4e253c1c853 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 1 Dec 2021 18:27:31 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=A9=B3=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAComplianceAssessmentAfter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java index 34395bd4..896b0869 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java @@ -63,7 +63,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener { } } String uuid= String.valueOf(UUID.randomUUID()); - delegateTask.setVariable(uuid,object.getString("dataList")); + delegateTask.setVariable(uuid,jsonArray); object.put("dataList",newRes); object.put("key",uuid); JSONObject res=JSONObject.parseObject(newRes.get(0).toString()); From 7cc898aec68a946871d19a9f4d49c43a7cd0d286 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 2 Dec 2021 10:26:18 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectEvaluationProcess/PEPDepartLeaderAfter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 77c0a509..edd9edcd 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 @@ -62,7 +62,7 @@ public class PEPDepartLeaderAfter implements TaskListener { JSONObject object1=JSONObject.parseObject(dataList.getString(i)); //未符合项整改 保存 //在研不合规 - if (null!=object1.getString("noCompliance")) { + if (null!=object1.getString("noCompliance") && !"".equals(object1.getString("noCompliance"))) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(delegateTask.getVariable("standsId",String.class)); @@ -86,7 +86,7 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualifieds.add(sarStandUnqualified); } - if (null!=object1.getString("zcNoCompliance")) { + if (null!=object1.getString("zcNoCompliance") && !"".equals(object1.getString("zcNoCompliance"))) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(delegateTask.getVariable("standsId",String.class)); From ae67a56dbbdee0c5b041399d0a28c8ad6feb6b6e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 2 Dec 2021 11:18:14 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=96=B0=E6=B5=81=E7=A8=8B=20=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6=E9=A9=B3=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAComplianceAssessmentAfter.java | 2 +- .../itemlistvalidationprocess/Step1After.java | 74 +++++++++++++++ .../Step1Before.java | 35 ++++++++ .../itemlistvalidationprocess/Step3After.java | 90 +++++++++++++++++++ .../Step3Before.java | 35 ++++++++ .../bzApproveAfter.java | 2 +- .../confirmAfter.java | 2 +- .../itemlistvalidationprocessStartAfter.java | 4 +- .../PEPffresPersonAfter.java | 1 + .../PEPtaskEstimateAfter.java | 7 +- 10 files changed, 245 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3Before.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java index 896b0869..93773ca4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java @@ -66,7 +66,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener { delegateTask.setVariable(uuid,jsonArray); object.put("dataList",newRes); object.put("key",uuid); - JSONObject res=JSONObject.parseObject(newRes.get(0).toString()); + JSONObject res=JSONObject.parseObject(jsonArray.get(0).toString()); nextUserList.add(res.getString("liablePeopleId")); delegateTask.setVariable("ffUserId",res.getString("liablePeopleId")); //截止时间 流程描述 创建人 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 new file mode 100644 index 00000000..a459149f --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java @@ -0,0 +1,74 @@ +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; + +import com.alibaba.fastjson.JSONArray; +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.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_slrs.dao.StandProjectRelationDto; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +//分发 +public class Step1After implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); + String prcName = "项目清单确认流程"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + if ("0".equals(object.getString("passFlag"))) { + one1.setOverTime(OVERTIME); + } + one1.setPrcType("10"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + + if(!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/itemlistvalidationprocess/Step1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1Before.java new file mode 100644 index 00000000..9f7e7348 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1Before.java @@ -0,0 +1,35 @@ +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; + +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; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +public class Step1Before implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("xmqdqrStep3?prcType=10"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(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 new file mode 100644 index 00000000..a1844207 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; + +import com.alibaba.fastjson.JSONArray; +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.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_slrs.dao.StandProjectRelationDto; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +//汇总 +public class Step3After implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if ("0".equals(object.getString("passFlag"))) { + delegateTask.setVariable("passFlag","0"); + List standProjectRelationDtos = new ArrayList<>(); + JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); + for (Object os : jsonArray) { + JSONObject jsonObject = JSONObject.parseObject(os.toString()); + StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); + standProjectRelationDto.setProjectId(object.getString("projectId")); + standProjectRelationDto.setStandId(jsonObject.getString("id")); + standProjectRelationDtos.add(standProjectRelationDto); + } + lawsUserInfoService.batchInsert(standProjectRelationDtos); + }else { + delegateTask.setVariable("passFlag","1"); + nextUserList.add(delegateTask.getVariable("confirmId",String.class)); + } + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); + String prcName = "项目清单确认流程"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + if ("0".equals(object.getString("passFlag"))) { + one1.setOverTime(OVERTIME); + } + one1.setPrcType("10"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + + if(!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/itemlistvalidationprocess/Step3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3Before.java new file mode 100644 index 00000000..4444d599 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3Before.java @@ -0,0 +1,35 @@ +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; + +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; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +public class Step3Before implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("xmqdqrStep3?prcType=10"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(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 79dc48ad..31ca92f6 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 @@ -19,7 +19,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; - +//评估 public class bzApproveAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { 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 24684cd3..8846f394 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 @@ -19,7 +19,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; - +//确认 public class confirmAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java index e2da5788..b99a4461 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java @@ -16,7 +16,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; - +//启动 public class itemlistvalidationprocessStartAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -33,7 +33,7 @@ public class itemlistvalidationprocessStartAfter implements TaskListener { List nextUserList = new ArrayList(); nextUserList.add(object.getString("confirmId")); - delegateTask.setVariable("confirmId",object.getString("confirmId")); + delegateTask.setVariable("cpManager",object.getString("confirmId")); delegateTask.setVariable("dl",object.getString("approveId")); 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 c788a0f9..4d1efc4a 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 @@ -65,6 +65,7 @@ public class PEPffresPersonAfter implements TaskListener { delegateTask.setVariable("fenFlag", "1"); } else { //不通过就要驳回 + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("workPeople", String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("fenFlag", "2"); 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 0a57464c..c7a88b9b 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 @@ -15,6 +15,7 @@ import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -55,13 +56,15 @@ public class PEPtaskEstimateAfter implements TaskListener { } } String uuid = String.valueOf(UUID.randomUUID()); - delegateTask.setVariable(uuid, object.getString("dataList")); + JSONArray ne=new JSONArray(); + BeanUtils.copyProperties(jsonArray,ne); + delegateTask.setVariable(uuid, ne); jsonArray.removeAll(remove); object.put("dataList", jsonArray); object.put("key", uuid); //设置分发负责人 List nextUserList = new ArrayList(); - JSONObject object1 = JSONObject.parseObject(jsonArray.getString(0)); + JSONObject object1 = JSONObject.parseObject(ne.getString(0)); if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) { delegateTask.setVariable("ffUserId", object1.getString("distributePersonId")); nextUserList.add(delegateTask.getVariable("ffUserId", String.class)); From 4471941a511befd14a0177b1ebc4bd2d24627fba Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 2 Dec 2021 13:32:30 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=A0=87=E5=87=86=E7=BB=B4=E5=BA=A6=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../confirmAfter.java | 21 +++++++------------ .../PEPtaskEstimateAfter.java | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) 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 8846f394..31f3cffa 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 @@ -17,6 +17,7 @@ import org.activiti.engine.delegate.TaskListener; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; //确认 @@ -26,7 +27,6 @@ public class confirmAfter 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()); @@ -35,18 +35,13 @@ public class confirmAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - delegateTask.setVariable("approveId",object.getString("approveId")); - nextUserList.add(object.getString("approveId")); - List standProjectRelationDtos = new ArrayList<>(); -// JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList")); -// for (Object os:jsonArray) { -// JSONObject jsonObject=JSONObject.parseObject(os.toString()); -// StandProjectRelationDto standProjectRelationDto=new StandProjectRelationDto(); -// standProjectRelationDto.setProjectId(object.getString("projectId")); -// standProjectRelationDto.setStandId(jsonObject.getString("id")); -// standProjectRelationDtos.add(standProjectRelationDto); -// } -// lawsUserInfoService.batchInsert(standProjectRelationDtos); + if (!object.getString("detailPeople").contains(",")){ + nextUserList.addAll(new ArrayList<>(Arrays.asList(object.getString("detailPeople").split(",")))); + }else { + nextUserList.add(object.getString("detailPeople")); + } + delegateTask.setVariable("qrPeopleList",nextUserList); + //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); 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 c7a88b9b..58fc753e 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 @@ -57,7 +57,7 @@ public class PEPtaskEstimateAfter implements TaskListener { } String uuid = String.valueOf(UUID.randomUUID()); JSONArray ne=new JSONArray(); - BeanUtils.copyProperties(jsonArray,ne); + ne.addAll(jsonArray); delegateTask.setVariable(uuid, ne); jsonArray.removeAll(remove); object.put("dataList", jsonArray); From 2b9b2fa68f04d39bbaa5e0c0499c6c567c7667dd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 2 Dec 2021 13:45:36 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BB=B4=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectEvaluationProcess/PEPtaskEstimateAfter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 58fc753e..edd421c5 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 @@ -45,7 +45,9 @@ public class PEPtaskEstimateAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); - + //代码放这不带数据 + JSONArray ne=new JSONArray(); + ne.addAll(jsonArray); //操作数据库 JSONArray remove = new JSONArray(); for (Object json : jsonArray) { @@ -56,8 +58,7 @@ public class PEPtaskEstimateAfter implements TaskListener { } } String uuid = String.valueOf(UUID.randomUUID()); - JSONArray ne=new JSONArray(); - ne.addAll(jsonArray); + //代码放这带数据 delegateTask.setVariable(uuid, ne); jsonArray.removeAll(remove); object.put("dataList", jsonArray); From 4156adc6d100f36b33bf627cf23776b37f0ed530 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 2 Dec 2021 15:38:57 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemlistvalidationprocess/Step3After.java | 32 ++++++++----------- .../PEPffresPersonAfter.java | 9 ++++-- .../PEPtaskEstimateAfter.java | 10 +++--- 3 files changed, 23 insertions(+), 28 deletions(-) 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 a1844207..4e8a8a17 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 @@ -36,22 +36,21 @@ public class Step3After implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if ("0".equals(object.getString("passFlag"))) { - delegateTask.setVariable("passFlag","0"); - List standProjectRelationDtos = new ArrayList<>(); - JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); - for (Object os : jsonArray) { - JSONObject jsonObject = JSONObject.parseObject(os.toString()); - StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); - standProjectRelationDto.setProjectId(object.getString("projectId")); - standProjectRelationDto.setStandId(jsonObject.getString("id")); - standProjectRelationDtos.add(standProjectRelationDto); - } - lawsUserInfoService.batchInsert(standProjectRelationDtos); + //设计一个确认人的计数器 + if (null!=delegateTask.getVariable("count")){ + delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)+1); }else { - delegateTask.setVariable("passFlag","1"); - nextUserList.add(delegateTask.getVariable("confirmId",String.class)); + delegateTask.setVariable("count",1); } + //判断是否为最后一步 决定数据是否需要合并***---*** + + + + + + + + //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); @@ -61,17 +60,12 @@ public class Step3After implements TaskListener { queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ - if ("0".equals(object.getString("passFlag"))) { - one1.setOverTime(OVERTIME); - } one1.setPrcType("10"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - - if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); 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 4d1efc4a..b1416a74 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 @@ -45,7 +45,10 @@ public class PEPffresPersonAfter implements TaskListener { delegateTask.setVariable("objectJson", object); String prcName = ""; - if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) { + if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){ + prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批"; + } + else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) { prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批"; } else { prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估"; @@ -69,7 +72,7 @@ public class PEPffresPersonAfter implements TaskListener { nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("workPeople", String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("fenFlag", "2"); - + object.put("mark","back"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -125,7 +128,7 @@ public class PEPffresPersonAfter implements TaskListener { List busProcessNews=busBean.findLastworkPeople("projectEvaluationProcess5",delegateTask.getProcessInstanceId()); for (BusProcessNew b:busProcessNews) { JSONObject object=JSONObject.parseObject(b.getMesg()); - if (!"1".equals(object.getString("fenFlag"))) { + if ("".equals(b.getCommitText())) { JSONArray jsonArray = JSONArray.parseArray(object.getString("step3DTOS")); JSONArray dataList = JSONArray.parseArray(object.getString("dataList")); //去除jaonArry中的无效数据 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 edd421c5..1f83bd38 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 @@ -45,9 +45,7 @@ public class PEPtaskEstimateAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); - //代码放这不带数据 - JSONArray ne=new JSONArray(); - ne.addAll(jsonArray); + JSONArray ne = JSONArray.parseArray(object.getString("dataList")); //操作数据库 JSONArray remove = new JSONArray(); for (Object json : jsonArray) { @@ -59,9 +57,9 @@ public class PEPtaskEstimateAfter implements TaskListener { } String uuid = String.valueOf(UUID.randomUUID()); //代码放这带数据 - delegateTask.setVariable(uuid, ne); - jsonArray.removeAll(remove); - object.put("dataList", jsonArray); + delegateTask.setVariable(uuid, jsonArray); + ne.removeAll(remove); + object.put("dataList", ne); object.put("key", uuid); //设置分发负责人 List nextUserList = new ArrayList(); From bef70eb7a044f14496c7786b60511edf703d7b29 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 2 Dec 2021 21:03:49 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemlistvalidationprocess/Step1After.java | 9 +- .../itemlistvalidationprocess/Step3After.java | 19 +--- .../bzApproveAfter.java | 19 ++-- .../confirmAfter.java | 87 ++++++++++++++++--- .../itemlistvalidationprocessStartAfter.java | 2 +- 5 files changed, 99 insertions(+), 37 deletions(-) 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 a459149f..228a9f92 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 @@ -17,6 +17,7 @@ import org.activiti.engine.delegate.TaskListener; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; //分发 @@ -36,11 +37,17 @@ public class Step1After implements TaskListener { List nextUserList = new ArrayList(); + if (object.getString("detailPeople").contains(",")){ + nextUserList.addAll(new ArrayList<>(Arrays.asList(object.getString("detailPeople").split(",")))); + }else { + nextUserList.add(object.getString("detailPeople")); + } + delegateTask.setVariable("qrPeopleList",nextUserList); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String prcName = "项目清单确认流程"; + String prcName = "项目清单确认流程-确认人确认"; 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/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java index 4e8a8a17..f6393bd3 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 @@ -15,6 +15,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.rmi.activation.ActivationException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -36,26 +37,14 @@ public class Step3After implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - //设计一个确认人的计数器 - if (null!=delegateTask.getVariable("count")){ - delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)+1); - }else { - delegateTask.setVariable("count",1); - } - //判断是否为最后一步 决定数据是否需要合并***---*** - - - - - - - + nextUserList.add(object.getString("approveId")); + delegateTask.setVariable("approveId",object.getString("approveId")); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String prcName = "项目清单确认流程"; + String prcName = "项目清单确认流程-标准法规部经理审批"; 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/bzApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java index 31ca92f6..90577c95 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 @@ -42,21 +42,28 @@ public class bzApproveAfter implements TaskListener { JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); for (Object os : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(os.toString()); - StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); - standProjectRelationDto.setProjectId(object.getString("projectId")); - standProjectRelationDto.setStandId(jsonObject.getString("id")); - standProjectRelationDtos.add(standProjectRelationDto); + if ("涉及".equals(jsonObject.getString("involve"))) { + StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); + standProjectRelationDto.setProjectId(object.getString("projectId")); + standProjectRelationDto.setStandId(jsonObject.getString("standId")); + standProjectRelationDtos.add(standProjectRelationDto); + } } lawsUserInfoService.batchInsert(standProjectRelationDtos); }else { delegateTask.setVariable("passFlag","1"); - nextUserList.add(delegateTask.getVariable("confirmId",String.class)); + nextUserList.add(delegateTask.getVariable("cpManagerSum",String.class)); } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String prcName = "项目清单确认流程"; + String prcName=""; + if ("0".equals(object.getString("passFlag"))) { + prcName = "项目清单确认流程"; + }else { + prcName = "项目清单确认流程-产品工程经理查看汇总清单"; + } 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/confirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java index 31f3cffa..f3943a9d 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 @@ -1,25 +1,23 @@ package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; + import com.alibaba.fastjson.JSONArray; 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.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; -import com.ydw.bat.wkflow.business_slrs.dao.StandProjectRelationDto; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; + //确认 public class confirmAfter implements TaskListener { @Override @@ -35,18 +33,55 @@ public class confirmAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if (!object.getString("detailPeople").contains(",")){ - nextUserList.addAll(new ArrayList<>(Arrays.asList(object.getString("detailPeople").split(",")))); + //设计一个确认人的计数器 + if (null!=delegateTask.getVariable("count")){ + delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)+1); }else { - nextUserList.add(object.getString("detailPeople")); + delegateTask.setVariable("count",1); } - delegateTask.setVariable("qrPeopleList",nextUserList); - + //判断是否为最后一步 决定数据是否需要合并***---*** + if (delegateTask.getVariable("qrPeopleList",List.class).size()==delegateTask.getVariable("count",Integer.class)){ + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID","xmqd"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List busProcessNews=busBean.list(queryWrapper1); + JSONArray res=new JSONArray(); + JSONArray middle=new JSONArray(); + Map map=new HashMap<>(); + Map successmap=new HashMap<>(); + List standIds=new ArrayList<>(); + List successIds=new ArrayList<>(); + middle.addAll(object.getJSONArray("dataList")); + middle.forEach(o -> { + JSONObject object1=JSONObject.parseObject(o.toString()); + makeData(map, successmap, standIds, successIds, object, object1); + }); + for (BusProcessNew bus:busProcessNews) { + JSONObject object1=JSONObject.parseObject(bus.getMesg()); + JSONArray jsonArray=object1.getJSONArray("dataList"); + jsonArray.forEach(o -> { + JSONObject object11=JSONObject.parseObject(o.toString()); + makeData(map, successmap, standIds, successIds, object1, object11); + }); + } + //草拟吗 + map.keySet().forEach(s -> { + res.add(map.get(s)); + }); + successmap.keySet().forEach(s -> { + if (!standIds.contains(s)){ + res.add(successmap.get(s)); + } + }); + object.put("dataList",res); + } + nextUserList.add(delegateTask.getVariable("cpManager",String.class)); + delegateTask.setVariable("cpManagerSum",delegateTask.getVariable("cpManager",String.class)); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String prcName = "项目清单确认流程"; + String prcName = "项目清单确认流程-产品工程经理查看汇总清单"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -58,8 +93,6 @@ public class confirmAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - - if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); @@ -69,10 +102,36 @@ public class confirmAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); + if (delegateTask.getVariable("qrPeopleList",List.class).size()!=delegateTask.getVariable("count",Integer.class)){ + busProcessNewNext.setTaskId("xmqd"); + } busProcessNewNext.setUserId(nextUser); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } } } + + private void makeData(Map map, Map successmap, List standIds, List successIds, JSONObject object1, JSONObject object11) { + if (!standIds.contains(object11.getString("standId"))){ + if ("noInvolve".equals(object11.getString("involve"))){ + object11.put("remarks",object1.getString("currentPerson")+":"+object11.getString("remarks")); + standIds.add(object11.getString("standId")); + map.put(object11.getString("standId"),object11); + }else { + if (!successIds.contains(object11.getString("standId"))) { + successmap.put(object11.getString("standId"),object11); + } + } + }else { + if ("noInvolve".equals(object11.getString("involve"))){ + standIds.add(object11.getString("standId")); + map.get(object11.getString("standId")).put("remarks",map.get(object11.getString("standId")).getString("remarks")+","+object1.getString("currentPerson")+":"+object11.getString("remarks")); + }else { + if (!successIds.contains(object11.getString("standId"))) { + successmap.put(object11.getString("standId"),object11); + } + } + } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java index b99a4461..90719b02 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java @@ -42,7 +42,7 @@ public class itemlistvalidationprocessStartAfter implements TaskListener { String username = object.getString("startUserName"); delegateTask.setVariable("startId",user); delegateTask.setVariable("startName",username); - String prcName = "项目清单确认流程"; + String prcName = "项目清单确认流程-产品工程经理分发清单"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);