From fabf01ce120e7e5be63470607b8ab51b2eb69611 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 09:24:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java | 30 +++++++++++++++++++++++-------
zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java | 5 +++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java | 13 +++++++++++--
zy-acs-flow/src/i18n/core/chineseMessages.js | 2 +-
zy-acs-flow/src/page/task/TaskList.jsx | 4 ++--
5 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/zy-acs-flow/src/i18n/core/chineseMessages.js b/zy-acs-flow/src/i18n/core/chineseMessages.js
index d46ee15..e91d51f 100644
--- a/zy-acs-flow/src/i18n/core/chineseMessages.js
+++ b/zy-acs-flow/src/i18n/core/chineseMessages.js
@@ -110,7 +110,7 @@
"Some of your changes weren't saved. Are you sure you want to ignore them?",
},
navigation: {
- no_results: '鏁版嵁涓虹┖',
+ no_results: '娌℃湁鎵惧埌鏁版嵁',
no_more_results:
'The page number %{page} is out of boundaries. Try the previous page.',
page_out_of_boundaries: 'Page number %{page} out of boundaries',
diff --git a/zy-acs-flow/src/page/task/TaskList.jsx b/zy-acs-flow/src/page/task/TaskList.jsx
index 773cf7e..55a2262 100644
--- a/zy-acs-flow/src/page/task/TaskList.jsx
+++ b/zy-acs-flow/src/page/task/TaskList.jsx
@@ -145,7 +145,7 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='task' />
<MyExportButton />
</TopToolbar>
@@ -167,7 +167,7 @@
<TextField source="uuid" label="table.field.task.uuid" />
<TextField source="seqNum" label="table.field.task.seqNum" />
<ReferenceField source="busId" label="table.field.task.busId" reference="bus" link={false} sortable={false}>
- <TextField source="seqNum" />
+ <TextField source="busNo" />
</ReferenceField>
<ReferenceField source="agvId" label="table.field.task.agvId" reference="agv" link={false} sortable={false}>
<TextField source="uuid" />
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java
index 7c46860..262b398 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java
@@ -2,7 +2,9 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.enums.BusStsType;
+import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.BusStsService;
+import com.zy.acs.manager.manager.service.TaskStsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,10 +30,13 @@
@Autowired
private BusStsService busStsService;
+ @Autowired
+ private TaskStsService taskStsService;
@PostConstruct
public void init() {
set(BusStsType.class, field -> busStsService.selectByUuid(field).getId());
+ set(TaskStsType.class, field -> taskStsService.selectByUuid(field).getId());
}
public void set(Class<? extends DataFieldSortFunc> cls, SelectSupport support) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
index dfe4ef1..1c03feb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
@@ -1,15 +1,18 @@
package com.zy.acs.manager.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
-import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.utils.BusinessSortService;
+import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.Task;
+import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,13 +28,19 @@
@Autowired
private TaskService taskService;
+ @Autowired
+ private BusinessSortService businessSortService;
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/task/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
- return R.ok().add(taskService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<Task> wrapper = pageParam.buildWrapper(true);
+ if (hasCreateTimeDesc(pageParam.getOrders())) {
+ wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts"));
+ }
+ return R.ok().add(taskService.page(pageParam, wrapper));
}
@PreAuthorize("hasAuthority('manager:task:list')")
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java
index 4a6556a..f9dd6b4 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java
@@ -2,19 +2,27 @@
import com.zy.acs.framework.common.SpringUtils;
import com.zy.acs.manager.common.exception.BusinessException;
+import com.zy.acs.manager.common.utils.DataFieldSortFunc;
import com.zy.acs.manager.manager.entity.TaskSts;
import com.zy.acs.manager.manager.service.TaskStsService;
-public enum TaskStsType {
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
- INIT,
- WAITING,
- ASSIGN,
- PROGRESS,
- COMPLETE,
+public enum TaskStsType implements DataFieldSortFunc {
+
+ INIT(1),
+ WAITING(2),
+ ASSIGN(3),
+ PROGRESS(4),
+ COMPLETE(5),
;
- TaskStsType() {
+ public int dataSort;
+
+ TaskStsType(int dataSort) {
+ this.dataSort = dataSort;
}
public long val() {
@@ -26,4 +34,12 @@
return taskSts.getId();
}
+ @Override
+ public List<String> getDataFieldSort() {
+ return Arrays.stream(BusStsType.values())
+ .sorted((e1, e2) -> Integer.compare(e1.dataSort, e2.dataSort))
+ .map(Enum::name)
+ .collect(Collectors.toList());
+ }
+
}
--
Gitblit v1.9.1