#

whycq

2023-09-05 e9f4a368fd3845a38eb54d3d18d77e96e5767b61

 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);
@@ -164,12 +180,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 +207,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导出
@@ -222,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);
   }

}