#

luxiaotao1123

2024-09-24 3472edd85b25bcff5f519fc3d358988cc10e0799

#

 zy-acs-flow/src/i18n/en.js

@@ -434,7 +434,8 @@
                busSts: "bus status",
                phase: "phase",
                taskList: "task list",
                tasksNum: "tasks number",
                tasksNum: "rest tasks",
                tasksNumTotal: "total tasks",
            },
            task: {
                uuid: "uuid",

 zy-acs-flow/src/i18n/zh.js

@@ -433,7 +433,8 @@
                busSts: "总线状态",
                phase: "进度",
                taskList: "任务列表",
                tasksNum: "任务数量",
                tasksNum: "剩余任务",
                tasksNumTotal: "任务总数",
            },
            task: {
                uuid: "编号",

 zy-acs-flow/src/page/bus/BusList.jsx

@@ -65,6 +65,9 @@
    '& .column-tasksNum': {
        maxWidth: '8em',
    },
    '& .column-tasksNumTotal': {
        maxWidth: '8em',
    },
    '& .column-memo': {
        maxWidth: '12em',
        overflow: 'hidden',
@@ -166,7 +169,8 @@
                        )} />
                        {/* <TextField source="name" /> */}
                    </ReferenceField>
                    <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} />
                    <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} sx={{ fontWeight: 'bold' }} />
                    <NumberField source="tasksNumTotal" label="table.field.bus.tasksNumTotal" sortable={false} sx={{ fontWeight: 'bold' }} />
                    <DateField source="startTime" label="table.field.bus.startTime" showTime />
                    <DateField source="endTime" label="table.field.bus.endTime" showTime emptyText="-" />
                    <TextField source="phase" label="table.field.bus.phase" sortable={false} />

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java

@@ -57,11 +57,15 @@
            wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
        }
        PageParam<Bus, BaseParam> page = busService.page(pageParam, wrapper);

        long taskCompleteSts = TaskStsType.COMPLETE.val();
        long taskCancelSts = TaskStsType.CANCEL.val();
        for (Bus record : page.getRecords()) {
            List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBusId, record.getId()));
            if (!Cools.isEmpty(tasks)) {
                record.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
                record.setTasksNum(tasks.size());
                record.setTasksNum((int)tasks.stream().filter(task -> task.getTaskSts() != taskCompleteSts && task.getTaskSts() != taskCancelSts).count());
                record.setTasksNumTotal(tasks.size());
            }
        }
        return R.ok().add(page);

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java

@@ -115,6 +115,9 @@
    private int tasksNum = 0;

    @TableField(exist = false)
    private int tasksNumTotal = 0;

    @TableField(exist = false)
    private List<Long> taskIds;

    public String getBusSts$(){