feat(sales): 为销售报表添加订单明细查询功能
- 在 CrmOrderItemMapper 中添加根据订单ID列表查询订单明细的方法 - 实现 MyBatis 查询语句支持批量订单ID查询订单明细 - 修改销售报表服务类注入 CrmOrderItemMapper 依赖 - 扩展销售报表查询逻辑以包含订单明细数据 - 在销售报表 VO 中添加订单明细列表字段 - 使用流式处理和分组收集优化订单明细关联逻辑
This commit is contained in:
@@ -6,6 +6,7 @@ import java.util.List;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.crm.domain.CrmOrderItem;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -35,7 +36,7 @@ public class CrmSalesReportVo {
|
||||
*/
|
||||
@Data
|
||||
public static class SalesSummary {
|
||||
|
||||
|
||||
/**
|
||||
* 总订单数
|
||||
*/
|
||||
@@ -93,7 +94,7 @@ public class CrmSalesReportVo {
|
||||
*/
|
||||
@Data
|
||||
public static class OrderDetail {
|
||||
|
||||
|
||||
/**
|
||||
* 订单ID
|
||||
*/
|
||||
@@ -190,6 +191,11 @@ public class CrmSalesReportVo {
|
||||
*/
|
||||
@ExcelProperty(value = "异议数量")
|
||||
private Integer objectionCount;
|
||||
|
||||
/**
|
||||
* 订单明细列表
|
||||
*/
|
||||
private List<CrmOrderItem> orderItemList;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -197,7 +203,7 @@ public class CrmSalesReportVo {
|
||||
*/
|
||||
@Data
|
||||
public static class SalesmanStat {
|
||||
|
||||
|
||||
/**
|
||||
* 销售员
|
||||
*/
|
||||
@@ -228,7 +234,7 @@ public class CrmSalesReportVo {
|
||||
*/
|
||||
@Data
|
||||
public static class CustomerLevelStat {
|
||||
|
||||
|
||||
/**
|
||||
* 客户等级
|
||||
*/
|
||||
@@ -259,7 +265,7 @@ public class CrmSalesReportVo {
|
||||
*/
|
||||
@Data
|
||||
public static class IndustryStat {
|
||||
|
||||
|
||||
/**
|
||||
* 行业
|
||||
*/
|
||||
@@ -284,4 +290,4 @@ public class CrmSalesReportVo {
|
||||
@ExcelProperty(value = "销售金额")
|
||||
private BigDecimal salesAmount;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user