Browse Source

修正:统计月报增加%

zhongwei
ty 3 months ago
parent
commit
ef12ddda8c
  1. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
  2. 6
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java
  3. BIN
      hzims-service/operational/src/main/resources/template/word/stationMonthReport.docx

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java

@ -1150,6 +1150,7 @@ public class ImsDutyMainServiceImpl extends ServiceImpl<ImsDutyMainMapper, ImsDu
}
List<ImsDutyMainEntity> handerCollect = imsDutyMainEntityList.stream().filter(s -> rec.getDutyId().equals(s.getPreDutyId())).collect(Collectors.toList());
if(CollectionUtil.isNotEmpty(handerCollect)){
if (ObjectUtil.isNotEmpty(handerCollect.get(0).getDutyGroupId())){
List<DutyRunReportVO> handerRunReportList = dutyReportVOList.stream().filter(s -> s.getGroupId().equals(handerCollect.get(0).getDutyGroupId().toString())).collect(Collectors.toList());
DutyRunReportVO handerRunRepor = handerRunReportList.get(0);
handerRunRepor.setDelayChangeShifts(handerRunRepor.getDelayChangeShifts()+1);
@ -1157,6 +1158,7 @@ public class ImsDutyMainServiceImpl extends ServiceImpl<ImsDutyMainMapper, ImsDu
}
}
}
}
if (CollectionUtil.isNotEmpty(exceptionList)) {
for (ImsDutyRecEntity rec : exceptionList) {
if (rec.getDelayStatus().equals(CARRY_DELAY_STATUS.getStatus())){

6
hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java

@ -455,6 +455,10 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor
ticketStatisticDTO.setDeptIds(deptIds);
List<TicketInfoStatisticVO> ticketVOS = ticketInfoAllClient.getTicketReportStatistic(ticketStatisticDTO);
if (CollectionUtil.isNotEmpty(ticketVOS)){
ticketVOS = ticketVOS.stream().map(s -> {
s.setTicketInfoProportionName(s.getTicketInfoProportion() + "%");
return s;
}).collect(Collectors.toList());
stationReportAllVo.setTicketInfoStatisticVOList(ticketVOS);
}
} finally {
@ -723,7 +727,7 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor
temp.put("ticketInfoCompleteNum",ticketInfoStatisticVO.getTicketInfoCompleteNum().toString());
temp.put("ticketInfoInvalidatedNum",ticketInfoStatisticVO.getTicketInfoInvalidatedNum().toString());
temp.put("ticketInfoQualifiedNum",ticketInfoStatisticVO.getTicketInfoQualifiedNum().toString());
temp.put("ticketInfoProportion",ticketInfoStatisticVO.getTicketInfoProportion().toString());
temp.put("ticketInfoProportion",ticketInfoStatisticVO.getTicketInfoProportionName());
sumList.add(temp);
map.put("ticketInfoSum", sumList);
}

BIN
hzims-service/operational/src/main/resources/template/word/stationMonthReport.docx

Binary file not shown.
Loading…
Cancel
Save