From 21c1157a36780fbb21430a67692f20621ebba662 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 26 三月 2025 14:32:54 +0800
Subject: [PATCH] 仓储任务查询
---
src/main/java/com/whyc/service/TaskService.java | 14 ++++++++++++++
src/main/java/com/whyc/service/WmsService.java | 15 +++++++++++++++
src/main/java/com/whyc/controller/InterfaceWmsController.java | 10 ++++++++++
3 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterfaceWmsController.java b/src/main/java/com/whyc/controller/InterfaceWmsController.java
index 20f7ce5..0430db5 100644
--- a/src/main/java/com/whyc/controller/InterfaceWmsController.java
+++ b/src/main/java/com/whyc/controller/InterfaceWmsController.java
@@ -72,4 +72,14 @@
return service.sendTaskStatus(taskDto);
}
+ @GetMapping("task/getFinishedPage")
+ public Response getFinishedPage(@RequestParam int pageNum,@RequestParam int pageSize){
+ return service.getFinishedPage(pageNum,pageSize);
+ }
+
+ @GetMapping("task/getOngoingList")
+ public Response getOngoingList(){
+ return service.getOngoingList();
+ }
+
}
diff --git a/src/main/java/com/whyc/service/TaskService.java b/src/main/java/com/whyc/service/TaskService.java
index ccdff1b..cb4a412 100644
--- a/src/main/java/com/whyc/service/TaskService.java
+++ b/src/main/java/com/whyc/service/TaskService.java
@@ -1,5 +1,6 @@
package com.whyc.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.mapper.TaskMapper;
@@ -7,6 +8,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
@Service
public class TaskService {
@@ -23,4 +25,16 @@
update.eq("task_no",task.getTaskNo());
mapper.update(task,update);
}
+
+ public List<Task> getFinishedList() {
+ QueryWrapper<Task> query = Wrappers.query();
+ query.isNotNull("end_time");
+ return mapper.selectList(query);
+ }
+
+ public List<Task> getOngoingList() {
+ QueryWrapper<Task> query = Wrappers.query();
+ query.isNull("end_time");
+ return mapper.selectList(query);
+ }
}
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index 2958988..d92b03a 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -1,5 +1,7 @@
package com.whyc.service;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.google.gson.reflect.TypeToken;
import com.whyc.dto.*;
import com.whyc.pojo.db_wms.Task;
@@ -156,4 +158,17 @@
return new Response().setII(1,"涓婃姤鐘舵�佸畬鎴�");
}
+
+ public Response getFinishedPage(int pageNum, int pageSize) {
+ PageHelper helper = new PageHelper();
+ helper.startPage(pageNum,pageSize);
+ List<Task> tasks = taskService.getFinishedList();
+ PageInfo<Task> pageInfo = new PageInfo<>(tasks);
+ return new Response().set(1,pageInfo);
+ }
+
+ public Response getOngoingList() {
+ List<Task> taskList = taskService.getOngoingList();
+ return new Response().set(1,taskList);
+ }
}
--
Gitblit v1.9.1