From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java | 74 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 28 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 c4bf3c7..8b549ac 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
@@ -11,13 +11,15 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
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;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -31,7 +33,8 @@
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));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -40,9 +43,12 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) AS anfme, unit, fields_index, create_time, update_time");
- wrapper.groupBy("matnr_code, day_time");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ wrapper.select("MIN(id) AS id, day_time, task_type, task_status, " +
+ "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");
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -51,9 +57,12 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) AS anfme, unit, fields_index, create_time, update_time");
- wrapper.groupBy("matnr_code, day_time");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ wrapper.select("MIN(id) AS id, day_time, task_type, task_status, " +
+ "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");
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -62,9 +71,12 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) anfme, unit, fields_index, create_by, update_by, create_time, update_time");
- wrapper.groupBy("matnr_code, day_time, task_type, task_status");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ wrapper.select("MIN(id) AS id, loc_code, day_time, task_type, task_status, barcode, " +
+ "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");
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -73,9 +85,12 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) anfme, unit, fields_index, create_by, update_by, create_time, update_time");
- wrapper.groupBy("matnr_code, day_time, task_type, task_status");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ wrapper.select("MIN(id) AS id, loc_code, day_time, task_type, task_status, barcode, " +
+ "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");
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -84,30 +99,33 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, day_time, COUNT( barcode ) `count`, SUM( anfme ) anfme, COUNT(IF (task_type = 1, 0, NULL)) in_anfme_count, COUNT(IF ( task_type = 101, 0, NULL)) out_anfme_count, SUM(CASE WHEN task_type = 1 THEN)");
- wrapper.groupBy("barcode, day_time");
- return R.ok().add(stockStatisticService.page(pageParam, wrapper));
+ wrapper.select("MIN(id) AS id, day_time, COUNT(barcode) AS `count`, " +
+ "SUM( anfme ) anfme," +
+ "COUNT(IF (task_type = 1, 0, NULL)) in_anfme_count, " +
+ "COUNT(IF ( task_type = 101, 0, NULL)) out_anfme_count, " +
+ "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");
+ PageParam<StockStatistic, BaseParam> page = stockStatisticService.page(pageParam, wrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
-
-
-
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@PostMapping("/stockStatistic/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(stockStatisticService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(stockStatisticService.list()));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@PostMapping({"/stockStatistic/many/{ids}", "/stockStatistics/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(stockStatisticService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(stockStatisticService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@GetMapping("/stockStatistic/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(stockStatisticService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(stockStatisticService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:save')")
@@ -117,7 +135,7 @@
if (!stockStatisticService.save(stockStatistic)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(stockStatistic);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(stockStatistic));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:update')")
@@ -127,7 +145,7 @@
if (!stockStatisticService.updateById(stockStatistic)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(stockStatistic);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(stockStatistic));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:remove')")
@@ -137,7 +155,7 @@
if (!stockStatisticService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@@ -151,13 +169,13 @@
stockStatisticService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@PostMapping("/stockStatistic/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(stockStatisticService.list(), StockStatistic.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(stockStatisticService.list()), StockStatistic.class), response);
}
}
--
Gitblit v1.9.1