diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexController.java index e770e1b..de86dc5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexController.java @@ -6,6 +6,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.index.domain.ViewIndexJob; import com.ruoyi.index.mapper.ViewIndexJobMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -52,30 +54,33 @@ public class IndexController extends BaseController { /** * 查询单据状态统计 */ - @PreAuthorize("@ss.hasPermi('index:bill:list')") + //@PreAuthorize("@ss.hasPermi('index:bill:list')") + @Anonymous @GetMapping("/bill/status") public AjaxResult getBillStatusCount() { - List list = billStatusCountService.selectAllBillStatusCount(); + List list = billStatusCountService.selectAllBillStatusCount(new BaseEntity()); return success(list); } /** * 查询各状态货位数量 */ - @PreAuthorize("@ss.hasPermi('index:cargospace:list')") + //@PreAuthorize("@ss.hasPermi('index:cargospace:list')") + @Anonymous @GetMapping("/cargospace/count") public AjaxResult getCargoSpaceCount() { - CargoSpaceCount cargoSpaceCount = cargoSpaceCountService.selectStatusCount(); + CargoSpaceCount cargoSpaceCount = cargoSpaceCountService.selectStatusCount(new BaseEntity()); return success(cargoSpaceCount); } /** * 查询已完成单据数量统计 */ - @PreAuthorize("@ss.hasPermi('index:count:list')") + //@PreAuthorize("@ss.hasPermi('index:count:list')") + @Anonymous @GetMapping("/finishCount") public AjaxResult getFinishCount() { - IndexCount indexCount = indexCountService.selectFinishCount(); + IndexCount indexCount = indexCountService.selectFinishCount(new BaseEntity()); return success(indexCount); } @@ -86,9 +91,10 @@ public class IndexController extends BaseController { /** * 获取任务状态统计 */ + @Anonymous @GetMapping("/job/status") public AjaxResult getJobStatusCount() { - List allJobs = viewIndexJobMapper.selectViewIndexJobByStatus(null); + List allJobs = viewIndexJobMapper.selectViewIndexJobByStatus(new BaseEntity()); Map> result = new HashMap<>(); result.put("status2", allJobs.stream().filter(job -> "2".equals(job.getStatus())).collect(Collectors.toList())); result.put("status3", allJobs.stream().filter(job -> "3".equals(job.getStatus())).collect(Collectors.toList())); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/controller/WeekJobCountController.java b/ruoyi-admin/src/main/java/com/ruoyi/index/controller/WeekJobCountController.java index 72382d1..ebddfde 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/controller/WeekJobCountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/controller/WeekJobCountController.java @@ -1,5 +1,7 @@ package com.ruoyi.index.controller; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.BaseEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,10 +27,11 @@ public class WeekJobCountController /** * 获取近一周的入库和出库作业数量统计 */ + @Anonymous @GetMapping("/count") public AjaxResult getWeekJobCount() { - WeekJobCount weekJobCount = weekJobCountService.getWeekJobCount(); + WeekJobCount weekJobCount = weekJobCountService.getWeekJobCount(new BaseEntity()); return AjaxResult.success(weekJobCount); } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/domain/BillStatusCount.java b/ruoyi-admin/src/main/java/com/ruoyi/index/domain/BillStatusCount.java index 21da387..40c2785 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/domain/BillStatusCount.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/domain/BillStatusCount.java @@ -1,12 +1,13 @@ package com.ruoyi.index.domain; +import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; /** * 单据状态统计对象 */ @Data -public class BillStatusCount { +public class BillStatusCount extends BaseEntity { /** 单据ID */ private String id; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/BillStatusCountMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/BillStatusCountMapper.java index a3ed2db..e10d402 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/BillStatusCountMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/BillStatusCountMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.index.mapper; import java.util.List; + +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.index.domain.BillStatusCount; /** @@ -12,19 +14,19 @@ public interface BillStatusCountMapper { * * @return 入库单据状态统计列表 */ - public List selectStockinStatusCount(); + public List selectStockinStatusCount(BaseEntity baseEntity); /** * 查询出库单据状态统计 * * @return 出库单据状态统计列表 */ - public List selectStockoutStatusCount(); + public List selectStockoutStatusCount(BaseEntity baseEntity); /** * 查询盘点单据状态统计 * * @return 盘点单据状态统计列表 */ - public List selectStockcheckStatusCount(); + public List selectStockcheckStatusCount(BaseEntity baseEntity); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/CargoSpaceCountMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/CargoSpaceCountMapper.java index 4c05686..21acb6b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/CargoSpaceCountMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/CargoSpaceCountMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.index.mapper; +import com.ruoyi.common.core.domain.BaseEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -15,5 +16,5 @@ public interface CargoSpaceCountMapper { * * @return 各状态货位数量列表 */ - public List> selectStatusCount(); + public List> selectStatusCount(BaseEntity baseEntity); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/IndexCountMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/IndexCountMapper.java index 8815c5b..f330db6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/IndexCountMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/IndexCountMapper.java @@ -1,5 +1,7 @@ package com.ruoyi.index.mapper; +import com.ruoyi.common.core.domain.BaseEntity; + /** * 首页统计信息Mapper接口 * @@ -13,19 +15,19 @@ public interface IndexCountMapper * * @return 入库单数量 */ - public Integer selectStockinFinishCount(); + public Integer selectStockinFinishCount(BaseEntity baseEntity); /** * 查询已完成出库单数量 * * @return 出库单数量 */ - public Integer selectStockoutFinishCount(); + public Integer selectStockoutFinishCount(BaseEntity baseEntity); /** * 查询已完成盘点单数量 * * @return 盘点单数量 */ - public Integer selectStockcheckFinishCount(); + public Integer selectStockcheckFinishCount(BaseEntity baseEntity); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/ViewIndexJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/ViewIndexJobMapper.java index fdf94fb..d9b522c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/ViewIndexJobMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/ViewIndexJobMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.index.mapper; import java.util.List; + +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.index.domain.ViewIndexJob; /** @@ -13,5 +15,5 @@ public interface ViewIndexJobMapper { * @param status 任务状态 * @return 任务列表 */ - public List selectViewIndexJobByStatus(String status); + public List selectViewIndexJobByStatus(BaseEntity baseEntity); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/WeekJobCountMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/WeekJobCountMapper.java index 26f7b18..9ef838c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/WeekJobCountMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/mapper/WeekJobCountMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.index.mapper; import java.util.List; + +import com.ruoyi.common.core.domain.BaseEntity; import org.apache.ibatis.annotations.Param; /** @@ -18,7 +20,7 @@ public interface WeekJobCountMapper * @param endDate 结束日期 * @return 每天的入库作业数量列表 */ - public List selectInJobCounts(@Param("startDate") String startDate, @Param("endDate") String endDate); + public List selectInJobCounts(@Param("startDate") String startDate, @Param("endDate") String endDate, BaseEntity baseEntity); /** * 查询指定日期范围内每天的出库作业数量 @@ -27,5 +29,5 @@ public interface WeekJobCountMapper * @param endDate 结束日期 * @return 每天的出库作业数量列表 */ - public List selectOutJobCounts(@Param("startDate") String startDate, @Param("endDate") String endDate); + public List selectOutJobCounts(@Param("startDate") String startDate, @Param("endDate") String endDate,BaseEntity baseEntity); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/IBillStatusCountService.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/IBillStatusCountService.java index 8e0b2fd..7a982a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/IBillStatusCountService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/IBillStatusCountService.java @@ -1,6 +1,8 @@ package com.ruoyi.index.service; import java.util.List; + +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.index.domain.BillStatusCount; /** @@ -12,5 +14,5 @@ public interface IBillStatusCountService { * * @return 单据状态统计列表 */ - public List selectAllBillStatusCount(); + public List selectAllBillStatusCount(BaseEntity baseEntity); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/ICargoSpaceCountService.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/ICargoSpaceCountService.java index 85dd02c..f8c6a99 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/ICargoSpaceCountService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/ICargoSpaceCountService.java @@ -1,5 +1,6 @@ package com.ruoyi.index.service; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.index.domain.CargoSpaceCount; /** @@ -11,5 +12,5 @@ public interface ICargoSpaceCountService { * * @return 货位状态统计对象 */ - public CargoSpaceCount selectStatusCount(); + public CargoSpaceCount selectStatusCount(BaseEntity baseEntity); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/IIndexCountService.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/IIndexCountService.java index f17185b..5ab5286 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/IIndexCountService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/IIndexCountService.java @@ -1,5 +1,6 @@ package com.ruoyi.index.service; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.index.domain.IndexCount; /** @@ -15,5 +16,5 @@ public interface IIndexCountService * * @return 统计结果 */ - public IndexCount selectFinishCount(); + public IndexCount selectFinishCount(BaseEntity baseEntity); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/IWeekJobCountService.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/IWeekJobCountService.java index b703b43..5e32048 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/IWeekJobCountService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/IWeekJobCountService.java @@ -1,5 +1,6 @@ package com.ruoyi.index.service; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.index.domain.WeekJobCount; /** @@ -15,5 +16,5 @@ public interface IWeekJobCountService * * @return 近一周的入库和出库作业数量统计 */ - public WeekJobCount getWeekJobCount(); + public WeekJobCount getWeekJobCount(BaseEntity baseEntity); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/BillStatusCountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/BillStatusCountServiceImpl.java index 9a9073f..8e3e895 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/BillStatusCountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/BillStatusCountServiceImpl.java @@ -2,6 +2,9 @@ package com.ruoyi.index.service.impl; import java.util.ArrayList; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.BaseEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.index.mapper.BillStatusCountMapper; @@ -22,23 +25,25 @@ public class BillStatusCountServiceImpl implements IBillStatusCountService { * @return 单据状态统计列表 */ @Override - public List selectAllBillStatusCount() { + @DataScope +// @DataScope(warehouseAlias = "") + public List selectAllBillStatusCount(BaseEntity baseEntity) { List resultList = new ArrayList<>(); // 查询入库单据状态统计 - List stockinList = billStatusCountMapper.selectStockinStatusCount(); + List stockinList = billStatusCountMapper.selectStockinStatusCount(baseEntity); if (stockinList != null) { resultList.addAll(stockinList); } // 查询出库单据状态统计 - List stockoutList = billStatusCountMapper.selectStockoutStatusCount(); + List stockoutList = billStatusCountMapper.selectStockoutStatusCount(baseEntity); if (stockoutList != null) { resultList.addAll(stockoutList); } // 查询盘点单据状态统计 - List stockcheckList = billStatusCountMapper.selectStockcheckStatusCount(); + List stockcheckList = billStatusCountMapper.selectStockcheckStatusCount(baseEntity); if (stockcheckList != null) { resultList.addAll(stockcheckList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/CargoSpaceCountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/CargoSpaceCountServiceImpl.java index 22298af..3e51181 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/CargoSpaceCountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/CargoSpaceCountServiceImpl.java @@ -1,5 +1,7 @@ package com.ruoyi.index.service.impl; +import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.index.domain.CargoSpaceCount; import com.ruoyi.index.mapper.CargoSpaceCountMapper; import com.ruoyi.index.service.ICargoSpaceCountService; @@ -24,9 +26,10 @@ public class CargoSpaceCountServiceImpl implements ICargoSpaceCountService { * @return 货位状态统计对象 */ @Override - public CargoSpaceCount selectStatusCount() { + @DataScope + public CargoSpaceCount selectStatusCount(BaseEntity baseEntity) { // 查询各状态货位数量 - List> statusCounts = cargoSpaceCountMapper.selectStatusCount(); + List> statusCounts = cargoSpaceCountMapper.selectStatusCount(baseEntity); // 初始化结果数组,默认所有状态数量为0 List counts = new ArrayList<>(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/IndexCountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/IndexCountServiceImpl.java index 75921ab..896a41b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/IndexCountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/IndexCountServiceImpl.java @@ -1,5 +1,7 @@ package com.ruoyi.index.service.impl; +import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.BaseEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.index.mapper.IndexCountMapper; @@ -24,12 +26,13 @@ public class IndexCountServiceImpl implements IIndexCountService * @return 统计结果 */ @Override - public IndexCount selectFinishCount() + @DataScope + public IndexCount selectFinishCount(BaseEntity baseEntity) { IndexCount indexCount = new IndexCount(); - indexCount.setStockinCount(indexCountMapper.selectStockinFinishCount()); - indexCount.setStockoutCount(indexCountMapper.selectStockoutFinishCount()); - indexCount.setStockcheckCount(indexCountMapper.selectStockcheckFinishCount()); + indexCount.setStockinCount(indexCountMapper.selectStockinFinishCount(baseEntity)); + indexCount.setStockoutCount(indexCountMapper.selectStockoutFinishCount(baseEntity)); + indexCount.setStockcheckCount(indexCountMapper.selectStockcheckFinishCount(baseEntity)); return indexCount; } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/WeekJobCountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/WeekJobCountServiceImpl.java index a3e7381..5bbfa80 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/WeekJobCountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/WeekJobCountServiceImpl.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.ruoyi.common.core.domain.BaseEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,7 +33,7 @@ public class WeekJobCountServiceImpl implements IWeekJobCountService * @return 近一周的入库和出库作业数量统计 */ @Override - public WeekJobCount getWeekJobCount() + public WeekJobCount getWeekJobCount(BaseEntity baseEntity) { // 获取当前日期 LocalDate now = LocalDate.now(); @@ -53,8 +54,8 @@ public class WeekJobCountServiceImpl implements IWeekJobCountService List outJobCounts = Arrays.asList(0, 0, 0, 0, 0, 0, 0); // 查询近一周的入库和出库作业数量 - List queryInCounts = weekJobCountMapper.selectInJobCounts(startDate, endDate); - List queryOutCounts = weekJobCountMapper.selectOutJobCounts(startDate, endDate); + List queryInCounts = weekJobCountMapper.selectInJobCounts(startDate, endDate,baseEntity); + List queryOutCounts = weekJobCountMapper.selectOutJobCounts(startDate, endDate,baseEntity); // 如果查询结果不为空,更新对应日期的数量 if (queryInCounts != null && !queryInCounts.isEmpty()) { diff --git a/ruoyi-admin/src/main/resources/mapper/index/BillStatusCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/index/BillStatusCountMapper.xml index 0344afe..74cf270 100644 --- a/ruoyi-admin/src/main/resources/mapper/index/BillStatusCountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/index/BillStatusCountMapper.xml @@ -14,18 +14,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select stockin_id as id, status, '1' as type from in_stockin where status in ('1', '2', '3') + ${params.warehouseDataScope} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/index/CargoSpaceCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/index/CargoSpaceCountMapper.xml index bf1ef20..5263856 100644 --- a/ruoyi-admin/src/main/resources/mapper/index/CargoSpaceCountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/index/CargoSpaceCountMapper.xml @@ -8,6 +8,7 @@ SELECT status, COUNT(*) as count FROM bas_cargo_space WHERE status IN ('1', '2', '3', '4', '5', '6') + ${params.warehouseDataScope} GROUP BY status ORDER BY status diff --git a/ruoyi-admin/src/main/resources/mapper/index/IndexCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/index/IndexCountMapper.xml index f893692..78a4fe9 100644 --- a/ruoyi-admin/src/main/resources/mapper/index/IndexCountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/index/IndexCountMapper.xml @@ -7,16 +7,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/index/ViewIndexJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/index/ViewIndexJobMapper.xml index 7998f67..11eb6df 100644 --- a/ruoyi-admin/src/main/resources/mapper/index/ViewIndexJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/index/ViewIndexJobMapper.xml @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" in_or_out, priority from view_index_job - + ${params.warehouseDataScope} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/index/WeekJobCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/index/WeekJobCountMapper.xml index 207da0d..44ff3f0 100644 --- a/ruoyi-admin/src/main/resources/mapper/index/WeekJobCountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/index/WeekJobCountMapper.xml @@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" CAST(create_time AS DATE) ORDER BY CAST(create_time AS DATE) + ${arg2.params.warehouseDataScope} @@ -26,12 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM mydo_job_finish WHERE - in_or_out >= 20 + in_or_out >= 20 AND CAST(create_time AS DATE) BETWEEN #{startDate} AND #{endDate} GROUP BY CAST(create_time AS DATE) ORDER BY CAST(create_time AS DATE) + ${arg2.params.warehouseDataScope} \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index c103f93..cf6a0c4 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -1,5 +1,5 @@