Ver Fonte

整改清单大小写

zhuang há 1 ano atrás
pai
commit
dfa202d744

+ 6 - 3
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -249,8 +249,11 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
         //基地内合计
         List<ZhcxProjectRectifyMachineVo> collect = list.stream()
                 .filter(e -> Objects.nonNull(e.getFirstdeptid())).collect(Collectors.toList());
+        //长兴基地 大车行走配套事业部
+        List<String> deptIds = Arrays.asList("b0bd3ed27bfb4af08535c39f464b3d3a"
+                ,"55c58ffb9d9b486abdd0dcb073f9b451");
         List<ZhcxProjectRectifyMachineVo> collect2 = list.stream()
-                .filter(e -> "b0bd3ed27bfb4af08535c39f464b3d3a".equals(e.getDeptid())).collect(Collectors.toList());
+                .filter(e -> deptIds.contains(e.getDeptid())).collect(Collectors.toList());
         collect.addAll(collect2);
         RectifyDto rectifyDto = new RectifyDto();
         rectifyDto.setDeptid(null);
@@ -314,9 +317,9 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                     Map<String, Long> statusCount = distinctEntities.stream()
                             .collect(Collectors.groupingBy(ZhcxProjectRectifyMachineDo::getStatus, Collectors.counting()));
 
-                    int okCount = statusCount.getOrDefault("OK", 0L).intValue();
+                    int okCount = statusCount.getOrDefault("ok", 0L).intValue();
                     int tbcCount = statusCount.getOrDefault("√", 0L).intValue();
-                    int unfinishedCount = statusCount.getOrDefault("X", 0L).intValue();
+                    int unfinishedCount = statusCount.getOrDefault("x", 0L).intValue();
                     int totalCount = distinctEntities.size();
 
                     RectifyMachineDto rectifyMachine = new RectifyMachineDto();