From 7cf8ae446e880537a38bd7ac403bd53741a5294f Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 08 一月 2024 09:21:19 +0800
Subject: [PATCH] 修订版2.0

---
 data-server/src/main/resources/mapper/DataReportingMapper.xml |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
index 2d5c698..9a931e2 100644
--- a/data-server/src/main/resources/mapper/DataReportingMapper.xml
+++ b/data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -11,7 +11,7 @@
             <result property="product" column="product" jdbcType="VARCHAR"/>
             <result property="channel" column="channel" jdbcType="VARCHAR"/>
             <result property="name" column="name" jdbcType="VARCHAR"/>
-            <result property="show" column="show" jdbcType="INTEGER"/>
+            <result property="showNum" column="show_num" jdbcType="INTEGER"/>
             <result property="click" column="click" jdbcType="INTEGER"/>
             <result property="accountConsumption" column="account_consumption" jdbcType="DECIMAL"/>
             <result property="rebateConsumption" column="rebate_consumption" jdbcType="DECIMAL"/>
@@ -43,9 +43,9 @@
     </select>
     <select id="selectProductCountDtoPageList" resultType="com.yuanchu.mom.dto.ProductCountDto">
         select * from (
-        select update_time, create_time, product, sum(consumption) consumption, sum(fans_add) fans_add, sum(customer_costs) customer_costs
+        select update_time, create_time, product, sum(consumption) consumption, sum(fans_add) fans_add, sum(customer_costs) customer_costs, create_user
         from data_reporting
-        group by product
+        group by product,date_format(create_time, '%Y-%m-%d')
         ) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
@@ -53,12 +53,47 @@
     </select>
     <select id="selectRegistrantCountDtoPageList" resultType="com.yuanchu.mom.dto.RegistrantCountDto">
         select * from (
-        select id, department, registrant, product, name, sum(`show`) `show`, sum(click) click, sum(account_consumption)account_consumption, sum(rebate_consumption) rebate_consumption,(sum(rebate_consumption)+sum(remark)) rebate_consumption2, sum(discounted_consumption) discounted_consumption, sum(fans_add) fans_add, sum(actual_cost) actual_cost, sum(customer_costs) customer_costs, sum(profit) profit, sum(agent_rebate) agent_rebate, sum(customer_rebate) customer_rebate, sum(remark) remark, create_time, update_time
+        select id, department, registrant, product, name, sum(show_num) show_num, sum(click) click, sum(account_consumption)account_consumption, sum(rebate_consumption) rebate_consumption,(sum(rebate_consumption)+sum(remark)) rebate_consumption2, sum(discounted_consumption) discounted_consumption, sum(fans_add) fans_add, sum(actual_cost) actual_cost, sum(customer_costs) customer_costs, sum(profit) profit, sum(agent_rebate) agent_rebate, sum(customer_rebate) customer_rebate, sum(remark) remark, create_time, update_time, create_user
         from data_reporting
-        group by registrant
+        group by registrant,date_format(create_time, '%Y-%m-%d')
         ) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
     </select>
+    <select id="getDataFor1" resultType="java.util.Map">
+        select COALESCE(sum(account_consumption), 0) data1, COALESCE(sum(consumption), 0) data2, COALESCE(sum(customer_costs),0) data3, COALESCE(sum(actual_cost), 0) data4
+        from data_reporting
+        where date(create_time) like CURDATE()
+    </select>
+    <select id="getDataFor2" resultType="java.util.Map">
+        SELECT sum(account_consumption) account_consumptions, DATE_FORMAT(create_time, '%m-%d') `date`, DATE_FORMAT(create_time, '%y-%m-%d') time
+        FROM data_reporting
+        group by DATE_FORMAT(create_time, '%y-%m-%d')
+        having DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; time
+        and time &lt;= CURDATE()
+    </select>
+    <select id="getDataFor3" resultType="java.util.Map">
+        SELECT sum(consumption) consumption, DATE_FORMAT(create_time, '%m-%d') `date`, DATE_FORMAT(create_time, '%y-%m-%d') time
+        FROM data_reporting
+        group by DATE_FORMAT(create_time, '%y-%m-%d')
+        having DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; time
+        and time &lt;= CURDATE()
+    </select>
+    <select id="getDataFor4" resultType="java.util.Map">
+        select product, sum(customer_costs) customerCosts
+        from data_reporting
+        group by product
+        order by customerCosts desc limit 7
+    </select>
+    <select id="getDataFor5" resultType="java.util.Map">
+        select product, sum(actual_cost) actualCost
+        from data_reporting
+        group by product
+        order by actualCost desc limit 7
+    </select>
+    <select id="selectUser" resultType="java.util.Map">
+        select user.department, user.name, user.account from user
+        where id = #{userId}
+    </select>
 </mapper>

--
Gitblit v1.9.3