diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/query/OrderStatQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/query/OrderStatQuery.java new file mode 100644 index 0000000..c2ecd16 --- /dev/null +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/query/OrderStatQuery.java @@ -0,0 +1,8 @@ +package com.ruoyi.bst.order.domain.query; + +import lombok.Data; + +@Data +public class OrderStatQuery { + +} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/constants/ReconciliationDateConstants.java b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/constants/ReconciliationDateConstants.java new file mode 100644 index 0000000..468246d --- /dev/null +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/constants/ReconciliationDateConstants.java @@ -0,0 +1,14 @@ +package com.ruoyi.bst.reconciliationDate.constants; + +public class ReconciliationDateConstants { + + // 按日期分组 + public static final String GROUP_BY_DATE = "brd.date"; + + // 按渠道分组 + public static final String GROUP_BY_CHANNEL = "brd.date, brd.channel_id, brd.channel_name"; + + // 按运营区分组 + public static final String GROUP_BY_AREA = "brd.date, brd.area_id, ba.name"; + +} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/mapper/ReconciliationDateMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/mapper/ReconciliationDateMapper.java index 452c508..9a2299b 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/mapper/ReconciliationDateMapper.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/mapper/ReconciliationDateMapper.java @@ -73,4 +73,12 @@ public interface ReconciliationDateMapper * @return 结果 */ public int deleteReconciliationDateByIds(Long[] ids); + + /** + * 查询渠道对账列表(按指定字段分组) + * @param query 查询条件 + * @param groupBy 分组字段 + * @return 渠道对账列表 + */ + List selectReconciliationDateListGroupBy(@Param("query")ReconciliationDateQuery query, @Param("groupBy")String groupBy); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/mapper/ReconciliationDateMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/mapper/ReconciliationDateMapper.xml index 8316abc..982761c 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/mapper/ReconciliationDateMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/mapper/ReconciliationDateMapper.xml @@ -4,7 +4,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + + select @@ -30,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" brd.actual_bonus, brd.difference, brd.channel_cost, - ba.name as area_name + ba.name from bst_reconciliation_date brd left join bst_area ba on ba.id = brd.area_id @@ -447,4 +449,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + + + diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/service/ReconciliationDateService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/service/ReconciliationDateService.java index 3a94689..f4a26dc 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/service/ReconciliationDateService.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/service/ReconciliationDateService.java @@ -71,4 +71,12 @@ public interface ReconciliationDateService * @param areaId 运营区ID */ public int insertReconciliationDate(LocalDate date, ChannelNameVO channel, Long areaId); + + /** + * 查询渠道对账列表(按指定字段分组) + * @param query 查询条件 + * @param groupBy 分组字段 + * @return 渠道对账列表 + */ + public List selectReconciliationDateListGroupBy(ReconciliationDateQuery query, String groupBy); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/service/impl/ReconciliationDateServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/service/impl/ReconciliationDateServiceImpl.java index a5e3200..ba18282 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/service/impl/ReconciliationDateServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/reconciliationDate/service/impl/ReconciliationDateServiceImpl.java @@ -199,4 +199,9 @@ public class ReconciliationDateServiceImpl implements ReconciliationDateService return this.insertReconciliationDate(po); } + @Override + public List selectReconciliationDateListGroupBy(ReconciliationDateQuery query, String groupBy) { + return reconciliationDateMapper.selectReconciliationDateListGroupBy(query, groupBy); + } + } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ReconciliationDateController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ReconciliationDateController.java index 041875c..1236583 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ReconciliationDateController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ReconciliationDateController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.bst.reconciliationDate.constants.ReconciliationDateConstants; import com.ruoyi.bst.reconciliationDate.domain.ReconciliationDateQuery; import com.ruoyi.bst.reconciliationDate.domain.ReconciliationDateVO; import com.ruoyi.bst.reconciliationDate.service.ReconciliationDateService; @@ -48,6 +49,36 @@ public class ReconciliationDateController extends BaseController return getDataTable(list); } + // 按日期分组 + @PreAuthorize("@ss.hasPermi('bst:reconciliationDate:list')") + @GetMapping("/listGroupByDate") + public TableDataInfo listGroupByDate(ReconciliationDateQuery query) { + startPage(); + startOrderBy(); + List list = reconciliationDateService.selectReconciliationDateListGroupBy(query, ReconciliationDateConstants.GROUP_BY_DATE); + return getDataTable(list); + } + + // 按渠道分组 + @PreAuthorize("@ss.hasPermi('bst:reconciliationDate:list')") + @GetMapping("/listGroupByChannel") + public TableDataInfo getListGroupByChannel(ReconciliationDateQuery query) { + startPage(); + startOrderBy(); + List list = reconciliationDateService.selectReconciliationDateListGroupBy(query, ReconciliationDateConstants.GROUP_BY_CHANNEL); + return getDataTable(list); + } + + // 按运营区分组 + @PreAuthorize("@ss.hasPermi('bst:reconciliationDate:list')") + @GetMapping("/listGroupByArea") + public TableDataInfo getListGroupByArea(ReconciliationDateQuery query) { + startPage(); + startOrderBy(); + List list = reconciliationDateService.selectReconciliationDateListGroupBy(query, ReconciliationDateConstants.GROUP_BY_AREA); + return getDataTable(list); + } + /** * 导出渠道对账列表 */ diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/dashboard/DashboardOrderController.java b/ruoyi-web/src/main/java/com/ruoyi/web/dashboard/DashboardOrderController.java index 3f4036c..5cc79c5 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/dashboard/DashboardOrderController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/dashboard/DashboardOrderController.java @@ -77,4 +77,11 @@ public class DashboardOrderController extends BaseController { List list = orderDashboard.selectRank(query); return success(list); } + + // @PreAuthorize("@ss.hasPermi('dashboard:order:stat')") + // @GetMapping("/stat") + // public AjaxResult getStat(OrderStatQuery query) { + // query.setScope(true); + // return success(orderDashboard.selectStat(query)); + // } }