diff --git a/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java b/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java index 79046c8f7..0c613d1ac 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java +++ b/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.IoStatMonthService; -import com.glxp.api.service.inout.IoStatOrderService; -import com.glxp.api.service.inout.IoStatYearService; +import com.glxp.api.service.inout.*; 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 list = statDayService.filterList(statDataDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 查询月汇总数据列表 + * + * @param statDataDetailRequest + * @return + */ + @GetMapping("/udiwms/inout/detail/month/filter") + public BaseResponse filterMonthList(FilterStatDataDetailRequest statDataDetailRequest) { + List list = statMonthService.filterList(statDataDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 查询季度汇总数据列表 + * + * @param statDataDetailRequest + * @return + */ + @GetMapping("/udiwms/inout/detail/quarter/filter") + public BaseResponse filterQuarterList(FilterStatDataDetailRequest statDataDetailRequest) { + List list = statQuarterService.filterList(statDataDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 查询月汇总数据列表 + * + * @param statDataDetailRequest + * @return + */ + @GetMapping("/udiwms/inout/detail/year/filter") + public BaseResponse filterYearList(FilterStatDataDetailRequest statDataDetailRequest) { + List list = statYearService.filterList(statDataDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + } diff --git a/src/main/java/com/glxp/api/dao/inout/IoStatDayDao.java b/src/main/java/com/glxp/api/dao/inout/IoStatDayDao.java index bcc0657b1..d03fbd7e0 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoStatDayDao.java +++ b/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 { + + /** + * 查询日汇总数据列表 + * + * @param statDataDetailRequest + * @return + */ + List filterList(FilterStatDataDetailRequest statDataDetailRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inout/IoStatMonthDao.java b/src/main/java/com/glxp/api/dao/inout/IoStatMonthDao.java index 183d674e6..019141375 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoStatMonthDao.java +++ b/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 { + + /** + * 查询月汇总数据列表 + * + * @param statDataDetailRequest + * @return + */ + List filterList(FilterStatDataDetailRequest statDataDetailRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inout/IoStatQuarterDao.java b/src/main/java/com/glxp/api/dao/inout/IoStatQuarterDao.java index 4da6f23c3..baba1db4a 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoStatQuarterDao.java +++ b/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 { + + /** + * 查询季度汇总数据列表 + * + * @param statDataDetailRequest + * @return + */ + List filterList(FilterStatDataDetailRequest statDataDetailRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inout/IoStatYearDao.java b/src/main/java/com/glxp/api/dao/inout/IoStatYearDao.java index 827373e5b..222a86ac8 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoStatYearDao.java +++ b/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 { + + /** + * 查询年度汇总数据列表 + * + * @param statDataDetailRequest + * @return + */ + List filterList(FilterStatDataDetailRequest statDataDetailRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/service/inout/IoStatDayService.java b/src/main/java/com/glxp/api/service/inout/IoStatDayService.java index a3198aadf..8d2ea9e4b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatDayService.java +++ b/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 filterList(FilterStatDataDetailRequest statDataDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/IoStatMonthService.java b/src/main/java/com/glxp/api/service/inout/IoStatMonthService.java index 65b7629a0..fd5721407 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatMonthService.java +++ b/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 filterList(FilterStatDataDetailRequest statDataDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/IoStatQuarterService.java b/src/main/java/com/glxp/api/service/inout/IoStatQuarterService.java index 9ef46bf65..9239c55ba 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatQuarterService.java +++ b/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 filterList(FilterStatDataDetailRequest statDataDetailRequest); + } diff --git a/src/main/java/com/glxp/api/service/inout/IoStatYearService.java b/src/main/java/com/glxp/api/service/inout/IoStatYearService.java index 8fe2083e5..71a614ad5 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatYearService.java +++ b/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 filterList(FilterStatDataDetailRequest statDataDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java index 0a8e2e2d4..bb0b491eb 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java +++ b/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 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); + } + /** * 获取统计数据 * diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java index a6af1c9da..01c50634c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java +++ b/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.Date; -import java.util.List; +import java.util.*; @Slf4j @Service @@ -83,6 +83,17 @@ public class IoStatMonthServiceImpl implements IoStatMonthService { } } + @Override + public List 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); + } + /** * 保存月汇总数据记录到数据库 * diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java index 6a54c5a22..7753e23c8 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java +++ b/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.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; @Slf4j @Service @@ -79,6 +78,17 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { } + @Override + public List 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); + } + /** * 插入汇总数据 * diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java index 94a6e81dc..d7ba6f10f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java +++ b/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 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); + } + /** * 插入汇总数据 * diff --git a/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml index c4a561845..05dbbc973 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml @@ -1,5 +1,20 @@ + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml index 8becbedf8..92d228fc4 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml @@ -1,4 +1,19 @@ + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml index 362d9eca5..f9dea29e0 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml @@ -1,4 +1,19 @@ + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml index 7d142a125..32aac7cef 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml @@ -1,4 +1,19 @@ + \ No newline at end of file