导出

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -69,6 +69,7 @@ public class TaShareActivityController extends BaseController {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             taShareActivity.setOrgId(getOrgId(request));
             taShareActivity.setStatus(0);
+            taShareActivity.setActivityStatus(1);
             taShareActivity.setSort(false);
             taShareActivity.setWeight(0);
             if (iTaShareActivityService.save(taShareActivity)){
@@ -156,7 +157,10 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = new TaShareActivity();
-            taShareActivity.setStatus(2);
+            //活动禁用启用 0启动1禁用
+            taShareActivity.setStatus(1);
+            //0：进行中 1：未开始 2：已结束
+            taShareActivity.setActivityStatus(2);
             taShareActivity.setGroupActicityId(id);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);

src/main/java/com/huiju/estateagents/controller/TaShareChildRecordController.java

@@ -1,8 +1,14 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import org.slf4j.Logger;
@@ -11,6 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -41,12 +50,13 @@ public class TaShareChildRecordController extends BaseController {
     public ResponseBean taShareChildRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                @RequestParam(value ="groupActivityId",required = false) Integer groupActivityId,
-                                               @RequestParam(value ="status",required = false) Integer status,
+                                               @RequestParam(value ="groupStatus",required = false) Integer groupStatus,
+                                               @RequestParam(value ="recordId",required = false) Integer recordId,
                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareChildRecordService.getList(pageNum, pageSize, groupActivityId, status, getOrgId(request));
-            responseBean.addSuccess(responseBean);
+            IPage<TaShareChildRecord> result  = iTaShareChildRecordService.getList(pageNum, pageSize, groupActivityId, groupStatus, recordId, getOrgId(request));
+            responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareChildRecordList -=- {}",e.toString());
@@ -148,4 +158,50 @@ public class TaShareChildRecordController extends BaseController {
         }
         return responseBean;
     }
+
+    @GetMapping("/admin/taShareChildRecord/export")
+    public void gethelpRecordExport(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    @RequestParam(value = "recordId", required = false) Integer recordId,
+                                    @RequestParam(value = "groupStatus", required = false) Integer groupStatus,
+                                    @RequestParam(value = "groupActivityId", required = false) Integer groupActivityId) throws IOException {
+
+        ExcelWriter excelWriter = null;
+        try{
+            response.setContentType("application/octet-stream");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=拼团活动发起人.xlsx");
+
+            Integer orgId = getOrgId(request);
+
+            Integer pageCode = 0;
+            Integer pageSize = 100;
+            // 总页数
+            Integer pageCount = 0;
+
+            /**
+             * 拼团活动参与者
+             */
+            // 设置读取的class
+            excelWriter = EasyExcel.write(response.getOutputStream(), ShareChildRecordExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("拼团成功").build();
+            Integer count = iTaShareChildRecordService.getShareRecord(recordId, groupStatus);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<ShareChildRecordExport> publicList = null;
+            do {
+                publicList = iTaShareChildRecordService.getShareRecordExportList(pageCode * pageSize, pageSize, recordId, groupStatus, groupActivityId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+        }catch (IOException e){
+            e.printStackTrace();
+        }finally {
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+    }
+
 }

src/main/java/com/huiju/estateagents/controller/TaShareRecordController.java

@@ -1,8 +1,19 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+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.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.excel.ShareRecordFailExport;
+import com.huiju.estateagents.excel.ShareRecordSuccessExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.po.TaShareRecordPO;
 import com.huiju.estateagents.service.ITaShareRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,6 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -39,12 +53,21 @@ public class TaShareRecordController extends BaseController {
     public ResponseBean taShareSuccessRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @RequestParam(value ="phone",required = false) String phone,
-                                          @RequestParam(value ="status",required = false) Integer status,
+                                          @RequestParam(value ="groupStatus",required = false) Integer groupStatus,
+                                          @RequestParam(value ="groupActivityId",required = false) Integer groupActivityId,
                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareRecordService.getSuccessList(pageNum, pageSize, phone, status, getOrgId(request));
-            responseBean.addSuccess(responseBean);
+            //使用分页插件
+            IPage<TaShareRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(phone != null,"phone", phone);
+            queryWrapper.eq(groupStatus != null, "status", groupStatus);
+            queryWrapper.eq(groupActivityId != null, "group_activity_id", groupActivityId);
+            queryWrapper.eq(getOrgId(request) != null, "org_id", getOrgId(request));
+
+            IPage<TaShareRecord> result = iTaShareRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareRecordList -=- {}",e.toString());
@@ -63,12 +86,13 @@ public class TaShareRecordController extends BaseController {
     public ResponseBean taShareFailAndProcessingRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @RequestParam(value ="phone",required = false) String phone,
-                                          @RequestParam(value ="status",required = false) Integer status,
+                                          @RequestParam(value ="groupStatus",required = false) Integer groupStatus,
+                                          @RequestParam(value ="groupActivityId",required = false) Integer groupActivityId,
                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareRecordService.getFailAndProcessingList(pageNum, pageSize, phone, status, getOrgId(request));
-            responseBean.addSuccess(responseBean);
+            IPage<TaShareRecordPO> result = iTaShareRecordService.getFailAndProcessingList(pageNum, pageSize, phone, groupStatus, groupActivityId, getOrgId(request));
+            responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareRecordList -=- {}",e.toString());
@@ -185,4 +209,76 @@ public class TaShareRecordController extends BaseController {
         }
         return responseBean;
     }
+
+    @GetMapping("/admin/taShareRecord/export")
+    public void gethelpRecordExport(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    @RequestParam(value = "recordId", required = false) Integer recordId,
+                                    @RequestParam(value = "groupStatus", required = false) Integer groupStatus,
+                                    @RequestParam(value = "groupActivityId", required = false) Integer groupActivityId) throws IOException {
+
+        ExcelWriter excelWriter = null;
+        try{
+            response.setContentType("application/octet-stream");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=拼团活动发起人.xlsx");
+
+            if (groupStatus == 0){
+                Integer orgId = getOrgId(request);
+
+                Integer pageCode = 0;
+                Integer pageSize = 100;
+                // 总页数
+                Integer pageCount = 0;
+
+                /**
+                 * 拼团活动参与者
+                 */
+                // 设置读取的class
+                excelWriter = EasyExcel.write(response.getOutputStream(), ShareRecordSuccessExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+                // 设置 sheet, 同一个sheet只需要设置一次
+                WriteSheet writeSheet = EasyExcel.writerSheet("拼团成功").build();
+                Integer count = iTaShareRecordService.getShareRecord(recordId, groupStatus);
+                pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+                List<ShareRecordSuccessExport> publicList = null;
+                do {
+                    publicList = iTaShareRecordService.getShareRecordSuccessExportList(pageCode * pageSize, pageSize, recordId, groupStatus, groupActivityId);
+                    excelWriter.write(publicList, writeSheet);
+
+                    pageCode++;
+                } while (pageCode <= pageCount);
+            }else {
+                Integer orgId = getOrgId(request);
+
+                Integer pageCode = 0;
+                Integer pageSize = 100;
+                // 总页数
+                Integer pageCount = 0;
+
+                /**
+                 * 拼团活动参与者
+                 */
+                // 设置读取的class
+                excelWriter = EasyExcel.write(response.getOutputStream(), ShareRecordFailExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+                // 设置 sheet, 同一个sheet只需要设置一次
+                WriteSheet writeSheet = EasyExcel.writerSheet("拼团成功").build();
+                Integer count = iTaShareRecordService.getShareRecord(recordId, groupStatus);
+                pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+                List<ShareRecordFailExport> publicList = null;
+                do {
+                    publicList = iTaShareRecordService.getShareRecordFailExportList(pageCode * pageSize, pageSize, recordId, groupStatus, groupActivityId);
+                    excelWriter.write(publicList, writeSheet);
+
+                    pageCode++;
+                } while (pageCode <= pageCount);
+            }
+
+
+        }catch (IOException e){
+            e.printStackTrace();
+        }finally {
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+    }
 }

src/main/java/com/huiju/estateagents/entity/TaShareActivity.java

@@ -94,6 +94,11 @@ public class TaShareActivity implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 活动状态
+     */
+    private Integer activityStatus;
+
     /**
      * 首页推荐
      */

src/main/java/com/huiju/estateagents/excel/ShareChildRecordExport.java

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author admin
+ * @Title: ShareChildRecordExport
+ * @Description: TODO
+ * @date 2019/10/22
+ */
+
+@Data
+public class ShareChildRecordExport {
+
+    /**
+     * 创建时间 也是活动发起时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "活动时间", index = 2)
+    @DateTimeFormat("yyyy年MM月dd日")
+    private Date createTime;
+
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户名", index = 0)
+    private String nickName;
+
+}

src/main/java/com/huiju/estateagents/excel/ShareRecordFailExport.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author admin
+ * @Title: ShareRecordFailExport
+ * @Description: TODO
+ * @date 2019/10/22
+ */
+@Data
+public class ShareRecordFailExport {
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "拼团者", index = 0)
+    private String nickName;
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "拼团者手机号", index = 1)
+    private String phone;
+
+    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
+    @ExcelProperty(value = "拼团时间", index = 2)
+    private Date createTime;
+
+}

src/main/java/com/huiju/estateagents/excel/ShareRecordSuccessExport.java

@@ -0,0 +1,57 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author admin
+ * @Title: ShareRecordExport
+ * @Description: TODO
+ * @date 2019/10/22
+ */
+@Data
+public class ShareRecordSuccessExport {
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "拼团发起者", index = 0)
+    private String nickName;
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "拼团发起者手机号", index = 1)
+    private String phone;
+
+    /**
+     * 创建时间 也是拼团发起时间
+     */
+    @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
+    @ExcelProperty(value = "发起时间", index = 2)
+    private Date createTime;
+
+    /**
+     * 助力成功时间
+     */    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
+    @ExcelProperty(value = "成团时间", index = 3)
+    private Date endTime;
+
+    /**
+     * 核销状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "核销状态", index = 4)
+    private String verificationStatus;
+}

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.job;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.service.IHelpActivityService;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaShareActivityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author admin
+ * @Title: JudglActivityTimeJob
+ * @Description: TODO
+ * @date 2019/10/21
+ */
+@Component
+@Configuration
+@EnableScheduling
+public class JudglActivityTimeJob extends BaseController {
+
+    @Autowired
+    private ITaBuildingDynamicService iTaBuildingDynamicService;
+
+    @Autowired
+    private ITaShareActivityService iTaShareActivityService;
+
+    @Autowired
+    private IHelpActivityService iHelpActivityService;
+
+    /**
+     * 开启定时任务，每天12：30执行
+     */
+    @Scheduled(cron = "* 30 12 * * ?")
+    private void configureTasks() {
+//        iTaBuildingDynamicService.
+    }
+
+}

src/main/java/com/huiju/estateagents/mapper/TaShareChildRecordMapper.java

@@ -1,7 +1,9 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,5 +19,6 @@ import java.util.List;
  */
 @Mapper
 public interface TaShareChildRecordMapper extends BaseMapper<TaShareChildRecord> {
-    List<TaShareChildRecord> getList(@Param("groupActivityId") Integer groupActivityId, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaShareChildRecord> getList(IPage<TaShareChildRecord> pg, @Param("groupActivityId") Integer groupActivityId, @Param("status") Integer status, @Param("recordId") Integer recordId, @Param("orgId") Integer orgId);
+    List<ShareChildRecordExport> getShareRecordExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
 }

src/main/java/com/huiju/estateagents/mapper/TaShareRecordMapper.java

@@ -1,7 +1,11 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.excel.ShareRecordFailExport;
+import com.huiju.estateagents.excel.ShareRecordSuccessExport;
 import com.huiju.estateagents.po.TaShareRecordPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -18,6 +22,8 @@ import java.util.List;
  */
 @Mapper
 public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
-    List<TaShareRecord> recordSuccessList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
-    List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaShareRecord> recordSuccessList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaShareRecordPO> recordFailAndProcessingList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
+    List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
+    List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
 }

src/main/java/com/huiju/estateagents/service/ITaShareChildRecordService.java

@@ -1,8 +1,12 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +17,8 @@ import com.huiju.estateagents.entity.TaShareChildRecord;
  * @since 2019-10-18
  */
 public interface ITaShareChildRecordService extends IService<TaShareChildRecord> {
-    ResponseBean getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer orgId);
+    IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId);
     ResponseBean validateRule(TaShareChildRecord taShareChildRecord);
+    Integer getShareRecord(Integer recordId, Integer status);
+    List<ShareChildRecordExport> getShareRecordExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
 }

src/main/java/com/huiju/estateagents/service/ITaShareRecordService.java

@@ -1,8 +1,15 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.excel.ShareRecordFailExport;
+import com.huiju.estateagents.excel.ShareRecordSuccessExport;
+import com.huiju.estateagents.po.TaShareRecordPO;
+
+import java.util.List;
 
 
 /**
@@ -14,8 +21,11 @@ import com.huiju.estateagents.entity.TaShareRecord;
  * @since 2019-10-18
  */
 public interface ITaShareRecordService extends IService<TaShareRecord> {
-    ResponseBean getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
-    ResponseBean getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
+    IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
+    IPage<TaShareRecordPO> getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     ResponseBean validateRule(TaShareRecord taShareRecord);
     ResponseBean verifyCode(Integer activityId, String verifyCode);
+    Integer getShareRecord(Integer recordId, Integer status);
+    List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
+    List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java

@@ -1,13 +1,12 @@
 package com.huiju.estateagents.service.impl;
 
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaShareActivity;
-import com.huiju.estateagents.entity.TaShareChildRecord;
-import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
@@ -39,16 +38,9 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
     private TaShareRecordMapper tashareRecordmapper;
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer orgId) {
-        ResponseBean responseBean = new ResponseBean();
-        Page<TaShareRecord> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
-
-        List<TaShareChildRecord> list = taShareChildRecordMapper.getList(groupActivityId, status, orgId);
-        responseBean.addSuccess(list);
-
-        return responseBean;
+    public IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId) {
+        IPage<TaShareChildRecord> page = new Page<>(pageNum,pageSize);
+        return taShareChildRecordMapper.getList(page, groupActivityId, status, recordId, orgId);
     }
 
     @Override
@@ -84,4 +76,18 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
 
         return responseBean;
     }
+
+    @Override
+    public Integer getShareRecord(Integer recordId, Integer status) {
+        QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper= new QueryWrapper<>();
+        taShareChildRecordQueryWrapper.eq("record_id",recordId);
+        taShareChildRecordQueryWrapper.eq("status",status);
+        return taShareChildRecordMapper.selectCount(taShareChildRecordQueryWrapper);
+    }
+
+    @Override
+    public List<ShareChildRecordExport> getShareRecordExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId) {
+        List<ShareChildRecordExport> list= taShareChildRecordMapper.getShareRecordExportList(pageCode ,pageSize, recordId, status, groupActivityId);
+        return list;
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java

@@ -7,7 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.entity.TaShareChildRecord;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.excel.ShareRecordFailExport;
+import com.huiju.estateagents.excel.ShareRecordSuccessExport;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
@@ -37,29 +41,15 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     private TaShareRecordMapper taShareRecordMapper;
 
     @Override
-    public ResponseBean getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
-        ResponseBean responseBean = new ResponseBean();
-        Page<TaShareRecord> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
-
-        List<TaShareRecord> list = taShareRecordMapper.recordSuccessList(phone, status, orgId);
-        responseBean.addSuccess(list);
-
-        return responseBean;
+    public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
+        IPage<TaShareRecord> page = new Page<>(pageNum,pageSize);
+        return taShareRecordMapper.recordSuccessList(page, phone, status, orgId);
     }
 
     @Override
-    public ResponseBean getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
-        ResponseBean responseBean = new ResponseBean();
-        Page<TaShareRecord> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
-
-        List<TaShareRecordPO> list = taShareRecordMapper.recordFailAndProcessingList(phone, status, orgId);
-        responseBean.addSuccess(list);
-
-        return responseBean;
+    public IPage<TaShareRecordPO> getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId) {
+        IPage<TaShareRecord> page = new Page<>(pageNum,pageSize);
+        return taShareRecordMapper.recordFailAndProcessingList(page, phone, status, groupActivityId, orgId);
     }
 
     @Override
@@ -111,4 +101,26 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         responseBean.addSuccess("核销成功");
         return responseBean;
     }
+
+    @Override
+    public Integer getShareRecord(Integer recordId, Integer status) {
+        QueryWrapper<TaShareRecord> taShareRecordQueryWrapper= new QueryWrapper<>();
+        taShareRecordQueryWrapper.eq("record_id",recordId);
+        taShareRecordQueryWrapper.eq("status",status);
+        return taShareRecordMapper.selectCount(taShareRecordQueryWrapper);
+    }
+
+    @Override
+    public List<ShareRecordSuccessExport> getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId) {
+        List<ShareRecordSuccessExport> list= taShareRecordMapper.getShareRecordSuccessExportList(pageCode ,pageSize, recordId, status, groupActivityId);
+        list.forEach(e -> e.setVerificationStatus("0".equals(e.getVerificationStatus()) ? "未核销" : "已核销")
+        );
+        return list;
+    }
+
+    @Override
+    public List<ShareRecordFailExport> getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId) {
+        List<ShareRecordFailExport> list= taShareRecordMapper.getShareRecordFailExportList(pageCode ,pageSize, recordId, status, groupActivityId);
+        return list;
+    }
 }

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -15,7 +15,28 @@
             and t.status = #{status}
         </if>
         <if test="groupActivityId != null and groupActivityId != ''">
-            and t.groupActivityId = #{groupActivityId}
+            and t.group_Activity_Id = #{groupActivityId}
         </if>
+        <if test="recordId != null and recordId != ''">
+            and t.record_id = #{recordId}
+        </if>
+    </select>
+    <select id="getShareRecordExportList" resultType="com.huiju.estateagents.excel.ShareChildRecordExport">
+        select
+        t.nickname,
+        t.phone,
+        t.create_time
+        from ta_share_child_record t
+        where 1=1
+        <if test="status != null and status != ''">
+            and t.status = #{status}
+        </if>
+        <if test="recordId != null and recordId != ''">
+            and t.record_id = #{recordId}
+        </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_Activity_Id = #{groupActivityId}
+        </if>
+        limit #{pageCode}, #{pageSize}
     </select>
 </mapper>

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -27,7 +27,7 @@
         a.end_time as joinEndTime,
         a.verification_status as joinVerificationStatus,
         a.verification_code as joinVerificationCode
-        from ta_share_child_record a where where 1=1
+        from ta_share_child_record a where 1=1
         <if test="status !=null and status != ''">
             and a.status = #{status}
         </if>
@@ -40,12 +40,27 @@
     </select>
 
     <select id="recordFailAndProcessingList" resultType="com.huiju.estateagents.po.TaShareRecordPO">
-        select t.record_id, t.nickname, t.phone, t.create_time, a.group_buy_people, a.join_people  from ta_share_record t
+        select
+        t.record_id,
+        t.group_activity_id,
+        t.person_id,
+        t.nickname,
+        t.phone,
+        t.create_time,
+        a.group_buy_people,
+        a.join_people,
+        t.status,
+        t.verification_status,
+        t.verification_code
+        from ta_share_record t
         left join ta_share_activity a on t.group_activity_id = a.group_acticity_id
         where 1=1
         <if test="status !=null and status != ''">
             and t.status = #{status}
         </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_activity_id = #{groupActivityId}
+        </if>
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
@@ -53,4 +68,39 @@
             and t.phone = #{phone}
         </if> order by t.create_time desc
     </select>
+    <select id="getShareRecordSuccessExportList" resultType="com.huiju.estateagents.excel.ShareRecordSuccessExport">
+        select
+        t.nickname,
+        t.phone,
+        t.create_time,
+        t.end_time,
+        t.verification_status
+        from ta_share_record t
+        where 1=1
+        <!--<if test="status != null and status != ''">-->
+            and t.status = #{status}
+        <!--</if>-->
+        <if test="recordId != null and recordId != ''">
+            and t.record_id = #{recordId}
+        </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_Activity_Id = #{groupActivityId}
+        </if>
+        limit #{pageCode}, #{pageSize}
+    </select>
+    <select id="getShareRecordFailExportList" resultType="com.huiju.estateagents.excel.ShareRecordFailExport">
+        select
+        t.nickname,
+        t.phone,
+        t.create_time
+        from ta_share_record t
+        where 1=1 and t.status = #{status}
+        <if test="recordId != null and recordId != ''">
+            and t.record_id = #{recordId}
+        </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_Activity_Id = #{groupActivityId}
+        </if>
+        limit #{pageCode}, #{pageSize}
+    </select>
 </mapper>