From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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..03433fc 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -6,6 +6,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.CheckReport;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.common.web.BaseController;
@@ -67,6 +68,21 @@
ViewStayTimeBean bean = new ViewStayTimeBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
+ String matnr = String.valueOf(param.get("matnr"));
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+ bean.setMatnr(matnr);
+ }
+
+ String maktx = String.valueOf(param.get("maktx"));
+ if (!Cools.isEmpty(maktx) && !maktx.equals("null")) {
+ bean.setMaktx(maktx);
+ }
+
+ String specs = String.valueOf(param.get("specs"));
+ if (!Cools.isEmpty(specs) && !specs.equals("null")) {
+ bean.setSpecs(specs);
+ }
+
String locNo = String.valueOf(param.get("loc_no"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
bean.setLoc_no(locNo);
@@ -246,4 +262,26 @@
return R.ok(exportSupport(list, fields));
}
+ /***************************鐩樼偣鏃ュ織***************************/
+ @RequestMapping("/checkReport")
+ public Map<String,Object> checkReport(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ Integer pageNumber = Integer.valueOf((String) param.get("pageNumber"));
+ Integer pageSize = Integer.valueOf((String)param.get("pageSize"));
+ param.put("curr",(pageNumber - 1) * pageSize + 1);
+ param.put("limit",pageNumber * pageSize);
+ List<CheckReport> checkReports = reportQueryMapper.selectCheckReport(param);
+ Integer checkReportCount = reportQueryMapper.selectCheckReportCount(param);
+ Page<CheckReport> checkReportPage = new Page<>();
+ checkReportPage.setRecords(checkReports);
+ checkReportPage.setCurrent(curr);
+ checkReportPage.setSize(limit);
+ checkReportPage.setTotal(checkReportCount);
+ return R.ok(checkReportPage);
+ }
+
}
--
Gitblit v1.9.1