diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxFanStatisticsController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxFanStatisticsController.java
index 921c6cf0e..db4a6e863 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxFanStatisticsController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxFanStatisticsController.java
@@ -65,7 +65,7 @@ public class SysWxFanStatisticsController extends BaseController
public AjaxResult export(SysWxFanStatistics sysWxFanStatistics)
{
sysWxFanStatistics.setSortFlag(1);
- List<SysWxFanStatistics> list = sysWxFanStatisticsService.selectSysWxFanStatisticsList(sysWxFanStatistics);
+ List<SysWxFanStatistics> list = sysWxFanStatisticsService.exportStatisticsList(sysWxFanStatistics);
List<ExportFanStatisticsResponse> responsesList = new ArrayList<>();
ExportFanStatisticsResponse exportFanStatisticsResponse = null;
int groupId = 0;
@@ -83,6 +83,7 @@ public class SysWxFanStatisticsController extends BaseController
exportFanStatisticsResponse.setAccount(sysWxFan.getAccount());
exportFanStatisticsResponse.setSaleName(sysWxFan.getUserName());
exportFanStatisticsResponse.setWxAccount(sysWxFan.getWxAccount());
+ exportFanStatisticsResponse.setWxPhone(sysWxFan.getWxPhone());
exportFanStatisticsResponse.setFanNum(sysWxFan.getFanNum());
responsesList.add(exportFanStatisticsResponse);
totalFanNum += exportFanStatisticsResponse.getFanNum().intValue();
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java
index d17e4589f..67b60fc02 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java
@@ -43,6 +43,9 @@ public class SysWxFanStatistics extends BaseEntity
@Excel(name = "微信号")
private String wxAccount;
+ @Excel(name = "微信绑定手机号")
+ private String wxPhone;
+
/** 进粉时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "进粉时间", width = 30, dateFormat = "yyyy-MM-dd")
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/ExportFanStatisticsResponse.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/ExportFanStatisticsResponse.java
index b4056910e..c3de9f9fc 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/ExportFanStatisticsResponse.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/ExportFanStatisticsResponse.java
@@ -22,6 +22,10 @@ public class ExportFanStatisticsResponse {
@Excel(name = "微信号")
private String wxAccount;
+ //手机号
+ @Excel(name = "手机号")
+ private String wxPhone;
+
//进粉量、
@Excel(name = "进粉量")
private Integer fanNum;
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxFanStatisticsMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxFanStatisticsMapper.java
index 567978e72..1d3a7f717 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxFanStatisticsMapper.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxFanStatisticsMapper.java
@@ -1,16 +1,16 @@
package com.stdiet.custom.mapper;
-import java.util.List;
import com.stdiet.custom.domain.SysWxFanStatistics;
+import java.util.List;
+
/**
* 进粉统计Mapper接口
*
* @author xiezhijun
* @date 2021-02-03
*/
-public interface SysWxFanStatisticsMapper
-{
+public interface SysWxFanStatisticsMapper {
/**
* 查询进粉统计
*
@@ -66,8 +66,11 @@ public interface SysWxFanStatisticsMapper
/**
* 查询总进粉数量
+ *
* @param sysWxFanStatistics
* @return
*/
public int selectFanNumCount(SysWxFanStatistics sysWxFanStatistics);
+
+ public List<SysWxFanStatistics> exportStatisticsList(SysWxFanStatistics sysWxFanStatistics);
}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxFanStatisticsService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxFanStatisticsService.java
index 207d776a5..ebeef03f9 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxFanStatisticsService.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxFanStatisticsService.java
@@ -82,4 +82,6 @@ public interface ISysWxFanStatisticsService
* @return
*/
public int selectFanNumCount(SysWxFanStatistics sysWxFanStatistics);
+
+ List<SysWxFanStatistics> exportStatisticsList(SysWxFanStatistics sysWxFanStatistics);
}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxFanStatisticsServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxFanStatisticsServiceImpl.java
index f14a833a0..752ed63aa 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxFanStatisticsServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxFanStatisticsServiceImpl.java
@@ -144,4 +144,9 @@ public class SysWxFanStatisticsServiceImpl implements ISysWxFanStatisticsService
public int selectFanNumCount(SysWxFanStatistics sysWxFanStatistics){
return sysWxFanStatisticsMapper.selectFanNumCount(sysWxFanStatistics);
}
+
+ @Override
+ public List<SysWxFanStatistics> exportStatisticsList(SysWxFanStatistics sysWxFanStatistics) {
+ return sysWxFanStatisticsMapper.exportStatisticsList(sysWxFanStatistics);
+ }
}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
index 9da13cc5c..12043bb40 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
@@ -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
diff --git a/stdiet-ui/src/views/custom/recipesShow/index.vue b/stdiet-ui/src/views/custom/recipesShow/index.vue
index 6e816630b..fd2e1ae0a 100644
--- a/stdiet-ui/src/views/custom/recipesShow/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/index.vue
@@ -88,7 +88,7 @@ export default {
if (planPauseRes.code === 200) {
this.pauseDays = planPauseRes.data.reduce((arr, cur) => {
let startDate = cur.pauseStartDate;
- while (dayjs(startDate) <= dayjs(cur.pauseEndDate)) {
+ while (dayjs(startDate) < dayjs(cur.pauseEndDate)) {
arr.push(startDate);
startDate = dayjs(startDate).add(1, "days").format("YYYY-MM-DD");
}