feats

pom.xml

@@ -75,6 +75,13 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

src/main/java/com/yunzhi/liyuanhui/common/ExcelCellWriteHandler.java

@@ -0,0 +1,23 @@
+package com.yunzhi.liyuanhui.common;
+
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+
+@Slf4j
+public class ExcelCellWriteHandler implements CellWriteHandler {
+    @Override
+    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, int i, boolean b) {
+
+    }
+
+    @Override
+    public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, int i, boolean b) {
+
+    }
+}

src/main/java/com/yunzhi/liyuanhui/common/ExcelUtils.java

@@ -0,0 +1,36 @@
+package com.yunzhi.liyuanhui.common;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+public class ExcelUtils {
+
+    /**
+     * 发送 excel 到客户端
+     * 暂时只支持单 sheet 页
+     * @param response
+     * @param data
+     * @param fileName
+     * @throws IOException
+     */
+    public static void flush(HttpServletResponse response, Class dataClass, List data, String fileName) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename="+StringUtils.urlEncode(fileName)+".xlsx");
+
+        EasyExcel.write(response.getOutputStream(), dataClass).sheet("sheet1").doWrite(data);
+
+//        ParameterizedType type = (ParameterizedType) data.getClass().getGenericSuperclass();
+//        Class dataClass = (Class) type.getActualTypeArguments()[0];
+
+//        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), dataClass).registerWriteHandler(new ExcelCellWriteHandler()).build();
+//        WriteSheet sheet1 = EasyExcel.writerSheet("sheet1").build();
+//        excelWriter.write(data, sheet1);
+//        excelWriter.finish();
+    }
+}

src/main/java/com/yunzhi/liyuanhui/common/OssUtils.java

@@ -21,7 +21,7 @@ public class OssUtils {
      * @return
      */
     public String putObject(MultipartFile mf, String ... toDirs) throws IOException {
-        String fName = StringUtils.ifNull(mf.getOriginalFilename(), StringUtils.random(16) + ".png");
+        String fName = formatFileName(mf.getOriginalFilename());
         String preFix = String.valueOf(System.currentTimeMillis());
         String toDir = "/";
         if (null != toDirs && toDirs.length > 0) {
@@ -34,7 +34,7 @@ public class OssUtils {
     }
 
     public String putObject(File f, String ... toDirs) throws FileNotFoundException {
-        String fName = StringUtils.ifNull(f.getName(), StringUtils.random(16) + ".png");
+        String fName = formatFileName(f.getName());
         String preFix = String.valueOf(System.currentTimeMillis());
         String toDir = "/";
         if (null != toDirs && toDirs.length > 0) {
@@ -47,6 +47,10 @@ public class OssUtils {
         return putFile(nwFName, inputStream);
     }
 
+    private String formatFileName(String fName) {
+        return StringUtils.ifNull(fName, StringUtils.random(16) + ".png");
+    }
+
     private String putFile(String fname, InputStream input) {
         OSSClient ossClient = new OSSClient(aliyunConfig.getOss().getEndpoint(), aliyunConfig.getAccessKeyId(), aliyunConfig.getAccessKeySecret());
         ossClient.putObject(aliyunConfig.getOss().getBucketName(), fname, input);
@@ -59,6 +63,6 @@ public class OssUtils {
             preURL += "/";
         }
 
-        return preURL + fname;
+        return preURL + fname.replaceAll("\\ ", "%20");
     }
 }

src/main/java/com/yunzhi/liyuanhui/common/ResponseBean.java

@@ -1,10 +1,13 @@
 package com.yunzhi.liyuanhui.common;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
  * 接口统一状态返回BEAN.
  */
+@Data
 public class ResponseBean<T> implements Serializable {
 
     private static final long serialVersionUID = 3593827217136880822L;
@@ -47,18 +50,6 @@ public class ResponseBean<T> implements Serializable {
 
         return responseBean;
     }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public T getData() {
-        return data;
-    }
     
     @Override
     public String toString() {

src/main/java/com/yunzhi/liyuanhui/controller/TaActivityController.java

@@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.liyuanhui.common.BaseController;
 import com.yunzhi.liyuanhui.common.ResponseBean;
 import com.yunzhi.liyuanhui.common.StringUtils;
+import com.yunzhi.liyuanhui.entity.TaPerson;
+import com.yunzhi.liyuanhui.service.ITaActivityEnrollService;
+import com.yunzhi.liyuanhui.service.ITaActivityVoteService;
+import org.bouncycastle.cms.PasswordRecipient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +17,8 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.liyuanhui.service.ITaActivityService;
 import com.yunzhi.liyuanhui.entity.TaActivity;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 活动 前端控制器
@@ -30,6 +36,11 @@ public class TaActivityController extends BaseController {
     @Autowired
     public ITaActivityService iTaActivityService;
 
+    @Autowired
+    private ITaActivityVoteService iTaActivityVoteService;
+
+    @Autowired
+    private ITaActivityEnrollService iTaActivityEnrollService;
 
     /**
      * 分页查询列表
@@ -121,8 +132,24 @@ public class TaActivityController extends BaseController {
      */
     @RequestMapping(value="/{client}/activity/{id}",method= RequestMethod.GET)
     public ResponseBean taActivityGet(@PathVariable String client,
-                                      @PathVariable Integer id) throws Exception{
+                                      @PathVariable Integer id,
+                                      HttpServletRequest request) throws Exception{
         TaActivity result = iTaActivityService.getActivityProfile(id);
+
+        if ("wx".equals(client)) {
+            TaPerson taPerson = getPerson(request);
+            // 是否参与投票
+            if (null != result.getIsVote() && result.getIsVote()) {
+                boolean isVoted = iTaActivityVoteService.isVotedBy(result.getActivityId(), taPerson.getPersonId());
+                result.setIsSelfVoted(isVoted);
+            }
+            // 是否参与报名
+            if (null != result.getIsEnroll() && result.getIsEnroll()) {
+                boolean isSelfEnrolled = iTaActivityEnrollService.isEnrolledBy(result.getActivityId(), taPerson);
+                result.setIsSelfEnrolled(isSelfEnrolled);
+            }
+        }
+
         return ResponseBean.success(result);
     }
 }

src/main/java/com/yunzhi/liyuanhui/controller/TaPersonController.java

@@ -4,10 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.liyuanhui.common.BaseController;
-import com.yunzhi.liyuanhui.common.ResponseBean;
-import com.yunzhi.liyuanhui.common.StringUtils;
-import com.yunzhi.liyuanhui.common.WxUtils;
+import com.yunzhi.liyuanhui.common.*;
 import com.yunzhi.liyuanhui.enums.StatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,6 +13,8 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.liyuanhui.service.ITaPersonService;
 import com.yunzhi.liyuanhui.entity.TaPerson;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -64,6 +63,25 @@ public class TaPersonController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    @GetMapping("/admin/person/export")
+    public void exportPerson(@RequestParam(value ="phone", required = false) String phone,
+                             @RequestParam(value ="name", required = false) String name,
+                             HttpServletResponse response) throws Exception {
+         List<TaPerson> personList = iTaPersonService.getListBy(phone, name);
+         for (TaPerson person: personList) {
+             // 设置性别
+             if (1 == person.getSex()) {
+                 person.setGender("男");
+             } else if (2 == person.getSex()) {
+                 person.setGender("女");
+             } else {
+                 person.setGender("未知");
+             }
+         }
+
+        ExcelUtils.flush(response, TaPerson.class, personList, "会员信息统计");
+    }
+
     /**
      * 保存对象
      * @param taPerson 实体对象
@@ -103,6 +121,9 @@ public class TaPersonController extends BaseController {
     @RequestMapping(value="/wx/person/{id}",method= RequestMethod.POST)
     public ResponseBean taPersonUpdate(@PathVariable Integer id,
                                         @RequestBody TaPerson taPerson) throws Exception{
+        if (null == taPerson.getPersonId()) {
+            taPerson.setPersonId(id);
+        }
 
         if (iTaPersonService.updateById(taPerson)){
             return ResponseBean.success(taPerson);

src/main/java/com/yunzhi/liyuanhui/controller/TaRecommenderController.java

@@ -3,10 +3,8 @@ package com.yunzhi.liyuanhui.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.liyuanhui.common.BaseController;
-import com.yunzhi.liyuanhui.common.DateUtils;
-import com.yunzhi.liyuanhui.common.ResponseBean;
-import com.yunzhi.liyuanhui.common.StringUtils;
+import com.yunzhi.liyuanhui.common.*;
+import com.yunzhi.liyuanhui.entity.RecommendExport;
 import com.yunzhi.liyuanhui.entity.TaPerson;
 import com.yunzhi.liyuanhui.enums.StatusEnum;
 import org.slf4j.Logger;
@@ -17,7 +15,9 @@ import com.yunzhi.liyuanhui.service.ITaRecommenderService;
 import com.yunzhi.liyuanhui.entity.TaRecommender;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -76,6 +76,46 @@ public class TaRecommenderController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    @GetMapping("/admin/recommender/export")
+    public void taRecommenderList(@RequestParam(value ="startDate", required = false) String startDate,
+                                          @RequestParam(value ="endDate", required = false) String endDate,
+                                          @RequestParam(value ="recName", required = false) String recName,
+                                          @RequestParam(value ="recPhone", required = false) String recPhone,
+                                          @RequestParam(value ="name", required = false) String name,
+                                          @RequestParam(value ="phone", required = false) String phone,
+                                          @RequestParam(value ="status", required = false) Integer status,
+                                          HttpServletResponse response) throws Exception{
+        if (!StringUtils.isEmpty(startDate)) {
+            startDate += " 00:00:00";
+        }
+        if (!StringUtils.isEmpty(endDate)) {
+            endDate += " 23:59:59";
+        }
+
+        List<RecommendExport> result = iTaRecommenderService.getListBy(startDate, endDate, recName, recPhone, name, phone, status);
+        for (RecommendExport item: result) {
+            // 转换性别
+            if ("1".equals(item.getSex())) {
+                item.setSex("男");
+            } else if ("2".equals(item.getSex())) {
+                item.setSex("女");
+            } else {
+                item.setSex("未知");
+            }
+
+            // 转换审核状态
+            if ("1".equals(item.getStatus())) {
+                item.setStatus("审核通过");
+            } else if ("2".equals(item.getStatus())) {
+                item.setStatus("审核未通过");
+            } else {
+                item.setStatus("未审核");
+            }
+        }
+
+        ExcelUtils.flush(response, RecommendExport.class, result, StringUtils.strToUnicode("推荐用户"));
+    }
+
     @GetMapping("/wx/person/{personId}/recommender")
     public ResponseBean getRecommenderOf(@PathVariable Integer personId,
                                          @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,

src/main/java/com/yunzhi/liyuanhui/entity/RecommendExport.java

@@ -0,0 +1,34 @@
+package com.yunzhi.liyuanhui.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class RecommendExport {
+
+    @ExcelProperty(value = "时间", index = 1)
+    private Date createDate;
+
+    @ExcelProperty(value = "手机", index = 2)
+    private String phone;
+
+    @ExcelProperty(value = "名称", index = 3)
+    private String name;
+
+    @ExcelProperty(value = "性别", index = 4)
+    private String sex;
+
+    @ExcelProperty(value = "备注", index = 5)
+    private String remark;
+
+    @ExcelProperty(value = "推荐人手机", index = 6)
+    private String recPhone;
+
+    @ExcelProperty(value = "推荐人名称", index = 7)
+    private String recName;
+
+    @ExcelProperty(value = "审核状态", index = 8)
+    private String status;
+}

src/main/java/com/yunzhi/liyuanhui/entity/TaActivity.java

@@ -157,4 +157,16 @@ public class TaActivity implements Serializable {
      */
     @TableField(exist = false)
     List<TaActivityVoteItem> voteItemList;
+
+    /**
+     * 是否参与投票
+     */
+    @TableField(exist = false)
+    Boolean isSelfVoted;
+
+    /**
+     * 是否参与报名
+     */
+    @TableField(exist = false)
+    Boolean isSelfEnrolled;
 }

src/main/java/com/yunzhi/liyuanhui/entity/TaPerson.java

@@ -1,6 +1,8 @@
 package com.yunzhi.liyuanhui.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -37,11 +39,13 @@ public class TaPerson implements Serializable {
     /**
      * 姓名
      */
+    @ExcelProperty(value = "名称", index = 3)
     private String name;
 
     /**
      * 昵称
      */
+    @ExcelProperty(value = "昵称", index = 4)
     private String nickname;
 
     /**
@@ -52,6 +56,7 @@ public class TaPerson implements Serializable {
     /**
      * 电话
      */
+    @ExcelProperty(value = "手机", index = 2)
     private String phone;
 
     /**
@@ -62,6 +67,7 @@ public class TaPerson implements Serializable {
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "时间", index = 1)
     private LocalDateTime createDate;
 
     /**
@@ -79,5 +85,7 @@ public class TaPerson implements Serializable {
      */
     private Integer status;
 
-
+    @ExcelProperty(value = "性别", index = 5)
+    @TableField(exist = false)
+    private String gender;
 }

src/main/java/com/yunzhi/liyuanhui/mapper/TaActivityEnrollMapper.java

@@ -4,6 +4,8 @@ import com.yunzhi.liyuanhui.entity.TaActivityEnroll;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 活动报名 Mapper 接口
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaActivityEnrollMapper extends BaseMapper<TaActivityEnroll> {
 
+    List<TaActivityEnroll> getEnrolledBy(Integer activityId, Integer personId, String phone);
 }

src/main/java/com/yunzhi/liyuanhui/mapper/TaRecommenderMapper.java

@@ -1,10 +1,12 @@
 package com.yunzhi.liyuanhui.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.liyuanhui.entity.RecommendExport;
 import com.yunzhi.liyuanhui.entity.TaRecommender;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,4 +21,6 @@ import java.util.Map;
 public interface TaRecommenderMapper extends BaseMapper<TaRecommender> {
 
     IPage<Map<String, Object>> getListBy(IPage<Map<String, Object>> pg, String start, String end, String recName, String recPhone, String name, String phone, Integer status);
+
+    List<RecommendExport> getListNoPage(String start, String end, String recName, String recPhone, String name, String phone, Integer status);
 }

src/main/java/com/yunzhi/liyuanhui/service/ITaActivityEnrollService.java

@@ -15,4 +15,6 @@ import com.yunzhi.liyuanhui.entity.TaPerson;
 public interface ITaActivityEnrollService extends IService<TaActivityEnroll> {
 
     boolean enroll(TaActivityEnroll taActivityEnroll, TaPerson taPerson) throws Exception;
+
+    boolean isEnrolledBy(Integer activityId, TaPerson taPerson) throws Exception;
 }

src/main/java/com/yunzhi/liyuanhui/service/ITaActivityVoteService.java

@@ -17,4 +17,6 @@ import com.yunzhi.liyuanhui.entity.TaPerson;
 public interface ITaActivityVoteService extends IService<TaActivityVote> {
 
     boolean vote(TaActivity taActivity, TaActivityVoteItem taActivityVoteItem, TaPerson taPerson) throws Exception;
+
+    boolean isVotedBy(Integer activityId, Integer personId) throws Exception;
 }

src/main/java/com/yunzhi/liyuanhui/service/ITaPersonService.java

@@ -3,6 +3,8 @@ package com.yunzhi.liyuanhui.service;
 import com.yunzhi.liyuanhui.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户 服务类
@@ -29,4 +31,6 @@ public interface ITaPersonService extends IService<TaPerson> {
      * @throws Exception
      */
     TaPerson updatePersonPhone(Integer personId, String phone) throws Exception;
+
+    List<TaPerson> getListBy(String phone, String name) throws Exception;
 }

src/main/java/com/yunzhi/liyuanhui/service/ITaRecommenderService.java

@@ -1,9 +1,11 @@
 package com.yunzhi.liyuanhui.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.liyuanhui.entity.RecommendExport;
 import com.yunzhi.liyuanhui.entity.TaRecommender;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,4 +32,6 @@ public interface ITaRecommenderService extends IService<TaRecommender> {
      * @throws Exception
      */
     IPage<Map<String, Object>> getListBy(IPage<Map<String, Object>> pg, String start, String end, String recName, String recPhone, String name, String phone, Integer status) throws Exception;
+
+    List<RecommendExport> getListBy(String startDate, String endDate, String recName, String recPhone, String name, String phone, Integer status) throws Exception;
 }

src/main/java/com/yunzhi/liyuanhui/service/impl/TaActivityEnrollServiceImpl.java

@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * <p>
  * 活动报名 服务实现类
@@ -29,6 +31,9 @@ public class TaActivityEnrollServiceImpl extends ServiceImpl<TaActivityEnrollMap
     @Autowired
     ITaActivityService iTaActivityService;
 
+    @Autowired
+    TaActivityEnrollMapper taActivityEnrollMapper;
+
     @Transactional
     @Override
     public boolean enroll(TaActivityEnroll taActivityEnroll, TaPerson taPerson) throws Exception {
@@ -85,4 +90,10 @@ public class TaActivityEnrollServiceImpl extends ServiceImpl<TaActivityEnrollMap
 
         return true;
     }
+
+    @Override
+    public boolean isEnrolledBy(Integer activityId, TaPerson taPerson) throws Exception {
+        List<TaActivityEnroll> list = taActivityEnrollMapper.getEnrolledBy(activityId, taPerson.getPersonId(), taPerson.getPhone());
+        return null != list && list.size() > 0;
+    }
 }

src/main/java/com/yunzhi/liyuanhui/service/impl/TaActivityVoteServiceImpl.java

@@ -8,7 +8,6 @@ import com.yunzhi.liyuanhui.entity.TaActivityVote;
 import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
 import com.yunzhi.liyuanhui.entity.TaPerson;
 import com.yunzhi.liyuanhui.enums.StatusEnum;
-import com.yunzhi.liyuanhui.mapper.TaActivityVoteItemMapper;
 import com.yunzhi.liyuanhui.mapper.TaActivityVoteMapper;
 import com.yunzhi.liyuanhui.service.ITaActivityVoteItemService;
 import com.yunzhi.liyuanhui.service.ITaActivityVoteService;
@@ -91,4 +90,12 @@ public class TaActivityVoteServiceImpl extends ServiceImpl<TaActivityVoteMapper,
 
         return true;
     }
+
+    @Override
+    public boolean isVotedBy(Integer activityId, Integer personId) throws Exception {
+        QueryWrapper<TaActivityVote> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("activity_id", activityId);
+        queryWrapper.eq("person_id", personId);
+        return this.count(queryWrapper) > 0;
+    }
 }

src/main/java/com/yunzhi/liyuanhui/service/impl/TaPersonServiceImpl.java

@@ -1,12 +1,16 @@
 package com.yunzhi.liyuanhui.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.liyuanhui.common.StringUtils;
 import com.yunzhi.liyuanhui.entity.TaPerson;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
 import com.yunzhi.liyuanhui.mapper.TaPersonMapper;
 import com.yunzhi.liyuanhui.service.ITaPersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户 服务实现类
@@ -47,4 +51,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         updateById(taPerson);
         return taPerson;
     }
+
+    @Override
+    public List<TaPerson> getListBy(String phone, String name) throws Exception {
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
+        queryWrapper.nested(!StringUtils.isEmpty(name), q -> q.like("name", name).or().like("nickname", name));
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByDesc("create_date");
+        return this.list(queryWrapper);
+    }
 }

src/main/java/com/yunzhi/liyuanhui/service/impl/TaRecommenderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yunzhi.liyuanhui.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.liyuanhui.entity.RecommendExport;
 import com.yunzhi.liyuanhui.entity.TaRecommender;
 import com.yunzhi.liyuanhui.mapper.TaRecommenderMapper;
 import com.yunzhi.liyuanhui.service.ITaRecommenderService;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,4 +29,9 @@ public class TaRecommenderServiceImpl extends ServiceImpl<TaRecommenderMapper, T
     public IPage<Map<String, Object>> getListBy(IPage<Map<String, Object>> pg, String start, String end, String recName, String recPhone, String name, String phone, Integer status) throws Exception {
         return taRecommenderMapper.getListBy(pg, start, end, recName, recPhone, name, phone, status);
     }
+
+    @Override
+    public List<RecommendExport> getListBy(String startDate, String endDate, String recName, String recPhone, String name, String phone, Integer status) throws Exception {
+        return taRecommenderMapper.getListNoPage(startDate, endDate, recName, recPhone, name, phone, status);
+    }
 }

src/main/resources/application-prod.yml

@@ -5,4 +5,12 @@ spring:
   datasource:
     url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/liyuanhui?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: liyuanhui
-    password: abcd@123456
+    password: abcd@123456
+
+#weixin:
+#  miniapp:
+#    appid: wx842b0af4df4552a5
+#    secret: 602601def4b83277e6add96a82be937b
+#    token:
+#    aesKey:
+#    msgDataFormat: JSON

src/main/resources/mapper/TaActivityEnrollMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.liyuanhui.mapper.TaActivityEnrollMapper">
 
+    <select id="getEnrolledBy" resultType="com.yunzhi.liyuanhui.entity.TaActivityEnroll">
+        SELECT
+            *
+        FROM
+            ta_activity_enroll t
+        WHERE
+            t.activity_id = #{activityId}
+        AND ( t.person_id = #{personId}
+        <if test="phone!=null and phone!=''">
+            OR t.person_phone = #{phone} OR t.enroll_phone = #{phone}
+        </if>
+        )
+        ORDER BY
+        t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaRecommenderMapper.xml

@@ -34,5 +34,40 @@
                 AND (s.`name` LIKE CONCAT( '%', #{recName}, '%' ) OR s.nickname LIKE CONCAT( '%', #{recName}, '%' ))
             </if>
         </where>
+        order by t.create_date desc
+    </select>
+    <select id="getListNoPage" resultType="com.yunzhi.liyuanhui.entity.RecommendExport">
+        SELECT
+        t.*,
+        s.`name` AS rec_name,
+        s.nickname AS rec_nickname,
+        s.phone AS rec_phone
+        FROM
+        ta_recommender t
+        LEFT JOIN ta_person s ON t.person_id = s.person_id
+        <where>
+            <if test="status != null">
+                t.`status` = #{status}
+            </if>
+            <if test="start!=null and start!=''">
+                AND t.create_date &gt;= STR_TO_DATE(#{start}, '%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="end!=null and end!=''">
+                AND t.create_date &lt;= STR_TO_DATE(#{end}, '%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="phone!=null and phone!=''">
+                AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+            </if>
+            <if test="name!=null and name!=''">
+                AND t.`name` LIKE CONCAT( '%', #{name}, '%' )
+            </if>
+            <if test="recPhone!=null and recPhone!=''">
+                AND s.phone LIKE CONCAT( '%', #{recPhone}, '%' )
+            </if>
+            <if test="recName!=null and recName!=''">
+                AND (s.`name` LIKE CONCAT( '%', #{recName}, '%' ) OR s.nickname LIKE CONCAT( '%', #{recName}, '%' ))
+            </if>
+        </where>
+        order by t.create_date desc
     </select>
 </mapper>