diff --git a/klp-crm/src/main/resources/mapper/klp/CrmSalesReportMapper.xml b/klp-crm/src/main/resources/mapper/klp/CrmSalesReportMapper.xml index aeeaff3b..625ee60f 100644 --- a/klp-crm/src/main/resources/mapper/klp/CrmSalesReportMapper.xml +++ b/klp-crm/src/main/resources/mapper/klp/CrmSalesReportMapper.xml @@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND NOT EXISTS ( - SELECT 1 FROM crm_sales_objection obj + SELECT 1 FROM crm_sales_objection obj WHERE obj.order_id = o.order_id AND obj.del_flag = 0 ) @@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT + SELECT o.order_id, o.order_code, c.customer_code, @@ -116,19 +116,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM crm_order o LEFT JOIN crm_customer c ON o.customer_id = c.customer_id LEFT JOIN ( - SELECT - order_id, + SELECT + order_id, COUNT(*) as item_count - FROM crm_order_item - WHERE del_flag = 0 + FROM crm_order_item + WHERE del_flag = 0 GROUP BY order_id ) item_stats ON o.order_id = item_stats.order_id LEFT JOIN ( - SELECT - order_id, + SELECT + order_id, COUNT(*) as objection_count - FROM crm_sales_objection - WHERE del_flag = 0 + FROM crm_sales_objection + WHERE del_flag = 0 GROUP BY order_id ) obj_stats ON o.order_id = obj_stats.order_id @@ -147,17 +147,92 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT + SELECT c.customer_level, COUNT(DISTINCT c.customer_id) as customerCount, COUNT(o.order_id) as orderCount, @@ -181,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file +