Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -388,4 +388,7 @@ public class CommConstant {
  
 	//已参与微信端用
     public static final Integer ACTIVITY_STATUS_PARTNER = 3;
+    
+    //发起者
+	public static final String HELP_STATUS_INITIATE = "Initiate";
 }

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

@@ -9,16 +9,24 @@ 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.common.CommConstant;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
+import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.excel.PublicCustomerExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.service.IHelpActivityService;
+import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
 import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaPersonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
@@ -33,7 +41,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.crypto.Data;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -55,7 +65,15 @@ public class HelpActivityController extends BaseController {
 
     @Autowired
     private ITaBuildingService iTaBuildingService;
-
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+    
+    @Autowired
+    private IHelpInitiateRecordService helpInitiateRecordService;
+    
+    @Autowired
+    private IHelpRecordService helpRecordService;
 
     /**
      * 活动助力列表
@@ -246,11 +264,13 @@ public class HelpActivityController extends BaseController {
     @GetMapping("/admin/HelpInitiateRecordSucceed/export")
     public void getCustomerExportList(HttpServletRequest request,
                                       HttpServletResponse response,
-                                      @RequestParam(value = "tel", required = false) Integer tel,
-                                      @RequestParam(value = "helpActivityId", required = false) Integer helpActivityId) throws IOException {
+                                      @RequestParam(value = "tel", required = false) String tel,
+                                      @RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
+                                      @RequestParam(value = "code", required = false) int code) throws IOException {
+        //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
-        response.setHeader("Content-disposition", "attachment;filename=助力活动发起者.xlsx");
+        response.setHeader("Content-disposition", "attachment;filename=助力活动发起人.xlsx");
 
         Integer orgId = getOrgId(request);
 
@@ -263,20 +283,133 @@ public class HelpActivityController extends BaseController {
          * 助力活动发起者
          */
         // 设置读取的class
-        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpInitiateRecordSucceed.class).registerWriteHandler(new CustomCellWriteHandler()).build();
-        // 设置 sheet, 同一个sheet只需要设置一次
-        WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
-        Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
-        pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
-        List<HelpInitiateRecordSucceed> publicList = null;
-        do {
-            publicList = taHelpActivityService.getHelpInitiateRecordSucceedExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
-            excelWriter.write(publicList, writeSheet);
-
-            pageCode++;
-        } while (pageCode <= pageCount);
-
-        // finish 会帮忙关闭流
-        excelWriter.finish();
+
+        if (1==code){
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpInitiateRecordSucceed.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
+            Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpInitiateRecordSucceed> publicList = null;
+            do {
+                publicList = taHelpActivityService.getHelpInitiateRecordSucceedExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }else {
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpProceedAndFinish.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
+            Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpProceedAndFinish> publicList = null;
+            do {
+                publicList = taHelpActivityService.getHelpProceedAndFinishExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+
+    }
+
+    /**
+     * 导出数据 客户列表 公客/私客
+     *
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/admin/helpRecord/export")
+    public void gethelpRecordExport(HttpServletRequest request,
+                                      HttpServletResponse response,
+                                      @RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId) throws IOException {
+        //        response.setContentType("application/vnd.ms-excel");
+        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 excelWriter = EasyExcel.write(response.getOutputStream(), HelpRecordExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
+            Integer count = taHelpActivityService.getHelpRecord(helpRecordInitiateId);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpRecordExport> publicList = null;
+            do {
+                publicList = taHelpActivityService.getHelpRecordExportList(pageCode * pageSize, pageSize,helpRecordInitiateId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+    }
+    
+    @ApiOperation(value = "微信端根据id查询活动助力详情", notes = "根据id查询活动助力详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
+    })
+    @RequestMapping(value = "/wx/helpActivity/{helpActivityId}", method = RequestMethod.GET)
+    public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        Map<String,Object> map = new HashMap<>();
+        try {
+            //活动信息
+            HelpActivity helpActivity = taHelpActivityService.getById(helpActivityId);
+            map.put("helpActivity",helpActivity);
+            
+            //发起者信息
+            QueryWrapper<HelpInitiateRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+            queryWrapper.eq("persion_id",person.getPersonId());
+            queryWrapper.eq("org_id",orgId);
+            HelpInitiateRecord helpInitiateRecord = helpInitiateRecordService.getOne(queryWrapper);
+            if (null != helpInitiateRecord){
+                helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
+    
+                //助力者信息
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                helpRecordQueryWrapper.eq("org_id",orgId);
+                helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+                helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
+                List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+                
+                map.put("helpInitiateRecord",helpInitiateRecord);
+                map.put("helpRecordList",helpRecordList);
+            }
+            
+            responseBean.addSuccess(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("helpActivityDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
     }
 }

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

@@ -6,7 +6,9 @@ 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.HelpInitiateRecord;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
     * 助力活动发起人员记录  前端控制器
@@ -27,13 +33,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-10-17
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class HelpInitiateRecordController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(HelpInitiateRecordController.class);
 
     @Autowired
     public IHelpInitiateRecordService taHelpInitiateRecordService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
 
     /**
@@ -146,4 +155,66 @@ public class HelpInitiateRecordController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 微信端分页查询我发起的助力活动
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.GET)
+    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                 HttpServletRequest request){
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        ResponseBean responseBean = new ResponseBean();
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            //分页获取数据
+            responseBean = taHelpInitiateRecordService.getInitiateRecord(pageNum, pageSize,orgId,person.getPersonId());
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    
+    /**
+     * 微信端保存发起活动对象
+     * @param helpInitiateRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.POST)
+    public ResponseBean wxHelpInitiateRecordAdd(@RequestBody HelpInitiateRecord helpInitiateRecord,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            helpInitiateRecord.setPersionId(person.getPersonId());
+            helpInitiateRecord.setCreateDate(LocalDateTime.now());
+            helpInitiateRecord.setOrgId(orgId);
+            if (taHelpInitiateRecordService.save(helpInitiateRecord)){
+                responseBean.addSuccess(helpInitiateRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -6,7 +6,9 @@ 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.HelpRecord;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.IHelpRecordService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
     * 助力活动助力人员记录  前端控制器
@@ -27,13 +33,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-10-17
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class HelpRecordController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(HelpRecordController.class);
 
     @Autowired
     public IHelpRecordService taHelpRecordService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
 
     /**
@@ -146,4 +155,30 @@ public class HelpRecordController extends BaseController {
         }
         return responseBean;
     }
+    
+    
+    /**
+     * 微信端助力者助力
+     * @param helpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/helpRecord",method= RequestMethod.POST)
+    public ResponseBean wxHelpRecordAdd(@RequestBody HelpRecord helpRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            responseBean = taHelpRecordService.saveBooster(helpRecord,orgId,person);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java

@@ -19,6 +19,7 @@ import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -94,15 +96,15 @@ public class TaDrainageRecordController extends BaseController {
      */
     @RequestMapping(value="/admin/taDrainageRecord/export",method= RequestMethod.GET)
     public void taDrainageRecordList(@RequestParam(value = "drainageId") Integer drainageId,
-                                             @RequestParam(value = "startTime",required = false) String startTime,
-                                             @RequestParam(value = "endTime",required = false) String endTime,
+                                             @RequestParam(value = "startTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                             @RequestParam(value = "endTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
                                              HttpServletRequest request, HttpServletResponse response) throws IOException {
             //使用分页插件
             QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("drainage_id",drainageId);
             queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.gt(!StringUtils.isEmpty(startTime),"create_date",startTime);
-            queryWrapper.lt(!StringUtils.isEmpty(endTime),"create_date",endTime);
+            queryWrapper.gt(null != startTime,"create_date",startTime);
+            queryWrapper.lt(null != endTime,"create_date",endTime);
             queryWrapper.orderByDesc("create_date");
     
             List<TaDrainageRecord> list = iTaDrainageRecordService.list(queryWrapper);

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -76,7 +77,7 @@ public class HelpActivity implements Serializable {
     /**
      * 助力次数 0不限制，大于零表示限制次数
      */
-    private String helpNum;
+    private Integer helpNum;
 
     /**
      * 状态 0未开始，1进行中，2已结束
@@ -112,5 +113,11 @@ public class HelpActivity implements Serializable {
      * 活动状态
      */
     private int activityStatus;
+    
+    /**
+     * Initiate 发起者  Booster 助力者
+     */
+    @TableField(exist = false)
+    private String helpStatus;
 
 }

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

@@ -109,4 +109,16 @@ public class HelpInitiateRecord implements Serializable {
      */
     @TableField(exist = false)
     private int persionNumCount;
+    
+    @TableField(exist = false)
+    private String title;
+    
+    @TableField(exist = false)
+    private String img;
+    
+    @TableField(exist = false)
+    private Integer activityStatus;
+    
+    @TableField(exist = false)
+    private LocalDateTime endDate;
 }

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

@@ -1,6 +1,7 @@
 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 com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -12,6 +13,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -24,14 +26,13 @@ import java.time.LocalDateTime;
 @Data
 public class HelpInitiateRecordSucceed {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 创建时间 也是助力发起时间
      */
     @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
     @ExcelProperty(value = "发起时间", index = 2)
-    private LocalDateTime createDate;
+    private Date createDate;
 
     /**
      * 人员姓名
@@ -53,8 +54,9 @@ public class HelpInitiateRecordSucceed {
      * 创建时间 也是助力发起时间
      */
     @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
     @ExcelProperty(value = "助力成功时间", index = 3)
-    private LocalDateTime succeedDate;
+    private Date succeedDate;
 
     /**
      * 核销状态

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

@@ -1,6 +1,7 @@
 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 com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -12,6 +13,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -24,21 +26,14 @@ import java.time.LocalDateTime;
 @Data
 public class HelpProceedAndFinish {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 创建时间 也是助力发起时间
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "发起时间", index = 1)
-    private LocalDateTime createDate;
+    @ExcelProperty(value = "发起时间", index = 2)
+    @DateTimeFormat("yyyy年MM月dd日")
+    private Date createDate;
 
-    /**
-     * 人员姓名
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "助力成功", index = 0)
-    private String name;
 
     /**
      * 人员手机号
@@ -48,12 +43,10 @@ public class HelpProceedAndFinish {
     private String phone;
 
     /**
-     * 助力成功时间
-     */    /**
-     * 创建时间 也是助力发起时间
+     * 人员姓名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "助力成功时间", index = 3)
-    private LocalDateTime succeedDate;
+    @ExcelProperty(value = "发起者", index = 0)
+    private String name;
 
 }

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

@@ -0,0 +1,44 @@
+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;
+
+/**
+ * <p>
+ * 助力活动发起人员记录
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Data
+public class HelpRecordExport {
+
+    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "助力时间", index = 2)
+    @DateTimeFormat("yyyy年MM月dd日")
+    private Date createDate;
+
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户名", index = 0)
+    private String name;
+
+}

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

@@ -4,8 +4,10 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,5 +40,19 @@ public interface HelpInitiateRecordMapper extends BaseMapper<HelpInitiateRecord>
      * @param tel
      * @param helpActivityId
      */
+
+    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("tel") String tel, @Param("helpActivityId") Integer helpActivityId);
+
+    List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(@Param("pageCode") int i, @Param("pageSize")Integer pageSize, @Param("tel")String tel, @Param("helpActivityId")Integer helpActivityId);
+
     List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("tel") Integer tel, @Param("helpActivityId") Integer helpActivityId);
+	
+	/**
+	 * 获取我的助力列表
+	 * @param pg
+	 * @param orgId
+	 * @param personId
+	 * @return
+	 */
+	List<HelpInitiateRecord> getInitiateRecordList(Page<HelpInitiateRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
 }

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

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.excel.HelpRecordExport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 助力活动助力人员记录  Mapper 接口
@@ -20,4 +23,13 @@ import org.apache.ibatis.annotations.Param;
 public interface HelpRecordMapper extends BaseMapper<HelpRecord> {
 
     IPage<HelpRecord> taHelpRecordDetails(IPage<HelpInitiateRecord> pg, @Param("helpRecordInitiateId") Integer helpRecordInitiateId);
+
+    /**
+     * 助力记录者
+     * @param i
+     * @param pageSize
+     * @param helpRecordInitiateId
+     * @return
+     */
+    List<HelpRecordExport> getHelpRecordExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("helpRecordInitiateId") Integer helpRecordInitiateId);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
+import com.huiju.estateagents.excel.HelpRecordExport;
 
 import javax.xml.crypto.Data;
 import java.util.List;
@@ -75,7 +77,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param helpActivityId
      * @return
      */
-    Integer getHelpInitiateRecordSucceed(Integer tel, Integer helpActivityId);
+    Integer getHelpInitiateRecordSucceed(String tel, Integer helpActivityId);
 
     /**
      * 导出助力成功数据
@@ -85,5 +87,31 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param helpActivityId
      * @return
      */
-    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, Integer tel, Integer helpActivityId);
+    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, String tel, Integer helpActivityId);
+
+    /**
+     * 导出助力成功或者失败
+     * @param i
+     * @param pageSize
+     * @param tel
+     * @param helpActivityId
+     * @return
+     */
+    List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId);
+
+    /**
+     * 查询当前导出数据的总数
+     * @param helpRecordInitiateId
+     * @return
+     */
+    Integer getHelpRecord(Integer helpRecordInitiateId);
+
+    /**
+     * 查询当前助力者记录
+     * @param i
+     * @param pageSize
+     * @param helpRecordInitiateId
+     * @return
+     */
+    List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId);
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 
 /**
@@ -12,5 +13,14 @@ import com.huiju.estateagents.entity.HelpInitiateRecord;
  * @since 2019-10-17
  */
 public interface IHelpInitiateRecordService extends IService<HelpInitiateRecord> {
-
+	
+	/**
+	 * 分页获取我的助力数据
+	 * @param pageNum
+	 * @param pageSize
+	 * @param orgId
+	 * @param personId
+	 * @return
+	 */
+	ResponseBean getInitiateRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId);
 }

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

@@ -1,7 +1,9 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaPerson;
 
 /**
  * <p>
@@ -12,5 +14,13 @@ import com.huiju.estateagents.entity.HelpRecord;
  * @since 2019-10-17
  */
 public interface IHelpRecordService extends IService<HelpRecord> {
-
+	
+	/**
+	 * 助力者助力
+	 * @param helpRecord
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean saveBooster(HelpRecord helpRecord, Integer orgId, TaPerson person);
 }

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

@@ -5,10 +5,13 @@ 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.common.StringUtils;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
+import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
@@ -141,16 +144,35 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public Integer getHelpInitiateRecordSucceed(Integer tel, Integer helpActivityId) {
+    public Integer getHelpInitiateRecordSucceed(String tel, Integer helpActivityId) {
         QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery= new QueryWrapper<>();
         helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
-        helpInitiateRecordQuery.eq("phone",tel);
+        helpInitiateRecordQuery.eq(!StringUtils.isEmpty(tel), "phone",tel);
         return helpInitiateRecordMapper.selectCount(helpInitiateRecordQuery);
     }
 
     @Override
-    public List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, Integer tel, Integer helpActivityId) {
+    public List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, String tel, Integer helpActivityId) {
          List<HelpInitiateRecordSucceed> lsit= helpInitiateRecordMapper.getHelpInitiateRecordSucceedExportList(i,pageSize,tel,helpActivityId);
         return lsit;
     }
+
+    @Override
+    public List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId) {
+        List<HelpProceedAndFinish> lsit= helpInitiateRecordMapper.getHelpProceedAndFinishExportList(i,pageSize,tel,helpActivityId);
+        return lsit;
+    }
+
+    @Override
+    public Integer getHelpRecord(Integer helpRecordInitiateId) {
+        QueryWrapper<HelpRecord> helpInitiateRecordQuery= new QueryWrapper<>();
+        helpInitiateRecordQuery.eq("help_record_initiate_id",helpRecordInitiateId);
+        return helpRecordMapper.selectCount(helpInitiateRecordQuery);
+    }
+
+    @Override
+    public List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId) {
+        List<HelpRecordExport> lsit= helpRecordMapper.getHelpRecordExportList(i,pageSize,helpRecordInitiateId);
+        return lsit;
+    }
 }

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

@@ -1,11 +1,17 @@
 package com.huiju.estateagents.service.impl;
 
+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.HelpInitiateRecord;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 助力活动发起人员记录  服务实现类
@@ -16,5 +22,23 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class HelpInitiateRecordServiceImpl extends ServiceImpl<HelpInitiateRecordMapper, HelpInitiateRecord> implements IHelpInitiateRecordService {
-
+	
+	@Autowired
+	private HelpInitiateRecordMapper helpInitiateRecordMapper;
+	/**
+	 * 分页获取我的助力数据
+	 *
+	 * @param pageNum
+	 * @param pageSize
+	 * @param orgId
+	 * @param personId
+	 * @return
+	 */
+	@Override
+	public ResponseBean getInitiateRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId) {
+		Page<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
+		List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.getInitiateRecordList(pg,orgId,personId);
+		pg.setRecords(helpInitiateRecordList);
+		return ResponseBean.success(pg);
+	}
 }

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

@@ -1,11 +1,23 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.HelpActivityMapper;
+import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.service.IHelpRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 助力活动助力人员记录  服务实现类
@@ -16,5 +28,76 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRecord> implements IHelpRecordService {
-
+	
+	@Autowired
+	private HelpActivityMapper helpActivityMapper;
+	
+	@Autowired
+	private HelpInitiateRecordMapper helpInitiateRecordMapper;
+	
+	@Autowired
+	private HelpRecordMapper helpRecordMapper;
+	
+	/**
+	 * 助力者助力
+	 *
+	 * @param helpRecord
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean saveBooster(HelpRecord helpRecord, Integer orgId, TaPerson person) {
+		//查看是否助力成功
+		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
+		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
+			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		
+		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
+		//是否助力成功
+		if (helpActivity.getEnlistNum() >= helpActivity.getPersionNum()){
+			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
+			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		//查看每个人的助力次数
+		Integer helpNum = helpActivity.getHelpNum();
+		
+		QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("org_id",orgId);
+		queryWrapper.eq("help_activity_id",helpRecord.getHelpActivityId());
+		queryWrapper.eq("persion_id",person.getPersonId());
+		if (null != helpNum && helpNum >= 0){
+			//查看这个人是否助力过，和助力了几次
+			List<HelpRecord> helpRecords = helpRecordMapper.selectList(queryWrapper);
+			if (helpRecords.size() >= helpNum){
+				return ResponseBean.error("助力次数达到上限", ResponseBean.ERROR_UNAVAILABLE);
+			}
+		}
+		//查看是否助力过这个人
+		queryWrapper.eq("help_record_initiate_id",helpRecord.getHelpRecordInitiateId());
+		List<HelpRecord> helpRecordList = helpRecordMapper.selectList(queryWrapper);
+		if (helpRecordList.size() > 0){
+			return ResponseBean.error("您已经助力过了,无需重复助力", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		//反更新在入库
+		helpActivity.setEnlistNum(helpActivity.getEnlistNum()+1);
+		helpActivityMapper.updateById(helpActivity);
+		//插入数据
+		helpRecord.setOrgId(orgId);
+		helpRecord.setCreateDate(LocalDateTime.now());
+		helpRecord.setPersionId(person.getPersonId());
+		helpRecordMapper.insert(helpRecord);
+		if (helpActivity.getEnlistNum()+1 == helpActivity.getPersionNum()){
+			//发送微信模板消息所有人都发送--todo
+			
+			//生成核销码
+			helpInitiateRecord.setVerification(helpInitiateRecord.getHelpActivityId()+System.currentTimeMillis());
+		}
+		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
+		helpInitiateRecordMapper.updateById(helpInitiateRecord);
+		return ResponseBean.success(helpRecord);
+	}
 }

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -27,11 +27,40 @@
 
     <select id="getHelpInitiateRecordSucceedExportList" resultType="com.huiju.estateagents.excel.HelpInitiateRecordSucceed">
     SELECT
-   b.*，
-    if(b.verification_status = 0, '未核销', if(b.verification_status = 1, '已核销', '未知')) as sex
-    from ta_help_initiate_record
-    where help_activity_id =  #{helpActivityId}
+    b.name as name,
+    b.create_date as createDate,
+    b.phone as phone,
+    b.succeed_date as succeedDate,
+    if(b.verification_status = 0, '未核销', if(b.verification_status = 1, '已核销', '未知')) as verificationStatus
+    from ta_help_initiate_record b
+    where b.help_activity_id =  #{helpActivityId}
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}
     </select>
+
+    <select id="getHelpProceedAndFinishExportList" resultType="com.huiju.estateagents.excel.HelpProceedAndFinish">
+    SELECT
+    b.name as name,
+    b.create_date as createDate,
+    b.phone as phone
+    from ta_help_initiate_record b
+    where b.help_activity_id =  #{helpActivityId}
+     order by b.create_date desc
+     limit #{pageCode}, #{pageSize}
+    </select>
+
+    <select id="getInitiateRecordList" resultType="com.huiju.estateagents.entity.HelpInitiateRecord">
+      SELECT
+        t.*,
+        a.title,
+        a.img,
+        a.activity_status,
+        a.end_date
+    FROM
+        ta_help_initiate_record t
+        LEFT JOIN ta_help_activity a ON t.help_activity_id = a.help_activity_id
+    WHERE
+        t.org_id = #{orgId}
+        AND t.persion_id = #{personId}
+    </select>
 </mapper>

src/main/resources/mapper/HelpRecordMapper.xml

@@ -5,4 +5,15 @@
     select * from ta_help_record
     where help_record_initiate_id =#{helpRecordInitiateId}
 </select>
+
+    <select id="getHelpRecordExportList" resultType="com.huiju.estateagents.excel.HelpRecordExport">
+    SELECT
+    b.name as name,
+    b.create_date as createDate,
+    b.phone as phone
+    from ta_help_record b
+    where b.help_activity_id =  #{helpActivityId}
+     order by b.create_date desc
+     limit #{pageCode}, #{pageSize}
+    </select>
 </mapper>