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
+46 -40
View File
@@ -48,7 +48,7 @@ public class PEPffresPersonAfter implements TaskListener {
if (StringUtils.isNotBlank(object.getString("fenFlag"))) { if (StringUtils.isNotBlank(object.getString("fenFlag"))) {
if ("2".equals(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")); String as = String.valueOf(delegateTask.getVariable("PEPCount"));
delegateTask.setVariable("PEPCount", String.valueOf(Integer.valueOf(as) + 1)); delegateTask.setVariable("PEPCount", String.valueOf(Integer.valueOf(as) + 1));
} else { } else {
@@ -77,11 +77,11 @@ public class PEPffresPersonAfter implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
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 = "标准项目合规评估-合规性评估";
} }
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -95,55 +95,62 @@ public class PEPffresPersonAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
// 存储当前节点意见 // 存储当前节点意见
if (null!=object.getString("commentText")) { if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper(); QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3); List<BusProcessNew> list = busBean.list(queryWrapper3);
if(!list.isEmpty()){ if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0); BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText")); busProcessNews.setCommitText(object.getString("commentText"));
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());
JSONArray jsonArray=JSONArray.parseArray(object.getString("step3DTOS")); for (BusProcessNew b:busProcessNews) {
JSONArray dataList=JSONArray.parseArray(object.getString("dataList")); JSONObject object=JSONObject.parseObject(b.getMesg());
PEPDTO res=JSONObject.parseObject(object.toString(),PEPDTO.class); if (!"1".equals(object.getString("fenFlag"))) {
int i=0; JSONArray jsonArray = JSONArray.parseArray(object.getString("step3DTOS"));
for (Object j : jsonArray) { JSONArray dataList = JSONArray.parseArray(object.getString("dataList"));
Step3DTO o=JSONObject.parseObject(String.valueOf(j), Step3DTO.class); PEPDTO res = JSONObject.parseObject(object.toString(), PEPDTO.class);
if (!CPX.contains(o.getProjectManager())){ int i = 0;
CPX.add(o.getProjectManager()); for (Object j : jsonArray) {
} Step3DTO o = JSONObject.parseObject(String.valueOf(j), Step3DTO.class);
if (null!=maps.get(o.getProjectManager())){ if (!CPX.contains(o.getProjectManager())) {
maps.get(o.getProjectManager()).getStep3DTOS().add(o); CPX.add(o.getProjectManager());
maps.get(o.getProjectManager()).getDataList().add(JSONObject.parseObject(String.valueOf(dataList.get(i)),DataList.class)); }
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 { } else {
PEPDTO re=new PEPDTO(); PEPDTO re = new PEPDTO();
BeanUtils.copyProperties(res,re); BeanUtils.copyProperties(res, re);
List<Step3DTO> mis=new ArrayList<>(); List<Step3DTO> mis = new ArrayList<>();
re.setStep3DTOS(mis); re.setStep3DTOS(mis);
List<DataList> dataLists=new ArrayList<>(); List<DataList> dataLists = new ArrayList<>();
DataList list=JSONObject.parseObject(String.valueOf(dataList.get(i)),DataList.class); DataList list = JSONObject.parseObject(String.valueOf(dataList.get(i)), DataList.class);
dataLists.add(list); dataLists.add(list);
re.setDataList(dataLists); re.setDataList(dataLists);
maps.put(o.getProjectManager(),re); maps.put(o.getProjectManager(), re);
}
i++;
} }
i++;
} }
}
//生成任务信息 //生成任务信息
for (String cp : CPX) { for (String cp : CPX) {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -157,12 +164,11 @@ public class PEPffresPersonAfter implements TaskListener {
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
//赋值 节点 //赋值 节点
if (null==delegateTask.getVariable("CPXpeoples")) { if (null == delegateTask.getVariable("CPXpeoples")) {
delegateTask.setVariable("CPXpeoples", CPX); delegateTask.setVariable("CPXpeoples", CPX);
}else { } else {
delegateTask.getVariable("CPXpeoples",List.class).addAll(CPX); delegateTask.getVariable("CPXpeoples", List.class).addAll(CPX);
} }
// throw new ActivitiException("Sfahfiq");
} }
} }