1.添加查询汇总记录详情接口

src/main/java/com/glxp/api/controller/inout/IoStatDataController.java

@@ -3,12 +3,10 @@ package com.glxp.api.controller.inout;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
-import com.glxp.api.entity.inout.IoStatOrderEntity;
+import com.glxp.api.entity.inout.*;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 import com.glxp.api.req.inout.FilterStatDataRequest;
-import com.glxp.api.service.inout.IoStatDayService;
+import com.glxp.api.service.inout.*;
-import com.glxp.api.service.inout.IoStatMonthService;
-import com.glxp.api.service.inout.IoStatOrderService;
-import com.glxp.api.service.inout.IoStatYearService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +28,8 @@ public class IoStatDataController {
     @Resource
     private IoStatMonthService statMonthService;
     @Resource
+    private IoStatQuarterService statQuarterService;
+    @Resource
     private IoStatYearService statYearService;
 
     /**
@@ -45,4 +45,56 @@ public class IoStatDataController {
         return ResultVOUtils.page(pageInfo);
     }
 
+    /**
+     * 查询日汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/stat/detail/day/filter")
+    public BaseResponse filterDayList(FilterStatDataDetailRequest statDataDetailRequest) {
+        List<IoStatDayEntity> list = statDayService.filterList(statDataDetailRequest);
+        PageInfo<IoStatDayEntity> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+    /**
+     * 查询月汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/detail/month/filter")
+    public BaseResponse filterMonthList(FilterStatDataDetailRequest statDataDetailRequest) {
+        List<IoStatMonthEntity> list = statMonthService.filterList(statDataDetailRequest);
+        PageInfo<IoStatMonthEntity> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+    /**
+     * 查询季度汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/detail/quarter/filter")
+    public BaseResponse filterQuarterList(FilterStatDataDetailRequest statDataDetailRequest) {
+        List<IoStatQuarterEntity> list = statQuarterService.filterList(statDataDetailRequest);
+        PageInfo<IoStatQuarterEntity> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+    /**
+     * 查询月汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/detail/year/filter")
+    public BaseResponse filterYearList(FilterStatDataDetailRequest statDataDetailRequest) {
+        List<IoStatYearEntity> list = statYearService.filterList(statDataDetailRequest);
+        PageInfo<IoStatYearEntity> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
 }

src/main/java/com/glxp/api/dao/inout/IoStatDayDao.java

@@ -2,6 +2,20 @@ package com.glxp.api.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inout.IoStatDayEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 
+import java.util.List;
+
+/**
+ * 日汇总数据Dao
+ */
 public interface IoStatDayDao extends BaseMapper<IoStatDayEntity> {
+
+    /**
+     * 查询日汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    List<IoStatDayEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest);
 }

src/main/java/com/glxp/api/dao/inout/IoStatMonthDao.java

@@ -2,6 +2,20 @@ package com.glxp.api.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inout.IoStatMonthEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 
+import java.util.List;
+
+/**
+ * 月度汇总数据Dao
+ */
 public interface IoStatMonthDao extends BaseMapper<IoStatMonthEntity> {
+
+    /**
+     * 查询月汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    List<IoStatMonthEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest);
 }

src/main/java/com/glxp/api/dao/inout/IoStatQuarterDao.java

@@ -2,6 +2,20 @@ package com.glxp.api.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inout.IoStatQuarterEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 
+import java.util.List;
+
+/**
+ * 季度汇总数据Dao
+ */
 public interface IoStatQuarterDao extends BaseMapper<IoStatQuarterEntity> {
+
+    /**
+     * 查询季度汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    List<IoStatQuarterEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest);
 }

src/main/java/com/glxp/api/dao/inout/IoStatYearDao.java

@@ -2,6 +2,20 @@ package com.glxp.api.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inout.IoStatYearEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 
+import java.util.List;
+
+/**
+ * 年汇总数据Dao
+ */
 public interface IoStatYearDao extends BaseMapper<IoStatYearEntity> {
+
+    /**
+     * 查询年度汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    List<IoStatYearEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest);
 }

src/main/java/com/glxp/api/service/inout/IoStatDayService.java

@@ -1,6 +1,10 @@
 package com.glxp.api.service.inout;
 
+import com.glxp.api.entity.inout.IoStatDayEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * 物资出入库汇总 - 天 Service
@@ -13,4 +17,12 @@ public interface IoStatDayService {
      * @param date
      */
     void statData(Date date);
+
+    /**
+     * 查询日汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    List<IoStatDayEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest);
 }

src/main/java/com/glxp/api/service/inout/IoStatMonthService.java

@@ -1,6 +1,10 @@
 package com.glxp.api.service.inout;
 
+import com.glxp.api.entity.inout.IoStatMonthEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * 物资出入库汇总 - 月 Service
@@ -14,4 +18,11 @@ public interface IoStatMonthService {
      */
     void statData(Date date);
 
+    /**
+     * 查询月汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    List<IoStatMonthEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest);
 }

src/main/java/com/glxp/api/service/inout/IoStatQuarterService.java

@@ -1,6 +1,10 @@
 package com.glxp.api.service.inout;
 
+import com.glxp.api.entity.inout.IoStatQuarterEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * 物资出入库汇总 - 季度 Service
@@ -14,4 +18,12 @@ public interface IoStatQuarterService {
      */
     void statData(Date date);
 
+    /**
+     * 查询季度汇总数据
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    List<IoStatQuarterEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest);
+
 }

src/main/java/com/glxp/api/service/inout/IoStatYearService.java

@@ -1,6 +1,10 @@
 package com.glxp.api.service.inout;
 
+import com.glxp.api.entity.inout.IoStatYearEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * 物资出入库汇总 - 年 Service
@@ -14,4 +18,11 @@ public interface IoStatYearService {
      */
     void statData(Date date);
 
+    /**
+     * 查询年度数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    List<IoStatYearEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest);
 }

src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.inout.IoOrderDetailResultDao;
@@ -14,6 +15,7 @@ import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inout.IoStatDayEntity;
 import com.glxp.api.entity.inout.IoStatOrderEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 import com.glxp.api.service.inout.IoStatDayService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
@@ -28,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -113,6 +116,17 @@ public class IoStatDayServiceImpl implements IoStatDayService {
         }
     }
 
+    @Override
+    public List<IoStatDayEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest) {
+        if (null == statDataDetailRequest) {
+            return Collections.emptyList();
+        }
+        if (null != statDataDetailRequest.getPage() && null != statDataDetailRequest.getLimit()) {
+            PageHelper.offsetPage((statDataDetailRequest.getPage() - 1) * statDataDetailRequest.getLimit(), statDataDetailRequest.getLimit());
+        }
+        return statDayDao.filterList(statDataDetailRequest);
+    }
+
     /**
      * 获取统计数据
      *

src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java

@@ -6,12 +6,14 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoStatDayDao;
 import com.glxp.api.dao.inout.IoStatMonthDao;
 import com.glxp.api.dao.inout.IoStatOrderDao;
 import com.glxp.api.entity.inout.IoStatDayEntity;
 import com.glxp.api.entity.inout.IoStatMonthEntity;
 import com.glxp.api.entity.inout.IoStatOrderEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 import com.glxp.api.service.inout.IoStatMonthService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
@@ -25,9 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
 
 @Slf4j
 @Service
@@ -83,6 +83,17 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
         }
     }
 
+    @Override
+    public List<IoStatMonthEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest) {
+        if (null == statDataDetailRequest) {
+            return Collections.emptyList();
+        }
+        if (null != statDataDetailRequest.getPage() && null != statDataDetailRequest.getLimit()) {
+            PageHelper.offsetPage((statDataDetailRequest.getPage() - 1) * statDataDetailRequest.getLimit(), statDataDetailRequest.getLimit());
+        }
+        return statMonthDao.filterList(statDataDetailRequest);
+    }
+
     /**
      * 保存月汇总数据记录到数据库
      *

src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java

@@ -5,12 +5,14 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoStatMonthDao;
 import com.glxp.api.dao.inout.IoStatOrderDao;
 import com.glxp.api.dao.inout.IoStatQuarterDao;
 import com.glxp.api.entity.inout.IoStatMonthEntity;
 import com.glxp.api.entity.inout.IoStatOrderEntity;
 import com.glxp.api.entity.inout.IoStatQuarterEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 import com.glxp.api.service.inout.IoStatQuarterService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
@@ -24,10 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 @Slf4j
 @Service
@@ -79,6 +78,17 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
 
     }
 
+    @Override
+    public List<IoStatQuarterEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest) {
+        if (null == statDataDetailRequest) {
+            return Collections.emptyList();
+        }
+        if (null == statDataDetailRequest.getPage() && null == statDataDetailRequest.getLimit()) {
+            PageHelper.offsetPage((statDataDetailRequest.getPage() - 1) * statDataDetailRequest.getLimit(), statDataDetailRequest.getLimit());
+        }
+        return statQuarterDao.filterList(statDataDetailRequest);
+    }
+
     /**
      * 插入汇总数据
      *

src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java

@@ -5,12 +5,14 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoStatOrderDao;
 import com.glxp.api.dao.inout.IoStatQuarterDao;
 import com.glxp.api.dao.inout.IoStatYearDao;
 import com.glxp.api.entity.inout.IoStatOrderEntity;
 import com.glxp.api.entity.inout.IoStatQuarterEntity;
 import com.glxp.api.entity.inout.IoStatYearEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 import com.glxp.api.service.inout.IoStatYearService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
@@ -25,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -78,6 +81,17 @@ public class IoStatYearServiceImpl implements IoStatYearService {
 
     }
 
+    @Override
+    public List<IoStatYearEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest) {
+        if (null == statDataDetailRequest) {
+            return Collections.emptyList();
+        }
+        if (null == statDataDetailRequest.getPage() && null == statDataDetailRequest.getLimit()) {
+            PageHelper.offsetPage((statDataDetailRequest.getPage() - 1) * statDataDetailRequest.getLimit(), statDataDetailRequest.getLimit());
+        }
+        return statYearDao.filterList(statDataDetailRequest);
+    }
+
     /**
      * 插入汇总数据
      *

src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml

@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoStatDayDao">
+    <select id="filterList" resultType="com.glxp.api.entity.inout.IoStatDayEntity">
+        select *
+        from io_stat_day
+        <where>
+            <if test="recordKey != null and recordKey != ''">
+                AND recordKeyFk = #{recordKey}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="productName != null and productName != ''">
+                AND productName like concat('%', #{productName}, '%')
+            </if>
+        </where>
+    </select>
 
 </mapper>

src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoStatMonthDao">
+    <select id="filterList" resultType="com.glxp.api.entity.inout.IoStatMonthEntity">
+        select *
+        from io_stat_month
+        <where>
+            <if test="recordKey != null and recordKey != ''">
+                AND recordKeyFk = #{recordKey}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="productName != null and productName != ''">
+                AND productName like concat('%', #{productName}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoStatQuarterDao">
+    <select id="filterList" resultType="com.glxp.api.entity.inout.IoStatQuarterEntity">
+        select *
+        from io_stat_quarter
+        <where>
+            <if test="recordKey != null and recordKey != ''">
+                AND recordKeyFk = #{recordKey}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="productName != null and productName != ''">
+                AND productName like concat('%', #{productName}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoStatYearDao">
+    <select id="filterList" resultType="com.glxp.api.entity.inout.IoStatYearEntity">
+        select *
+        from io_stat_year
+        <where>
+            <if test="recordKey != null and recordKey != ''">
+                AND recordKeyFk = #{recordKey}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="productName != null and productName != ''">
+                AND productName like concat('%', #{productName}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>