Browse Source

调整缺陷月报统计导出顺序

zhongwei
ty 11 months ago
parent
commit
e8f12a9107
  1. 6
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java

6
hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java

@ -609,9 +609,6 @@ public class OperPhenomenonServiceImpl extends BaseServiceImpl<OperPhenomenonMap
List<CheckVoteChartVo> res = new ArrayList<>();
if (CollectionUtil.isNotEmpty(operPhenomenonEntities)) {
CheckVoteChartVo all = getCheckVoteChartVo(operPhenomenonEntities);
all.setName("总计");
res.add(all);
Map<Long, List<OperPhenomenonEntity>> collect = Optional.ofNullable(operPhenomenonEntities).orElse(new ArrayList<>()).stream().collect(Collectors.groupingBy(OperPhenomenonEntity::getCreateDept));
for (Map.Entry<Long, List<OperPhenomenonEntity>> longListEntry : collect.entrySet()) {
CheckVoteChartVo chartVo= getCheckVoteChartVo(longListEntry.getValue());
@ -619,6 +616,9 @@ public class OperPhenomenonServiceImpl extends BaseServiceImpl<OperPhenomenonMap
chartVo.setName(deptName.isSuccess() ? deptName.getData() : "");
res.add(chartVo);
}
CheckVoteChartVo all = getCheckVoteChartVo(operPhenomenonEntities);
all.setName("总计");
res.add(all);
} else {
CheckVoteChartVo all = new CheckVoteChartVo();
all.setName("总计");

Loading…
Cancel
Save