From 3472edd85b25bcff5f519fc3d358988cc10e0799 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 15:41:18 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/bus/BusList.jsx | 6 +++++-
zy-acs-flow/src/i18n/en.js | 3 ++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 6 +++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java | 3 +++
zy-acs-flow/src/i18n/zh.js | 3 ++-
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 052b4cf..4460244 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/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",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 0fcc138..db9657f 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -433,7 +433,8 @@
busSts: "鎬荤嚎鐘舵��",
phase: "杩涘害",
taskList: "浠诲姟鍒楄〃",
- tasksNum: "浠诲姟鏁伴噺",
+ tasksNum: "鍓╀綑浠诲姟",
+ tasksNumTotal: "浠诲姟鎬绘暟",
},
task: {
uuid: "缂栧彿",
diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx
index 0cc67d2..d411899 100644
--- a/zy-acs-flow/src/page/bus/BusList.jsx
+++ b/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} />
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
index 02329f3..2339ed9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
+++ b/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);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java
index 9e7f4cc..393e8dc 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java
+++ b/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$(){
--
Gitblit v1.9.1