#

luxiaotao1123

2022-04-20 ba23215ffc30d61bc2b7bb560678f5e25aeec1a8

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

@@ -2,13 +2,18 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.HashMap;
@@ -24,6 +29,8 @@
@RequestMapping("/report")
public class ReportQueryController extends BaseController {

   @Autowired
   private LocDetlService locDetlService;
   @Autowired
   private ReportQueryMapper reportQueryMapper;

@@ -60,6 +67,7 @@
      ViewStayTimeBean bean = new ViewStayTimeBean();
      bean.setPageSize(limit);
      bean.setPageNumber(curr);
      bean.setLoc_no(String.valueOf(param.get("loc_no")));
      List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
      int count = reportQueryMapper.getViewStayTimeCount(bean);
      Page<ViewStayTimeBean> page = new Page<>();
@@ -136,12 +144,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 +158,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 +181,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));
   }