From 611a816801c58abcc81d511a7dfc368f8d8fb24e Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 22 十一月 2024 14:16:59 +0800
Subject: [PATCH] 修改定时任务触发方式，不是以固定时间执行，以执行完成任务，间隔多少时间在此执行
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index cd42ffc..9e69514 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -39,11 +39,29 @@
public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
+
ViewStockUseBean bean = new ViewStockUseBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
- List<ViewStockUseBean> list= reportQueryMapper.queryViewStockUseList(bean);
- int count = reportQueryMapper.getViewStockUseCount(bean);
+
+ List<ViewStockUseBean> list = new ArrayList<>();
+ int count = 0;
+
+ if(Cools.isEmpty(param.get("locType"))){
+ param.put("locType","asr_loc");
+ }
+
+ if("agv_loc_1".equals(param.get("locType").toString())){
+ list = reportQueryMapper.queryViewStockUse1List(bean);
+ count = reportQueryMapper.getViewStockUse1Count(bean);
+ }else if("agv_loc_3".equals(param.get("locType").toString())){
+ list = reportQueryMapper.queryViewStockUse3List(bean);
+ count = reportQueryMapper.getViewStockUse3Count(bean);
+ }else {
+ list = reportQueryMapper.queryViewStockUseList(bean);
+ count = reportQueryMapper.getViewStockUseCount(bean);
+ }
+
Page<ViewStockUseBean> page = new Page<>();
page.setRecords(list);
page.setTotal(count);
@@ -71,8 +89,10 @@
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
bean.setLoc_no(locNo);
}
- List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
- int count = reportQueryMapper.getViewStayTimeCount(bean);
+// List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
+// int count = reportQueryMapper.getViewStayTimeCount(bean);
+ List<ViewStayTimeBean> list = reportQueryMapper.queryAllViewStayTimeList(bean);
+ int count = reportQueryMapper.getAllViewStayTimeCount(bean);
Page<ViewStayTimeBean> page = new Page<>();
page.setRecords(list);
page.setTotal(count);
@@ -149,6 +169,9 @@
@RequestMapping("/viewWorkInList.action")
public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
+ for (ViewWorkInBean viewWorkInBean : list) {
+ viewWorkInBean.sype();
+ }
int count = reportQueryMapper.getViewWorkInCount(bean);
Page<ViewWorkInBean> page = new Page<>();
page.setRecords(list);
@@ -227,6 +250,9 @@
@RequestMapping("/viewWorkOutList.action")
public R viewWorkOutList(ViewWorkInBean bean){
List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
+ for (ViewWorkInBean viewWorkInBean : list) {
+ viewWorkInBean.sype();
+ }
int count = reportQueryMapper.getViewWorkOutCount(bean);
Page<ViewWorkInBean> page = new Page<>();
page.setRecords(list);
--
Gitblit v1.9.1