From 0381d8fbcdae3485f6d3b91346e41d9e7aa421bd Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Mon, 3 Mar 2025 10:29:46 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/nl/acs/task/rest/TaskController.java | 4 ----
.../acs/task/service/impl/TaskServiceImpl.java | 18 ++++++++++++------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java
index 4020563..f3c3ea9 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java
@@ -38,10 +38,6 @@ public class TaskController {
@ApiOperation("查询任务")
//@PreAuthorize("@el.check('task:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
-// return new ResponseEntity<>(taskService.queryAllByCache(whereJson, page), HttpStatus.OK);
- if(ObjectUtil.isEmpty(whereJson.get("status"))) {
- whereJson.put("status", "1");
- }
return new ResponseEntity<>(taskService.queryAll(whereJson, page), HttpStatus.OK);
}
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 794b40f..695e0c8 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -203,31 +203,37 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
String status = (String) whereJson.get("status");
String point_code = (String) whereJson.get("point_code");
String is_over = (String) whereJson.get("is_over");
+ String task_type = (String) whereJson.get("task_type");
IPage<Task> queryPage = PageUtil.toMybatisPage(page);
LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
- if (!StrUtil.isEmpty(task_code)) {
+ if (StrUtil.isNotEmpty(task_code)) {
wrapper.eq(Task::getTask_code,task_code);
}
- if (!StrUtil.isEmpty(vehicle_code)) {
+ if (StrUtil.isNotEmpty(vehicle_code)) {
wrapper.eq(Task::getVehicle_code,vehicle_code);
}
- if (!StrUtil.isEmpty(material_type)) {
+ if (StrUtil.isNotEmpty(material_type)) {
wrapper.eq(Task::getMaterial,material_type);
}
- if (!StrUtil.isEmpty(status)) {
+ if (StrUtil.isNotEmpty(status)) {
wrapper.eq(Task::getTask_status,status);
}
- if (!StrUtil.isEmpty(point_code)) {
+ if (StrUtil.isNotEmpty(point_code)) {
wrapper.and(task -> task.like(Task::getStart_point_code,point_code).or().like(Task::getNext_point_code,point_code));
}
- if (!StrUtil.isEmpty(is_over)) {
+ if (StrUtil.isNotEmpty(task_type)) {
+ wrapper.eq(Task::getTask_type, task_type);
+ }
+ if (StrUtil.isNotEmpty(is_over)) {
if (StrUtil.equals(is_over,"1")){
wrapper.ge(Task::getTask_status,2);
}else{
wrapper.lt(Task::getTask_status,2);
}
}
+ wrapper.le(Task::getTask_status, 1);
+ wrapper.orderByDesc(Task::getCreate_time);
IPage<Task> taskPage = taskMapper.selectPage(queryPage,wrapper);
final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(taskPage, TaskDto.class));
return json;