新增方法 /get_gather_by_instance
已办流程中的汇总功能 中的是否可汇总的功能判断
This commit is contained in:
@@ -185,6 +185,7 @@ public class TaskController {
|
|||||||
public List<Map<String, Object>> get_gather_by_instance(String prcNum,String sortWord,String shunxu) {
|
public List<Map<String, Object>> get_gather_by_instance(String prcNum,String sortWord,String shunxu) {
|
||||||
QueryWrapper queryWrapper = new QueryWrapper();
|
QueryWrapper queryWrapper = new QueryWrapper();
|
||||||
queryWrapper.eq("PRC_NUM",prcNum);
|
queryWrapper.eq("PRC_NUM",prcNum);
|
||||||
|
Boolean isGather=false;
|
||||||
BusProcessName one = iBusProcessNameService.getOne(queryWrapper);
|
BusProcessName one = iBusProcessNameService.getOne(queryWrapper);
|
||||||
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
|
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
|
||||||
.processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
|
.processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
|
||||||
@@ -253,7 +254,59 @@ public class TaskController {
|
|||||||
historicTaskInstance.put("comment","");
|
historicTaskInstance.put("comment","");
|
||||||
historicTaskInstance.put("commentText","");
|
historicTaskInstance.put("commentText","");
|
||||||
}
|
}
|
||||||
|
//判断是否可汇总功能
|
||||||
|
String prcType=(String)historicTaskInstance.get("prcType");
|
||||||
|
String name=(String)historicTaskInstance.get("name");
|
||||||
|
String endTime=(String)historicTaskInstance.get("endTime");
|
||||||
|
if (prcType.equals("1") && name.equals("起草") && !endTime.isEmpty()) {
|
||||||
|
// 标准入库流程数据
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "buss1"&& name.equals("批准") && !endTime.isEmpty()){
|
||||||
|
//企标入库
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "buss2"&& name.equals("意见汇总修订") && !endTime.isEmpty()){
|
||||||
|
//企标入库
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "buss3"&& name.equals("汇总") && !endTime.isEmpty()){
|
||||||
|
//企标复审
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "4"&& name.equals("起草") && !endTime.isEmpty()){
|
||||||
|
//标准清单发布流程数据
|
||||||
|
isGather=true;
|
||||||
|
}else if (prcType == "5"&& name.equals("批准") && !endTime.isEmpty()){
|
||||||
|
//标准项目合规评估
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "6"&& name.equals("批准") && !endTime.isEmpty()){
|
||||||
|
//标准项目合规评估 项目维度
|
||||||
|
isGather=true;
|
||||||
|
} else if (prcType == "8"&& name.equals("合规排查(上传合规举证材料)") && !endTime.isEmpty()) {
|
||||||
|
// 未符合项整改
|
||||||
|
isGather=true;
|
||||||
|
} else if(prcType == "9" && name.equals("批准") && !endTime.isEmpty()){
|
||||||
|
// 标准解读流程
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "2"&& name.equals("调研结果处理") && !endTime.isEmpty()){
|
||||||
|
//标准调研流程
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "3"&& name.equals("意见处理") && !endTime.isEmpty()){
|
||||||
|
//标准征求意见
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "10"&& name.equals("批准") && !endTime.isEmpty()){
|
||||||
|
//项目清单确认
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "24"&& name.equals("起草人修改标准状态") && !endTime.isEmpty()){
|
||||||
|
//企标废止
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "25"&& name.equals("起草") && !endTime.isEmpty()){
|
||||||
|
//企标制修订计划管控
|
||||||
|
isGather=true;
|
||||||
|
}else if(prcType == "26"&& name.equals("起草") && !endTime.isEmpty()){
|
||||||
|
//企标制修订立项计划
|
||||||
|
isGather=true;
|
||||||
|
} else if(prcType == "23"&& name.equals("汇总") && !endTime.isEmpty()){
|
||||||
|
//企标复审
|
||||||
|
isGather=true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(StringUtils.isNotBlank(sortWord)){
|
if(StringUtils.isNotBlank(sortWord)){
|
||||||
Collections.sort(list, new Comparator<Map<String, Object>>() {
|
Collections.sort(list, new Comparator<Map<String, Object>>() {
|
||||||
@@ -276,6 +329,10 @@ public class TaskController {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Map<String,Object> m=new HashMap<>();
|
||||||
|
m.put("isGather",isGather);
|
||||||
|
list.add(m);
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user