From 20bd270fbecc8356a17b1b429eb97abe1a48700e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 09 七月 2025 16:43:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 0e89236..67c619b 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -147,8 +147,8 @@
list = reportQueryMapper.queryViewInOutListYear(bean);
count = reportQueryMapper.getViewInOutCountYear(bean);
}else {
- list = reportQueryMapper.queryViewInOutList(bean);
- count = reportQueryMapper.getViewInOutCount(bean);
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ count = reportQueryMapper.getViewInOutCountDay(bean);
}
// List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
Page<ViewInOutBean> page = new Page<>();
@@ -157,6 +157,62 @@
return R.ok(page);
}
+ @RequestMapping("/viewInOutList/count")
+ public R getAllCount() {
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(99999);
+ bean.setPageNumber(1);
+ List<ViewInOutBean> list = new ArrayList<>();
+ Map<String, Double> map = new HashMap<>();
+ Double in = 0.0;
+ Double out = 0.0;
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ for (ViewInOutBean bean1 : list) {
+ in += bean1.getSto_qty().doubleValue();
+ out += bean1.getRet_qty().doubleValue();
+ }
+ map.put("in", in);
+ map.put("out", out);
+ return R.ok(map);
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/viewInOutList/date/count")
+ public R getCount(@RequestBody Map<String, String> param){
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(99999);
+ bean.setPageNumber(1);
+ if (!Cools.isEmpty(param.get("modi_time"))) {
+ String[] dates = param.get("modi_time").toString().split(RANGE_TIME_LINK);
+ bean.setBegin_date(dates[0]);
+ bean.setEnd_date(dates[1]);
+ }
+ Map<String, Double> map = new HashMap<>();
+ Double in = 0.0;
+ Double out = 0.0;
+ List<ViewInOutBean> list = new ArrayList<>();
+ if (param.get("type") == null || param.get("type").equals(1)) {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ }else if ( param.get("type").equals("2")) {
+ list = reportQueryMapper.queryViewInOutListMonth(bean);
+ } else if (param.get("type").equals("3")) {
+ list = reportQueryMapper.queryViewInOutListYear(bean);
+ }else {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+
+ }
+ for (ViewInOutBean bean1 : list) {
+ in += bean1.getSto_qty().doubleValue();
+ out += bean1.getRet_qty().doubleValue();
+ }
+ map.put("in", in);
+ map.put("out", out);
+ return R.ok(map);
+ }
+
//excel瀵煎嚭
@RequestMapping("/viewInOutExport.action")
@ManagerAuth(memo = "绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻瀵煎嚭")
--
Gitblit v1.9.1