src/main/java/com/whyc/controller/InterfaceWmsController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/TaskService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WmsService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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(); } } 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); } } 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); } }