diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
index 152aff16..45f2bc17 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
@@ -145,13 +145,15 @@ public class TodoTaskController extends BaseAction {
             String taskIds = "";
             for (Map<String, Object> map : entry.getValue()) {
                 if (busProcessName != null) {
-                    busProcessName.setTaskIds(map.get("id").toString());
-                    busProcessName.setTaskInfo(entry.getValue().get(0).get("name").toString());
-                    busProcessName.setMes(null);
+                    BusProcessName res=new BusProcessName();
+                    BeanUtils.copyProperties(busProcessName,res);
+                    res.setTaskIds(map.get("id").toString());
+                    res.setTaskInfo(entry.getValue().get(0).get("name").toString());
+                    res.setMes(null);
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     String data = sdf.format(entry.getValue().get(0).get("createTime"));
-                    busProcessName.setAcceptTime(data);
-                    todoList.add(busProcessName);
+                    res.setAcceptTime(data);
+                    todoList.add(res);
                 }
             }
 
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 5883a979..12e5bb1d 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
@@ -48,7 +48,7 @@ public class PEPffresPersonAfter implements TaskListener {
         if (StringUtils.isNotBlank(object.getString("fenFlag"))) {
             if ("2".equals(object.getString("fenFlag"))) {
                 //通过 记录通过的流程条数
-                if (null!=delegateTask.getVariable("PEPCount")) {
+                if (null != delegateTask.getVariable("PEPCount")) {
                     String as = String.valueOf(delegateTask.getVariable("PEPCount"));
                     delegateTask.setVariable("PEPCount", String.valueOf(Integer.valueOf(as) + 1));
                 } else {
@@ -77,11 +77,11 @@ public class PEPffresPersonAfter implements TaskListener {
         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="";
-        if ("2".equals(object.getString("fenFlag"))) {
-             prcName= "标准项目合规评估-汇总审批";
-        }else {
-            prcName="标准项目合规评估-合规性评估";
+        String prcName = "";
+        if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
+            prcName = "标准项目合规评估-汇总审批";
+        } else {
+            prcName = "标准项目合规评估-合规性评估";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -95,55 +95,62 @@ public class PEPffresPersonAfter 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<BusProcessNew> list = busBean.list(queryWrapper3);
-            if(!list.isEmpty()){
+            if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);
             }
         }
-        if ("2".equals(object.getString("fenFlag"))) {
-            oneStep1(delegateTask, busBean, object, nextUserList);
+        if (String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size()))) {
+
+            oneStep1(delegateTask, busBean, nextUserList);
         }
 
     }
 
-    private void oneStep1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, List<String> nextUserList) {
+    private void oneStep1(DelegateTask delegateTask, IBusProcessNewService busBean, List<String> nextUserList) {
         //中间对象
+        List<String> CPX = new ArrayList<>();
         Map<String, List<BusProcessNew>> map = new HashMap<>();
         Map<String, PEPDTO> maps = new HashMap<>();
-        List<String> CPX = new ArrayList<>();
-            JSONArray jsonArray=JSONArray.parseArray(object.getString("step3DTOS"));
-            JSONArray dataList=JSONArray.parseArray(object.getString("dataList"));
-            PEPDTO res=JSONObject.parseObject(object.toString(),PEPDTO.class);
-            int i=0;
-            for (Object j : jsonArray) {
-                Step3DTO o=JSONObject.parseObject(String.valueOf(j), Step3DTO.class);
-                if (!CPX.contains(o.getProjectManager())){
-                    CPX.add(o.getProjectManager());
-                }
-                if (null!=maps.get(o.getProjectManager())){
-                    maps.get(o.getProjectManager()).getStep3DTOS().add(o);
-                    maps.get(o.getProjectManager()).getDataList().add(JSONObject.parseObject(String.valueOf(dataList.get(i)),DataList.class));
+        List<BusProcessNew> busProcessNews=busBean.findLastworkPeople("projectEvaluationProcess5",delegateTask.getProcessInstanceId());
+        for (BusProcessNew b:busProcessNews) {
+            JSONObject object=JSONObject.parseObject(b.getMesg());
+            if (!"1".equals(object.getString("fenFlag"))) {
+                JSONArray jsonArray = JSONArray.parseArray(object.getString("step3DTOS"));
+                JSONArray dataList = JSONArray.parseArray(object.getString("dataList"));
+                PEPDTO res = JSONObject.parseObject(object.toString(), PEPDTO.class);
+                int i = 0;
+                for (Object j : jsonArray) {
+                    Step3DTO o = JSONObject.parseObject(String.valueOf(j), Step3DTO.class);
+                    if (!CPX.contains(o.getProjectManager())) {
+                        CPX.add(o.getProjectManager());
+                    }
+                    if (null != maps.get(o.getProjectManager())) {
+                        maps.get(o.getProjectManager()).getStep3DTOS().add(o);
+                        maps.get(o.getProjectManager()).getDataList().add(JSONObject.parseObject(String.valueOf(dataList.get(i)), DataList.class));
 
-                }else {
-                    PEPDTO re=new PEPDTO();
-                    BeanUtils.copyProperties(res,re);
-                    List<Step3DTO> mis=new ArrayList<>();
-                    re.setStep3DTOS(mis);
-                    List<DataList> dataLists=new ArrayList<>();
-                    DataList list=JSONObject.parseObject(String.valueOf(dataList.get(i)),DataList.class);
-                    dataLists.add(list);
-                    re.setDataList(dataLists);
-                    maps.put(o.getProjectManager(),re);
+                    } else {
+                        PEPDTO re = new PEPDTO();
+                        BeanUtils.copyProperties(res, re);
+                        List<Step3DTO> mis = new ArrayList<>();
+                        re.setStep3DTOS(mis);
+                        List<DataList> dataLists = new ArrayList<>();
+                        DataList list = JSONObject.parseObject(String.valueOf(dataList.get(i)), DataList.class);
+                        dataLists.add(list);
+                        re.setDataList(dataLists);
+                        maps.put(o.getProjectManager(), re);
+                    }
+                    i++;
                 }
-                i++;
             }
+        }
         //生成任务信息
         for (String cp : CPX) {
             BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -157,12 +164,11 @@ public class PEPffresPersonAfter implements TaskListener {
             busBean.save(busProcessNewNext);
         }
         //赋值 节点
-        if (null==delegateTask.getVariable("CPXpeoples")) {
+        if (null == delegateTask.getVariable("CPXpeoples")) {
             delegateTask.setVariable("CPXpeoples", CPX);
-        }else {
-            delegateTask.getVariable("CPXpeoples",List.class).addAll(CPX);
+        } else {
+            delegateTask.getVariable("CPXpeoples", List.class).addAll(CPX);
         }
-//        throw new ActivitiException("Sfahfiq");
     }
 
 }
\ No newline at end of file