|
|
|
@ -1571,7 +1571,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
|
|
|
|
|
Map<String, Object> paramMap = new HashMap<>(); |
|
|
|
|
paramMap.put("startDate", startTime); |
|
|
|
|
paramMap.put("endDate", endTime); |
|
|
|
|
paramMap.put("deptList", deptId); |
|
|
|
|
paramMap.put("deptList", Arrays.asList(deptId)); |
|
|
|
|
R<List<WorkTicketInfoEntity>> workTicketInfo = ticketInfoClient.getWorkTicketInfo(paramMap); |
|
|
|
|
if(workTicketInfo.isSuccess()&& cn.hutool.core.util.ObjectUtil.isNotEmpty(workTicketInfo.getData())){ |
|
|
|
|
List<WorkTicketInfoEntity> ticketInfoData = workTicketInfo.getData(); |
|
|
|
@ -1583,10 +1583,9 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
|
|
|
|
|
List<WorkTicketInfoEntity> invalidList = ticketInfoData.stream().filter(item -> "废票".equals(item.getFlowTaskName())) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
dutyLogEntity.setWorkCancel(String.valueOf(invalidList.size())); |
|
|
|
|
Integer i=0; |
|
|
|
|
//工作票未执行数量
|
|
|
|
|
List<WorkTicketInfoEntity> unExecutedList = ticketInfoData.stream() |
|
|
|
|
.filter(item -> i.equals(item.getImplementStatus())) |
|
|
|
|
.filter(item -> "0".equals(item.getImplementStatus())) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
dutyLogEntity.setWorkUnFinish(String.valueOf(unExecutedList.size())); |
|
|
|
|
// 工作票执行数量
|
|
|
|
|