FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

待办 查询bug

Browse Source
This commit is contained in:
yuezhihang
2021-07-21 20:19:05 +08:00
parent fadac229ba
commit 52dcabc983
2 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+7 -5
View File
@@ -145,13 +145,15 @@ public class TodoTaskController extends BaseAction {
String taskIds = ""; String taskIds = "";
for (Map<String, Object> map : entry.getValue()) { for (Map<String, Object> map : entry.getValue()) {
if (busProcessName != null) { if (busProcessName != null) {
busProcessName.setTaskIds(map.get("id").toString()); BusProcessName res=new BusProcessName();
busProcessName.setTaskInfo(entry.getValue().get(0).get("name").toString()); BeanUtils.copyProperties(busProcessName,res);
busProcessName.setMes(null); 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"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String data = sdf.format(entry.getValue().get(0).get("createTime")); String data = sdf.format(entry.getValue().get(0).get("createTime"));
busProcessName.setAcceptTime(data); res.setAcceptTime(data);
todoList.add(busProcessName); todoList.add(res);
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java
+12 -6
View File
@@ -78,7 +78,7 @@ public class PEPffresPersonAfter implements TaskListener {
String user = delegateTask.getVariable("prcCreateUser", String.class); String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = ""; String prcName = "";
if ("2".equals(object.getString("fenFlag"))) { if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
prcName = "标准项目合规评估-汇总审批"; prcName = "标准项目合规评估-汇总审批";
} else { } else {
prcName = "标准项目合规评估-合规性评估"; prcName = "标准项目合规评估-合规性评估";
@@ -107,17 +107,22 @@ public class PEPffresPersonAfter implements TaskListener {
busBean.saveOrUpdate(busProcessNews); busBean.saveOrUpdate(busProcessNews);
} }
} }
if ("2".equals(object.getString("fenFlag"))) { if (String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size()))) {
oneStep1(delegateTask, busBean, object, nextUserList);
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, List<BusProcessNew>> map = new HashMap<>();
Map<String, PEPDTO> maps = new HashMap<>(); Map<String, PEPDTO> maps = new HashMap<>();
List<String> CPX = new ArrayList<>(); 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 jsonArray = JSONArray.parseArray(object.getString("step3DTOS"));
JSONArray dataList = JSONArray.parseArray(object.getString("dataList")); JSONArray dataList = JSONArray.parseArray(object.getString("dataList"));
PEPDTO res = JSONObject.parseObject(object.toString(), PEPDTO.class); PEPDTO res = JSONObject.parseObject(object.toString(), PEPDTO.class);
@@ -144,6 +149,8 @@ public class PEPffresPersonAfter implements TaskListener {
} }
i++; i++;
} }
}
}
//生成任务信息 //生成任务信息
for (String cp : CPX) { for (String cp : CPX) {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -162,7 +169,6 @@ public class PEPffresPersonAfter implements TaskListener {
} else { } else {
delegateTask.getVariable("CPXpeoples", List.class).addAll(CPX); delegateTask.getVariable("CPXpeoples", List.class).addAll(CPX);
} }
// throw new ActivitiException("Sfahfiq");
} }
} }