From 523365960513f297024a419f94b2b42eccd9456f Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 11:21:41 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java
index 67ea781..50db009 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.entity.StockStatistic;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.StockStatisticService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -32,7 +33,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
- return R.ok().add(stockStatisticService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, pageParam.buildWrapper(true));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -45,7 +48,9 @@
"MAX(maktx) AS maktx, matnr_code, MAX(batch) AS batch, " +
"SUM(anfme) AS anfme, MAX(unit) AS unit");
wrapper.groupBy("day_time, task_type, task_status, matnr_code");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -58,7 +63,9 @@
"MAX(maktx) AS maktx, matnr_code, MAX(batch) AS batch, " +
"SUM(anfme) AS anfme, MAX(unit) AS unit");
wrapper.groupBy("day_time, task_type, task_status, matnr_code");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -71,7 +78,9 @@
"MAX(maktx) AS maktx, matnr_code, MAX(batch) AS batch, SUM(anfme) AS anfme, " +
"MAX(unit) AS unit, create_by, update_by, create_time, update_time");
wrapper.groupBy("loc_code, day_time, task_type, task_status, barcode, matnr_code, create_by, update_by, create_time, update_time");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -84,7 +93,9 @@
"MAX(maktx) AS maktx, matnr_code, MAX(batch) AS batch, SUM(anfme) AS anfme, " +
"MAX(unit) AS unit, create_by, update_by, create_time, update_time");
wrapper.groupBy("loc_code, day_time, task_type, task_status, barcode, matnr_code, create_by, update_by, create_time, update_time");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -100,7 +111,9 @@
"SUM( CASE WHEN task_type = 1 THEN anfme ELSE 0 END ) in_anfme," +
"SUM( CASE WHEN task_type = 101 THEN anfme ELSE 0 END ) out_anfme");
wrapper.in("task_type", Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type)).groupBy("day_time");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
--
Gitblit v1.9.1