Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!214 修复微信报粉导出错误&食谱日期展示

Browse Source 
Merge pull request !214 from 德仔/develop
This commit is contained in:
德仔
2021-04-20 18:55:40 +08:00
committed by Gitee
parent b94c69b7a5 181c3f57c9
commit 5d176211a6
8 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
View File

@ -21,6 +21,7 @@
<result property="account" column="account"></result>
<result property="saleGroup" column="sale_group"></result>
<result property="wxNickName" column="wx_nick_name"></result>
<result property="wxPhone" column="wx_phone"></result>
<result property="wxAccount" column="wx_account"></result>
</resultMap>
@ -56,6 +57,20 @@
</select>
<select id="exportStatisticsList" parameterType="SysWxFanStatistics" resultMap="SysWxFanStatisticsResult">
SELECT sale_group_id, su.nick_name AS user_name, cn.dict_label AS account, wsa.wx_account, wsa.wx_phone, IF(ISNULL(wfs.fan_num),0,wfs.fan_num) AS fan_num FROM sys_wx_distribution wd
LEFT JOIN (
SELECT wx_id, fan_num FROM sys_wx_fan_statistics
<if test="fanStartTime != null and fanEndTime != null">
WHERE fan_time >= #{fanStartTime} AND #{fanEndTime} >= fan_time
</if>
) AS wfs ON wd.wechat_account = wfs.wx_id
LEFT JOIN (SELECT id, wx_account, wx_phone FROM sys_wx_sale_account) AS wsa ON wd.wechat_account = wsa.id
LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'fan_channel') AS cn ON cn.dict_value = wd.account_id
LEFT JOIN sys_user AS su ON su.user_id = wd.user_id
ORDER BY wd.sale_group_id, wd.user_id ASC
</select>
<!-- 查询总进粉数量 -->
<select id="selectFanNumCount" parameterType="SysWxFanStatistics" resultType="int">
select ifnull(sum(swfs.fan_num),0) from sys_wx_fan_statistics swfs