From 181c3f57c9843aec5c5fe7b0e810e583f60a2cd1 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Tue, 20 Apr 2021 18:54:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1=E6=8A=A5?= =?UTF-8?q?=E7=B2=89=E5=AF=BC=E5=87=BA=E9=94=99=E8=AF=AF&=E9=A3=9F?= =?UTF-8?q?=E8=B0=B1=E6=97=A5=E6=9C=9F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysWxFanStatisticsController.java | 3 ++- .../stdiet/custom/domain/SysWxFanStatistics.java | 3 +++ .../dto/response/ExportFanStatisticsResponse.java | 4 ++++ .../custom/mapper/SysWxFanStatisticsMapper.java | 9 ++++++--- .../service/ISysWxFanStatisticsService.java | 2 ++ .../impl/SysWxFanStatisticsServiceImpl.java | 5 +++++ .../mapper/custom/SysWxFanStatisticsMapper.xml | 15 +++++++++++++++ stdiet-ui/src/views/custom/recipesShow/index.vue | 2 +- 8 files changed, 38 insertions(+), 5 deletions(-) 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 list = sysWxFanStatisticsService.selectSysWxFanStatisticsList(sysWxFanStatistics); + List list = sysWxFanStatisticsService.exportStatisticsList(sysWxFanStatistics); List 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 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 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 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 @@ + @@ -56,6 +57,20 @@ + +