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 | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
index 5e626cc..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"/>
@@ -45,7 +45,7 @@
select * from (
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,9 +53,9 @@
</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, create_user
+ 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}
@@ -92,4 +92,8 @@
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