空校验；提高代码的健壮性

zhangc

2025-01-09 a66b19e1c09201a922735c2325ca04df7fe544af

 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,30 @@
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setLoc_no(locNo);
      }
      List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
      int count = reportQueryMapper.getViewStayTimeCount(bean);
      String lev1 = String.valueOf(param.get("lev1"));
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setLev1(Integer.parseInt(lev1));
      }
      String floor = String.valueOf(param.get("floor"));
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setFloor(Integer.parseInt(floor));
      }
      String matnr = String.valueOf(param.get("matnr"));
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setMatnr(matnr);
      }
      String maktx = String.valueOf(param.get("maktx"));
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setMaktx(maktx);
      }
      String locType1 = String.valueOf(param.get("locType1"));
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setMaktx(locType1);
      }
//      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);
@@ -149,11 +189,69 @@
   @RequestMapping("/viewWorkInList.action")
   public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
      List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
      for (ViewWorkInBean viewWorkInBean : list) {
         viewWorkInBean.sype();
      }
      int count = reportQueryMapper.getViewWorkInCount(bean);
      Page<ViewWorkInBean> page = new Page<>();
      page.setRecords(list);
      page.setTotal(count);
      return R.ok(page);
   }

   /**
    * 日入库汇总查询
    * @return
    */
   @RequestMapping("/viewWorkCountInList.action")
   public R viewWorkCountInList(@RequestParam(defaultValue = "1")Integer curr,
                         @RequestParam(defaultValue = "10")Integer limit,
                         @RequestParam Map<String, Object> param){
      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);
      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);
   }

   /**
    * 日出库汇总
    */
   @RequestMapping("/viewWorkCountOutList.action")
   public R viewWorkCountOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
      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);
      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导出
@@ -172,6 +270,9 @@
   @RequestMapping("/viewWorkOutList.action")
   public R viewWorkOutList(ViewWorkInBean bean){
      List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
      for (ViewWorkInBean viewWorkInBean : list) {
         viewWorkInBean.sype();
      }
      int count = reportQueryMapper.getViewWorkOutCount(bean);
      Page<ViewWorkInBean> page = new Page<>();
      page.setRecords(list);