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

Merge pull request !214 from 德仔/develop

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")

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;

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);
 }

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);
 }

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);
+    }
 }