fix:修改生产整体概况返回

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java

@@ -134,44 +134,44 @@ public class DashboardController {
                 .collect(Collectors.groupingBy(TaskDO::getStatus, Collectors.counting()));
         // 生产任务总数
         TaskRespVO.Item item = new TaskRespVO.Item();
-        item.setKey("1");
+        item.setKey("11");
         item.setLabel("生产任务总数");
         item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
                 .betweenIfPresent(TaskDO::getCreateTime, taskReqVO.getStartTime()))); // 创建时间
         taskItems.add(item);
-        // 未开工任务数
-        item = new TaskRespVO.Item();
-        item.setKey("2");
-        item.setLabel("未开工任务数");
-        Collection<Long> count1 = new ArrayList<>();
-        count1.add(1L);
-        count1.add(2L);
-        count1.add(3L);
-        item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
-                .in(TaskDO::getStatus, count1)
-                .betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime()))); // 下达时间
-        taskItems.add(item);
-        // 生产中任务数
-        item = new TaskRespVO.Item();
-        item.setKey("3");
-        item.setLabel("生产中任务数");
-        Collection<Long> count2 = new ArrayList<>();
-        count2.add(4L);
-        item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
-                .in(TaskDO::getStatus, count2)
-                .betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime())));
-        taskItems.add(item);
-        // 完工任务数
-        item = new TaskRespVO.Item();
-        item.setKey("4");
-        item.setLabel("完工任务数");
-        Collection<Long> count3 = new ArrayList<>();
-        count3.add(5L);
-        count3.add(6L);
-        item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
-                .in(TaskDO::getStatus, count3)
-                .betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime())));
-        taskItems.add(item);
+//        // 未开工任务数
+//        item = new TaskRespVO.Item();
+//        item.setKey("2");
+//        item.setLabel("未开工任务数");
+//        Collection<Long> count1 = new ArrayList<>();
+//        count1.add(1L);
+//        count1.add(2L);
+//        count1.add(3L);
+//        item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
+//                .in(TaskDO::getStatus, count1)
+//                .betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime()))); // 下达时间
+//        taskItems.add(item);
+//        // 生产中任务数
+//        item = new TaskRespVO.Item();
+//        item.setKey("3");
+//        item.setLabel("生产中任务数");
+//        Collection<Long> count2 = new ArrayList<>();
+//        count2.add(4L);
+//        item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
+//                .in(TaskDO::getStatus, count2)
+//                .betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime())));
+//        taskItems.add(item);
+//        // 完工任务数
+//        item = new TaskRespVO.Item();
+//        item.setKey("4");
+//        item.setLabel("完工任务数");
+//        Collection<Long> count3 = new ArrayList<>();
+//        count3.add(5L);
+//        count3.add(6L);
+//        item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
+//                .in(TaskDO::getStatus, count3)
+//                .betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime())));
+//        taskItems.add(item);
 
 
         // 生产计划总数
@@ -242,6 +242,12 @@ public class DashboardController {
         planItems.add(item);
 
         for (TaskStatusEnum taskStatusEnum : TaskStatusEnum.values()) {
+            if (TaskStatusEnum.已排产.equals(taskStatusEnum)
+                    || TaskStatusEnum.开工.equals(taskStatusEnum)
+                    || TaskStatusEnum.完工.equals(taskStatusEnum)
+                    || TaskStatusEnum.入库.equals(taskStatusEnum)) {
+                continue;
+            }
             item = new TaskRespVO.Item();
             item.setKey(String.valueOf(taskStatusEnum.getValue()));
             item.setLabel(taskStatusEnum.name());

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskStatusEnum.java

@@ -39,10 +39,10 @@ public enum TaskStatusEnum {
     public static List<Integer> getEnablePlanStatus(){
         List<Integer> statusList = new ArrayList<>();
         statusList.add(TaskStatusEnum.下达.getValue());
-        statusList.add(TaskStatusEnum.已排产.getValue());
-        statusList.add(TaskStatusEnum.开工.getValue());
-        statusList.add(TaskStatusEnum.完工.getValue());
-        statusList.add(TaskStatusEnum.入库.getValue());
+//        statusList.add(TaskStatusEnum.已排产.getValue());
+//        statusList.add(TaskStatusEnum.开工.getValue());
+//        statusList.add(TaskStatusEnum.完工.getValue());
+//        statusList.add(TaskStatusEnum.入库.getValue());
         statusList.add(TaskStatusEnum.部分排产.getValue());
         statusList.add(TaskStatusEnum.待生产.getValue());
         statusList.add(TaskStatusEnum.生产中.getValue());