1

ZY

2024-10-29 52f2306fe8e8f0760b32f33371adf4037e031bcf

 src/main/java/com/zy/asrs/controller/ReportQueryController.java

@@ -39,11 +39,29 @@
   public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
                                @RequestParam(defaultValue = "10")Integer limit,
                                @RequestParam Map<String, Object> param){

      ViewStockUseBean bean = new ViewStockUseBean();
      bean.setPageSize(limit);
      bean.setPageNumber(curr);
      List<ViewStockUseBean> list= reportQueryMapper.queryViewStockUseList(bean);
      int count = reportQueryMapper.getViewStockUseCount(bean);

      List<ViewStockUseBean> list = new ArrayList<>();
      int count = 0;

      if(Cools.isEmpty(param.get("locType"))){
         param.put("locType","asr_loc");
      }

      if("agv_loc_1".equals(param.get("locType").toString())){
         list = reportQueryMapper.queryViewStockUse1List(bean);
         count = reportQueryMapper.getViewStockUse1Count(bean);
      }else if("agv_loc_3".equals(param.get("locType").toString())){
         list = reportQueryMapper.queryViewStockUse3List(bean);
         count = reportQueryMapper.getViewStockUse3Count(bean);
      }else {
         list = reportQueryMapper.queryViewStockUseList(bean);
         count = reportQueryMapper.getViewStockUseCount(bean);
      }

      Page<ViewStockUseBean> page = new Page<>();
      page.setRecords(list);
      page.setTotal(count);
@@ -71,8 +89,10 @@
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setLoc_no(locNo);
      }
      List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
      int count = reportQueryMapper.getViewStayTimeCount(bean);
//      List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
//      int count = reportQueryMapper.getViewStayTimeCount(bean);
      List<ViewStayTimeBean> list = reportQueryMapper.queryAllViewStayTimeList(bean);
      int count = reportQueryMapper.getAllViewStayTimeCount(bean);
      Page<ViewStayTimeBean> page = new Page<>();
      page.setRecords(list);
      page.setTotal(count);