From d3234825d804a6a205dba1c6092acc8e29981b81 Mon Sep 17 00:00:00 2001
From: lfd <1>
Date: 星期四, 06 三月 2025 10:11:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index f2ecc1e..dca90f8 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -79,12 +79,36 @@
return R.ok(page);
}
- // 瀵煎嚭
+// // 瀵煎嚭
+// @RequestMapping(value = "/viewStayTimeExport.action")
+// @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
+// public R viewStayTimeExport(@RequestBody JSONObject param){
+// List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+// List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+// return R.ok(exportSupport(list, fields));
+// }
+// 瀵煎嚭
@RequestMapping(value = "/viewStayTimeExport.action")
@ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
- public R viewStayTimeExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ public R viewStayTimeExport(){
+ // List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ // List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+ // return R.ok(exportSupport(list, fields));
+
+ // 浠庢暟鎹簱鑾峰彇鎵�鏈� ViewStayTimeBean 鍒楄〃
List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+
+ // 鑾峰彇闇�瑕佸鍑虹殑瀛楁锛堜緥濡傦紝鍙互纭紪鐮佹垨浠庡叾浠栨潵婧愬畾涔夛級
+ List<String> fields = new ArrayList<>(); // 鏍规嵁瀹為檯瀛楁璁剧疆
+ fields.add("Begin_date");
+ fields.add("Stay_time");
+ fields.add("Loc_no");
+ fields.add("anfme");
+ fields.add("matnr");
+ fields.add("maktx");
+ fields.add("specs");
+
+ // 璋冪敤瀵煎嚭鏀寔鏂规硶
return R.ok(exportSupport(list, fields));
}
@@ -164,12 +188,24 @@
public R viewWorkCountInList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
- List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")));
- Integer total = reportQueryMapper.selectWorkCountInTotal();
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime= split[0].split(" ")[0].replace("-",".");
+ endTime = split[1].split(" ")[0].replace("-",".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
+ Integer total = reportQueryMapper.selectWorkCountInTotal((String) param.get("matnr"), startTime,endTime);
Page<ViewWorkCountInView> page = new Page<>();
page.setRecords(allCountIn);
page.setTotal(total);
- return R.ok(page);
+ Integer sum = reportQueryMapper.selectWorkCountInSum((String) param.get("matnr"), startTime,endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page",page);
+ result.put("sum",sum);
+ return R.ok(result);
}
/**
@@ -179,12 +215,24 @@
public R viewWorkCountOutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
- List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")));
- Integer total = reportQueryMapper.selectWorkCountOutTotal();
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime= split[0].split(" ")[0].replace("-",".");
+ endTime = split[1].split(" ")[0].replace("-",".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
+ Integer total = reportQueryMapper.selectWorkCountOutTotal((String) param.get("matnr"), startTime,endTime);
Page<ViewWorkCountInView> page = new Page<>();
page.setRecords(allCountIn);
page.setTotal(total);
- return R.ok(page);
+ Integer sum = reportQueryMapper.selectWorkCountOutSum((String) param.get("matnr"), startTime,endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page",page);
+ result.put("sum",sum);
+ return R.ok(result);
}
//excel瀵煎嚭
--
Gitblit v1.9.1