|
|
@@ -243,7 +243,7 @@ public class FlowableTaskController {
|
|
|
public ResponseEntity historicListData(Page<HisTaskVo> page, Flow flow) throws Exception {
|
|
|
//获取当前登陆人的信息
|
|
|
UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
|
|
|
- //判定如果当前登陆人是否可以查看其他服务的待办信息
|
|
|
+ //判定如果当前登陆人是否可以查看其他服务的已办信息
|
|
|
if("1".equals(currentUserDTO.getOtherServiceFlag())){
|
|
|
// 中台数据查询
|
|
|
List<Map<String, Object>> cpa = queryHistoricListCenter(flow, "cpa", Global.getConfig("INQUIRE_STATUS"));
|
|
|
@@ -254,12 +254,12 @@ public class FlowableTaskController {
|
|
|
Page sortAndPaging = ConvertServiceUtil.getSortAndPagingHisTask(page, hisTaskVos);
|
|
|
return ResponseEntity.ok (sortAndPaging);
|
|
|
} else {
|
|
|
- // 如果中台没有返回任何数据，就去查询本系统分页待办数据
|
|
|
+ // 如果中台没有返回任何数据，就去查询本系统分页已办数据
|
|
|
Page <HisTaskVo> pageList = flowTaskService.historicList(page, flow, currentUserDTO);
|
|
|
return ResponseEntity.ok (pageList);
|
|
|
}
|
|
|
}else{
|
|
|
- // 查询本系统分页待办数据
|
|
|
+ // 查询本系统分页已办数据
|
|
|
Page <HisTaskVo> pageList = flowTaskService.historicList(page, flow, currentUserDTO);
|
|
|
return ResponseEntity.ok (pageList);
|
|
|
}
|
|
|
@@ -284,7 +284,7 @@ public class FlowableTaskController {
|
|
|
public void run() {
|
|
|
System.out.println("查询cpa已办开始"+sdf.format(new Date()));
|
|
|
try {
|
|
|
- // cpa系统待办数据查询
|
|
|
+ // cpa系统已办数据查询
|
|
|
if (inquireStatus.contains("cpa") || ("cpa").equals(belongProject)) {
|
|
|
Page<HisTaskVo> pageList = flowTaskService.historicList(new Page<>(1, -1), flow, currentUserDTO);
|
|
|
pageList.getRecords().stream().forEach(item -> {
|
|
|
@@ -308,7 +308,7 @@ public class FlowableTaskController {
|
|
|
hisTaskVoList.addAll(pageList.getRecords());
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- System.out.println("cpa系统待办查询失败");
|
|
|
+ System.out.println("cpa系统已办查询失败");
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
// 当前线程执行完毕，计数器 -1
|
|
|
@@ -339,7 +339,7 @@ public class FlowableTaskController {
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- System.out.println("ccpm系统待办查询失败");
|
|
|
+ System.out.println("ccpm系统已办查询失败");
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
// 当前线程执行完毕，计数器 -1
|
lizhenhao