#

luxiaotao1123

2022-04-02 36ffb38bb1a5bb6c5238b9d272f6787a966ec44b

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.web.BaseController;
@@ -136,12 +137,7 @@

   //------------------日入库明细统计--------------------------------------
   @RequestMapping("/viewWorkInList.action")
   public Map<String,Object> viewWorkInList(@RequestParam(defaultValue = "1")Integer curr,
                                  @RequestParam(defaultValue = "10")Integer limit,
                                  @RequestParam Map<String, Object> param){
      ViewWorkInBean bean = new ViewWorkInBean();
      bean.setPageSize(limit);
      bean.setPageNumber(curr);
   public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
      List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
      int count = reportQueryMapper.getViewWorkInCount(bean);
      Page<ViewWorkInBean> page = new Page<>();
@@ -155,7 +151,10 @@
   @ManagerAuth(memo = "日入库明细统计导出")
   public R viewWorkInExport(@RequestBody JSONObject param){
      List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
      List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(new ViewWorkInBean());
      @SuppressWarnings("unchecked")
      ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
      bean.setQuery_date(bean.getQuery_date());
      List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
      return R.ok(exportSupport(list, fields));
   }

@@ -175,7 +174,10 @@
   @ManagerAuth(memo = "日出库明细统计导出")
   public R viewWorkOutExport(@RequestBody JSONObject param){
      List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
      List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(new ViewWorkInBean());
      @SuppressWarnings("unchecked")
      ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
      bean.setQuery_date(bean.getQuery_date());
      List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(bean);
      return R.ok(exportSupport(list, fields));
   }