|
|
|
|
@ -226,7 +226,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
|
|
|
|
|
// 创建时间范围
|
|
|
|
|
if (workOrder.getStartTime() != null && workOrder.getEndTime() != null) { |
|
|
|
|
workOrders = workOrders.stream().filter(s -> (s.getCreateTime().after(workOrder.getStartTime())) && (s.getCreateTime().before(workOrder.getEndTime()))).collect(Collectors.toList()); |
|
|
|
|
workOrders = workOrders.stream().filter(s -> |
|
|
|
|
(s.getCreateTime().after(workOrder.getStartTime())) && |
|
|
|
|
(s.getCreateTime().before(workOrder.getEndTime()))).collect(Collectors.toList()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 排序
|
|
|
|
|
@ -454,16 +456,16 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
historicVars.forEach(var -> |
|
|
|
|
varMap.put(var.getVariableName(), var.getValue())); |
|
|
|
|
|
|
|
|
|
// 任务父类
|
|
|
|
|
varMap.put("renwufulei", DictBizCache.getById(Long.parseLong(varMap.get("renwufulei").toString())).getDictValue()); |
|
|
|
|
|
|
|
|
|
ProjectDatabase byId = dataBaseService.getById(varMap.get("xitongmingchengshujuku").toString()); |
|
|
|
|
if (byId != null) { |
|
|
|
|
varMap.put("xitongmingchengshujuku", byId.getDatabaseProjectName()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 运维公司
|
|
|
|
|
varMap.put("yunweigongsi", userClient.userInfoById(Long.parseLong(varMap.get("yunweigongsi").toString())).getData().getRealName()); |
|
|
|
|
// // 任务父类
|
|
|
|
|
// varMap.put("renwufulei", DictBizCache.getById(Long.parseLong(varMap.get("renwufulei").toString())).getDictValue());
|
|
|
|
|
//
|
|
|
|
|
// ProjectDatabase byId = dataBaseService.getById(varMap.get("xitongmingchengshujuku").toString());
|
|
|
|
|
// if (byId != null) {
|
|
|
|
|
// varMap.put("xitongmingchengshujuku", byId.getDatabaseProjectName());
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// // 运维公司
|
|
|
|
|
// varMap.put("yunweigongsi", userClient.userInfoById(Long.parseLong(varMap.get("yunweigongsi").toString())).getData().getRealName());
|
|
|
|
|
|
|
|
|
|
Task task = taskService.createTaskQuery().processInstanceId(historicProcessInstance.getId()).singleResult(); |
|
|
|
|
if (task != null) { |
|
|
|
|
@ -485,9 +487,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
} |
|
|
|
|
varMap.put("startTime", historicProcessInstance.getStartTime()); |
|
|
|
|
varMap.put("endTime", historicProcessInstance.getEndTime()); |
|
|
|
|
varMap.put("startUserId", userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getRealName()); |
|
|
|
|
varMap.put("processInstanceId", historicProcessInstance.getId()); |
|
|
|
|
varMap.put("taskId", ""); |
|
|
|
|
// varMap.put("startUserId", userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getRealName());
|
|
|
|
|
// varMap.put("processInstanceId", historicProcessInstance.getId());
|
|
|
|
|
// varMap.put("taskId", "");
|
|
|
|
|
workOrders.add(varMap); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -497,13 +499,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
for (Map<String, Object> order : workOrders) { |
|
|
|
|
WorkOrderExcel excel = new WorkOrderExcel(); |
|
|
|
|
excel.setTaskType(order.get("$renwuzhonglei").toString()); |
|
|
|
|
excel.setTaskParent(order.get("renwufulei").toString()); |
|
|
|
|
excel.setOperationModule(order.get("xitongmingchengshujuku").toString()); |
|
|
|
|
// excel.setTaskParent(order.get("renwufulei").toString());
|
|
|
|
|
// excel.setOperationModule(order.get("xitongmingchengshujuku").toString());
|
|
|
|
|
excel.setCurrentResponsiblePerson(order.get("currentResponsiblePerson").toString()); |
|
|
|
|
excel.setDept(order.get("$guanlibumen").toString()); |
|
|
|
|
excel.setLevel(order.get("$renwudengji").toString()); |
|
|
|
|
excel.setCompany(order.get("yunweigongsi").toString()); |
|
|
|
|
excel.setSponsor(order.get("startUserId").toString()); |
|
|
|
|
// excel.setCompany(order.get("yunweigongsi").toString());
|
|
|
|
|
// excel.setSponsor(order.get("startUserId").toString());
|
|
|
|
|
excel.setApprovalStatus(order.get("status").toString()); |
|
|
|
|
excel.setCreateTime(format.format(order.get("startTime"))); |
|
|
|
|
|
|
|
|
|
@ -527,8 +529,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
wrapper.in(WorkOrder::getManagement, Func.toStrList(AuthUtil.getDeptId())); |
|
|
|
|
if (workOrder.getStartTime() != null && workOrder.getEndTime() != null) { |
|
|
|
|
wrapper.between(WorkOrder::getCreateTime, workOrder.getStartTime(), workOrder.getEndTime()); |
|
|
|
|
wrapper.ge(WorkOrder::getCreateTime, workOrder.getStartTime()); |
|
|
|
|
wrapper.le(WorkOrder::getFinishTime, workOrder.getEndTime()); |
|
|
|
|
// wrapper.ge(WorkOrder::getCreateTime, workOrder.getStartTime());
|
|
|
|
|
// wrapper.le(WorkOrder::getFinishTime, workOrder.getEndTime());
|
|
|
|
|
} |
|
|
|
|
wrapper.orderByDesc(WorkOrder::getCreateTime); |
|
|
|
|
IPage<WorkOrder> page = page(Condition.getPage(query), wrapper); |
|
|
|
|
@ -607,34 +609,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
.processInstanceTenantId(WfTaskUtil.getTenantId()).list(); |
|
|
|
|
|
|
|
|
|
List<Map<String, Object>> workOrders = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(list)) { |
|
|
|
|
for (HistoricProcessInstance historicProcessInstance : list) { |
|
|
|
|
Map<String, Object> varMap = new HashMap<>(); |
|
|
|
|
List<HistoricVariableInstance> historicVars = historyService.createHistoricVariableInstanceQuery() |
|
|
|
|
.processInstanceId(historicProcessInstance.getId()).list(); |
|
|
|
|
historicVars.forEach(var -> |
|
|
|
|
varMap.put(var.getVariableName(), var.getValue())); |
|
|
|
|
historicVars.forEach(var -> varMap.put(var.getVariableName(), var.getValue())); |
|
|
|
|
|
|
|
|
|
// 任务父类
|
|
|
|
|
varMap.put("renwufulei", DictBizCache.getById(Long.parseLong(varMap.get("renwufulei").toString())).getDictValue()); |
|
|
|
|
|
|
|
|
|
// 操作模块
|
|
|
|
|
// if ("1".equals(varMap.get("type").toString())) {
|
|
|
|
|
// varMap.put("xitongmingchengshujuku", projectInfoService.getById(varMap.get("xitongmingchengshujuku").toString()).getProjectName());
|
|
|
|
|
// } else {
|
|
|
|
|
ProjectDatabase byId = dataBaseService.getById(varMap.get("xitongmingchengshujuku").toString()); |
|
|
|
|
if (byId != null) { |
|
|
|
|
varMap.put("xitongmingchengshujuku", byId.getDatabaseProjectName()); |
|
|
|
|
} |
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// ProjectInfo projectInfo = projectInfoService.getById(varMap.get("xitongmingchengshujuku").toString());
|
|
|
|
|
// if (projectInfo != null) {
|
|
|
|
|
// varMap.put("xitongmingchengshujuku", projectInfo.getProjectName());
|
|
|
|
|
// } else {
|
|
|
|
|
// varMap.put("xitongmingchengshujuku", dataBaseService.getById(varMap.get("xitongmingchengshujuku").toString()).getDataBaseName());
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// 运维公司
|
|
|
|
|
varMap.put("yunweigongsi", userClient.userInfoById(Long.parseLong(varMap.get("yunweigongsi").toString())).getData().getRealName()); |
|
|
|
|
@ -668,7 +656,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
varMap.put("processInstanceId", historicProcessInstance.getId()); |
|
|
|
|
|
|
|
|
|
List<HistoricTaskInstance> taskInstanceList = historyService.createHistoricTaskInstanceQuery().processInstanceId(historicProcessInstance.getId()).orderByTaskCreateTime().desc().list(); |
|
|
|
|
|
|
|
|
|
varMap.put("taskId", taskInstanceList.get(0).getId()); |
|
|
|
|
workOrders.add(varMap); |
|
|
|
|
} |
|
|
|
|
@ -676,16 +663,17 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 只看本部门数据权限
|
|
|
|
|
List<Map<String, Object>> workOrderList = new ArrayList<>(); |
|
|
|
|
// List<Map<String, Object>> workOrderList = new ArrayList<>();
|
|
|
|
|
List<String> deptIds = Func.toStrList(AuthUtil.getDeptId()); |
|
|
|
|
workOrders.forEach(order -> { |
|
|
|
|
String deptId = order.get("startDeptId").toString(); |
|
|
|
|
if (deptIds.contains(deptId)) { |
|
|
|
|
workOrderList.add(order); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
workOrders = workOrderList; |
|
|
|
|
// workOrders.forEach(order -> {
|
|
|
|
|
// String deptId = order.get("startDeptId").toString();
|
|
|
|
|
// if (deptIds.contains(deptId)) {
|
|
|
|
|
// workOrderList.add(order);
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// workOrders = workOrderList;
|
|
|
|
|
|
|
|
|
|
workOrders = workOrders.stream().filter(s -> deptIds.contains(s.get("guanlibumen").toString())).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
// 任务父类
|
|
|
|
|
if (StringUtils.isNotBlank(workOrder.getTaskParent())) { |
|
|
|
|
@ -732,32 +720,16 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
if (workOrder.getStartTime() != null && workOrder.getEndTime() != null) { |
|
|
|
|
workOrders = workOrders.stream().filter(s -> |
|
|
|
|
{ |
|
|
|
|
if (s.get("endTime") != null) { |
|
|
|
|
try { |
|
|
|
|
return (format.parse(format.format(s.get("startTime"))).after(workOrder.getStartTime())) && |
|
|
|
|
(format.parse(format.format(s.get("endTime"))).before(workOrder.getEndTime())); |
|
|
|
|
(format.parse(format.format(s.get("startTime"))).before(workOrder.getEndTime())); |
|
|
|
|
} catch (ParseException e) { |
|
|
|
|
e.printStackTrace(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return false; |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 结束时间范围
|
|
|
|
|
// if (workOrder.getEndTime() != null) {
|
|
|
|
|
// workOrders = workOrders.stream().filter(s ->
|
|
|
|
|
// {
|
|
|
|
|
// if (s.get("endTime") != null) {
|
|
|
|
|
// try {
|
|
|
|
|
// return format.parse(format.format(s.get("endTime"))).before(workOrder.getEndTime());
|
|
|
|
|
// } catch (ParseException e) {
|
|
|
|
|
// e.printStackTrace();
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// return false;
|
|
|
|
|
// }).collect(Collectors.toList());
|
|
|
|
|
// }
|
|
|
|
|
return workOrders; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
litao
3 years ago