1

zhangc

2025-01-17 caa6990da2695a79a8df645b8973f88da3346d93

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

@@ -89,6 +89,26 @@
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setLoc_no(locNo);
      }
      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);
@@ -169,6 +189,9 @@
   @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);
@@ -247,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);