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

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

@@ -0,0 +1,49 @@
+package com.huiju.estateagents.activity.controller;
+
+import com.huiju.estateagents.activity.service.ActivityServiceI;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "所有活动", tags = "所有活动")
+public class ActivityController extends BaseController {
+	
+	@Autowired
+	private ActivityServiceI activityService;
+	
+	@Autowired
+	private ITaPersonService taPersonService;
+	
+	@RequestMapping(value = "/wx/activity/list", method = RequestMethod.GET)
+	public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+	                                           @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);
+		responseBean = activityService.getActivityList(pageNumber,pageSize,orgId,person);
+		
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/activity/entity/Activity.java

@@ -0,0 +1,32 @@
+package com.huiju.estateagents.activity.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@Data
+public class Activity {
+
+	private Integer id;
+	
+	private String mainImg;
+	
+	private String title;
+	
+	private LocalDateTime startDate;
+	
+	private LocalDateTime endDate;
+	
+	private Integer weight;
+	
+	/**
+	 *  0：进行中 1：未开始 2：已结束 3：已参与（微信端用）
+	 */
+	private Integer activityStatus;
+	
+	private String type;
+}

src/main/java/com/huiju/estateagents/activity/mapper/ActivityMapper.java

@@ -0,0 +1,13 @@
+package com.huiju.estateagents.activity.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.activity.entity.Activity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ActivityMapper {
+	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status);
+}

src/main/java/com/huiju/estateagents/activity/service/ActivityServiceI.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.activity.service;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+
+public interface ActivityServiceI {
+	
+	/**
+	 * 获取三个活动
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person);
+}

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -0,0 +1,95 @@
+package com.huiju.estateagents.activity.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.activity.entity.Activity;
+import com.huiju.estateagents.activity.mapper.ActivityMapper;
+import com.huiju.estateagents.activity.service.ActivityServiceI;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
+import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@Service
+public class ActivityServiceImpl implements ActivityServiceI {
+	
+	@Autowired
+	private ActivityMapper activityMapper;
+	
+	@Autowired
+	private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+	
+	@Autowired
+	private TaShareRecordMapper taShareRecordMapper;
+	
+	@Autowired
+	private HelpRecordMapper helpRecordMapper;
+	
+	/**
+	 * 获取三个活动
+	 *
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person) {
+		//查询是否报名了普通活动
+		QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("org_id",orgId);
+		queryWrapper.eq("person_id",person.getPersonId());
+		List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+		//查询是否报名了分享活动
+		QueryWrapper<TaShareRecord> taShareRecordQueryWrapper = new QueryWrapper<>();
+		taShareRecordQueryWrapper.eq("org_id",orgId);
+		taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
+		List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
+		//判断是否报名了助力活动
+		QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+		helpRecordQueryWrapper.eq("org_id",orgId);
+		helpRecordQueryWrapper.eq("person_id",person.getPersonId());
+		List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
+		
+		//分页获取全部数据
+		Page pg = new Page(pageNumber,pageSize);
+		List<Activity> list = activityMapper.getActivityList(pg,orgId, CommConstant.STATUS_NORMAL);
+		list.forEach(e -> {
+			if (e.getType().equals("dynamic")){
+				taActivityDynamicEnlists.forEach(dynamic -> {
+					if (e.getId().equals(dynamic.getDynamicId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+			}else if (e.getType().equals("share")){
+				taShareRecords.forEach(share -> {
+					if (e.getId().equals(share.getGroupActivityId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+			}else if (e.getType().equals("help")){
+				helpRecords.forEach(help -> {
+					if (e.getId().equals(help.getHelpActivityId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+			}
+		});
+		pg.setRecords(list);
+		return ResponseBean.success(pg);
+	}
+}

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

@@ -385,4 +385,7 @@ public class CommConstant {
 	
 	
 	public static final String GD_KEY = "c9fc664a9030aed2ec2183508c2ca476";
+ 
+	//已参与微信端用
+    public static final Integer ACTIVITY_STATUS_PARTNER = 3;
 }

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

@@ -1,5 +1,8 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,8 +10,13 @@ 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.HelpActivity;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+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.ITaBuildingService;
 import io.swagger.annotations.Api;
@@ -19,16 +27,13 @@ import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.xml.crypto.Data;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -54,72 +59,74 @@ public class HelpActivityController extends BaseController {
 
     /**
      * 活动助力列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
     @ApiOperation(value = "活动助力列表", notes = "活动助力列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题"),
-            @ApiImplicitParam(dataTypeClass = Data.class, name = "startDate", paramType = "query",value = "活动开始时间"),
-            @ApiImplicitParam(dataTypeClass = Data.class, name = "endDate", paramType = "query",value = "活动结束时间"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "活动状态")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query", value = "项目"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query", value = "标题"),
+            @ApiImplicitParam(dataTypeClass = Data.class, name = "startDate", paramType = "query", value = "活动开始时间"),
+            @ApiImplicitParam(dataTypeClass = Data.class, name = "endDate", paramType = "query", value = "活动结束时间"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "activityStatus", paramType = "query", value = "活动状态")
     })
-    @RequestMapping(value="admin/helpActivity/list",method= RequestMethod.GET)
-    public ResponseBean helpActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value ="cityId",required = false) Integer cityId,
-                                         @RequestParam(value ="buildingId",required = false) String buildingId,
-                                         @RequestParam(value ="title",required = false) String title,
-                                         @RequestParam(value ="startDate",required = false) Data startDate,
-                                         @RequestParam(value ="endDate",required = false) Data endDate,
-                                         @RequestParam(value ="status",required = false) Integer status,
-                                         HttpServletRequest request){
+    @RequestMapping(value = "admin/helpActivity/list", method = RequestMethod.GET)
+    public ResponseBean helpActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "cityId", required = false) Integer cityId,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "title", required = false) String title,
+                                         @RequestParam(value = "startDate", required = false) Data startDate,
+                                         @RequestParam(value = "endDate", required = false) Data endDate,
+                                         @RequestParam(value = "activityStatus", required = false) Integer activityStatus,
+                                         HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean  helpActivityList= taHelpActivityService.helpActivityList(pageNum,pageSize,cityId,buildingId,title,startDate,endDate,status,orgId);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
         return helpActivityList;
     }
 
     @ApiOperation(value = "活动助力新增", notes = "活动助力新增")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataType = "HelpActivity", name = "parameter", paramType = "body",value = "当前对象")
+            @ApiImplicitParam(dataType = "HelpActivity", name = "parameter", paramType = "body", value = "当前对象")
     })
-    @RequestMapping(value="admin/helpActivity/add",method= RequestMethod.POST)
-    public ResponseBean helpActivityAdd(@RequestBody String parameter,HttpServletRequest request){
+    @RequestMapping(value = "admin/helpActivity/add", method = RequestMethod.POST)
+    public ResponseBean helpActivityAdd(@RequestBody String parameter, HttpServletRequest request) {
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
         helpActivity.setCityId(cityId);
         // 活动暂且定位为未开始
-        helpActivity.setStatus(0);
+        helpActivity.setActivityStatus(0);
         helpActivity.setWeight(0);
         helpActivity.setIsMain(false);
-        taHelpActivityService.helpActivityAdd(helpActivity,orgId);
+        taHelpActivityService.helpActivityAdd(helpActivity, orgId);
         return responseBean;
     }
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/helpActivity/{id}", method= RequestMethod.DELETE)
-    public ResponseBean helpActivityDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/helpActivity/{id}", method = RequestMethod.DELETE)
+    public ResponseBean helpActivityDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(taHelpActivityService.removeById(id)){
+            if (taHelpActivityService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("helpActivityDelete -=- {}",e.toString());
+            logger.error("helpActivityDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -128,10 +135,10 @@ public class HelpActivityController extends BaseController {
 
     @ApiOperation(value = "活动助力修改", notes = "活动助力修改")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = HelpActivity.class, name = "helpActivity", paramType = "body",value = "当前对象"),
+            @ApiImplicitParam(dataTypeClass = HelpActivity.class, name = "helpActivity", paramType = "body", value = "当前对象"),
     })
-    @RequestMapping(value="admin/helpActivity/update",method= RequestMethod.PUT)
-    public ResponseBean helpActivityUpdate(@RequestBody String parameter){
+    @RequestMapping(value = "admin/helpActivity/update", method = RequestMethod.PUT)
+    public ResponseBean helpActivityUpdate(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
         helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
@@ -141,89 +148,135 @@ public class HelpActivityController extends BaseController {
 
     @ApiOperation(value = "根据id查询活动助力详情", notes = "根据id查询活动助力详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "query",value = "活动状态")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "query", value = "活动状态")
     })
-    @RequestMapping(value="admin/helpActivity/details",method= RequestMethod.GET)
-    public ResponseBean helpActivityGet( @RequestParam(value ="helpActivityId",required = false) Integer helpActivityId){
+    @RequestMapping(value = "admin/helpActivity/details", method = RequestMethod.GET)
+    public ResponseBean helpActivityGet(@RequestParam(value = "helpActivityId", required = false) Integer helpActivityId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taHelpActivityService.getById(helpActivityId));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("helpActivityDelete -=- {}",e.toString());
+            logger.error("helpActivityDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
+
     @ApiOperation(value = "置顶和推首页", notes = "置顶和推首页")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, name = "parameter", paramType = "body",value = "status:0置顶操作，1推首页操作,2结束活动操作,helpActivityId:助力ID")
+            @ApiImplicitParam(dataTypeClass = String.class, name = "parameter", paramType = "body", value = "status:0置顶操作，1推首页操作,2结束活动操作,helpActivityId:助力ID")
     })
-    @RequestMapping(value="admin/top/update",method= RequestMethod.POST)
-    public ResponseBean top( @RequestBody String parameter){
+    @RequestMapping(value = "admin/top/update", method = RequestMethod.POST)
+    public ResponseBean top(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        JSONObject object= JSONObject.parseObject(parameter);
+        JSONObject object = JSONObject.parseObject(parameter);
         // 根据状态值判断是置顶还是推首页的操作
-        String  status= object.getString("status");
-        String  helpActivityId= object.getString("helpActivityId");
+        String activityStatus = object.getString("status");
+        String helpActivityId = object.getString("helpActivityId");
         HelpActivity helpActivity = taHelpActivityService.getById(helpActivityId);
         // 置顶操作
-        if (status.equals("0")) {
-            helpActivity.setWeight(Integer.valueOf(helpActivity.getWeight().equals(0)? 1:0));
+        if (activityStatus.equals("0")) {
+            helpActivity.setWeight(Integer.valueOf(helpActivity.getWeight().equals(0) ? 1 : 0));
         }
         // 推首页
-        if (status.equals("1")){
-            helpActivity.setIsMain(true==helpActivity.getIsMain()?false:true);
+        if (activityStatus.equals("1")) {
+            helpActivity.setIsMain(true == helpActivity.getIsMain() ? false : true);
         }
         // 结束活动操作
-        if (status.equals("2")){
-            helpActivity.setStatus(2);
+        if (activityStatus.equals("2")) {
+            helpActivity.setActivityStatus(2);
         }
         Boolean isA = taHelpActivityService.updateById(helpActivity);
         responseBean.addSuccess(isA);
         return responseBean;
     }
+
     @ApiOperation(value = "助力记录", notes = "助力记录")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "helpActivityId", paramType = "query",value = "助力ID"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "status: 0助力成功，1进行中，2助力失败")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpActivityId", paramType = "query", value = "助力ID"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query", value = "status: helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败")
     })
-    @RequestMapping(value="admin/helpRecord",method= RequestMethod.GET)
-    public ResponseBean helpRecord(@RequestParam(value ="helpActivityId",required = false) Integer helpActivityId,
-                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                   @RequestParam(value ="status",required = false) String status){
-        ResponseBean helpRecord = taHelpActivityService.helpRecord(helpActivityId,status, pageNum, pageSize);
+    @RequestMapping(value = "admin/helpRecord", method = RequestMethod.GET)
+    public ResponseBean helpRecord(@RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
+                                   @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value = "status", required = false) String status) {
+        ResponseBean helpRecord = taHelpActivityService.helpRecord(helpActivityId, status, pageNum, pageSize);
         return helpRecord;
     }
 
     @ApiOperation(value = "助力人详情", notes = "助力人详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query",value = "发起助力ID"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query", value = "发起助力ID"),
     })
-    @RequestMapping(value="admin/taHelpRecord/details",method= RequestMethod.GET)
-    public ResponseBean taHelpRecordDetails(@RequestParam(value ="helpRecordInitiateId",required = false) Integer helpRecordInitiateId,
-                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "admin/taHelpRecord/details", method = RequestMethod.GET)
+    public ResponseBean taHelpRecordDetails(@RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId,
+                                            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean helpRecord = taHelpActivityService.taHelpRecordDetails(helpRecordInitiateId, pageNum, pageSize);
         return helpRecord;
     }
 
     @ApiOperation(value = "核销", notes = "核销")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query",value = "发起助力ID"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "verifyCode", paramType = "query",value = "核销码"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query", value = "发起助力ID"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "verifyCode", paramType = "query", value = "核销码"),
     })
-    @RequestMapping(value="admin/helpInitiateRecordVerify/",method= RequestMethod.POST)
-    public ResponseBean helpInitiateRecordVerify(@RequestParam(value ="helpRecordInitiateId",required = false) Integer helpRecordInitiateId,
-                                                 @RequestParam(value ="verifyCode",required = false) Integer verifyCode){
-        ResponseBean helpRecord = taHelpActivityService.helpInitiateRecordVerify(helpRecordInitiateId,verifyCode);
+    @RequestMapping(value = "admin/helpInitiateRecordVerify", method = RequestMethod.POST)
+    public ResponseBean helpInitiateRecordVerify(@RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId,
+                                                 @RequestParam(value = "verifyCode", required = false) Integer verifyCode) {
+        ResponseBean helpRecord = taHelpActivityService.helpInitiateRecordVerify(helpRecordInitiateId, verifyCode);
         return helpRecord;
     }
-}
+
+    /**
+     * 导出数据 客户列表 公客/私客
+     *
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    @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 {
+        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(), 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();
+    }
+}

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

@@ -285,7 +285,10 @@ public class TaBuildingDynamicController extends BaseController {
         dynamic.setOrgId(getOrgId(request));
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
-        dynamic.setStatus(1);
+        //发布状态
+        dynamic.setStatus(0);
+        //活动状态
+        dynamic.setActivityStatus(1);
 //        dynamic.setDynamicId(idGen.nextId()+"");
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
@@ -436,7 +439,8 @@ public class TaBuildingDynamicController extends BaseController {
         if ("1".equals(top)) {
             dynamic.setCreateDate(LocalDateTime.now());
         } else {
-            dynamic.setIsEnlist(2);
+            dynamic.setIsEnlist(0);
+            dynamic.setActivityStatus(2);
         }
         iBuildingDynamicService.update(dynamic, taBuildingDynamic);
         responseBean.addSuccess("成功");

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

@@ -1,25 +1,19 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.service.ITaShareActivityService;
+import io.swagger.models.auth.In;
 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;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -65,15 +59,18 @@ public class TaShareActivityController extends BaseController {
 
     /**
      * 保存对象
-     * @param taShareActivity 实体对象
+     * @param parameter 实体对象json格式
      * @return
      */
     @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.POST)
-    public ResponseBean taShareActivityAdd(@RequestBody TaShareActivity taShareActivity, HttpServletRequest request){
+    public ResponseBean taShareActivityAdd(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             taShareActivity.setOrgId(getOrgId(request));
             taShareActivity.setStatus(0);
+            taShareActivity.setSort(false);
+            taShareActivity.setWeight(0);
             if (iTaShareActivityService.save(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -111,15 +108,14 @@ public class TaShareActivityController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
-     * @param taShareActivity 实体对象
+     * @param  parameter 实体对象json
      * @return
      */
-    @RequestMapping(value="/admin/taShareActivity/{id}",method= RequestMethod.PUT)
-    public ResponseBean taShareActivityUpdate(@PathVariable Integer id,
-                                        @RequestBody TaShareActivity taShareActivity){
+    @RequestMapping(value="/admin/taShareActivity/update",method= RequestMethod.PUT)
+    public ResponseBean taShareActivityUpdate(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -155,13 +151,13 @@ public class TaShareActivityController extends BaseController {
      * @param id
      * @return
      */
-    @RequestMapping(value="/admin/taShareActivity/finish/{groupActicityId}",method= RequestMethod.PUT)
-    public ResponseBean finishShareActicity(@PathVariable Integer groupActicityId){
+    @RequestMapping(value="/admin/taShareActivity/finish/{id}",method= RequestMethod.PUT)
+    public ResponseBean finishShareActicity(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = new TaShareActivity();
             taShareActivity.setStatus(2);
-            taShareActivity.setGroupActicityId(groupActicityId);
+            taShareActivity.setGroupActicityId(id);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -185,10 +181,10 @@ public class TaShareActivityController extends BaseController {
     public  ResponseBean buildingDynamicWeight(@RequestBody TaShareActivity taShareActivity, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         if (taShareActivity.getWeight() != null){
-            taShareActivity.setWeight(taShareActivity.getWeight());
+            taShareActivity.setWeight(taShareActivity.getWeight() == 0 ? 1 : 0);
         }
         if (taShareActivity.getSort() != null){
-            taShareActivity.setSort(taShareActivity.getSort());
+            taShareActivity.setSort(taShareActivity.getSort() == true ? false : true);
         }
 
         QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();

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

@@ -5,6 +5,7 @@ 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.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import org.slf4j.Logger;
@@ -47,13 +48,18 @@ public class TaDrainageController extends BaseController {
      */
     @RequestMapping(value="/admin/taDrainage",method= RequestMethod.GET)
     public ResponseBean taDrainageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="drainageId",required = false) Integer drainageId,
+                                       @RequestParam(value ="name",required = false) String name,
+                                       HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
+            queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);

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

@@ -1,13 +1,21 @@
 package com.huiju.estateagents.drainage.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 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.google.gson.JsonObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +28,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -72,6 +86,68 @@ public class TaDrainageRecordController extends BaseController {
         }
         return responseBean;
     }
+    
+    
+    /**
+     * 导出数据
+     * @return
+     */
+    @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,
+                                             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.orderByDesc("create_date");
+    
+            List<TaDrainageRecord> list = iTaDrainageRecordService.list(queryWrapper);
+            List<List<String>> resList = new ArrayList<List<String>>();
+            
+            //构造表头
+            if (list.size() > 0) {
+                List<String> headerList = new ArrayList<>();
+                TaDrainageRecord taDrainageRecord = list.get(0);
+                headerList.add("提交时间");
+                JSONArray arr= JSONArray.parseArray(taDrainageRecord.getContent());
+                arr.forEach(e -> {
+                    JSONObject jsonObject = JSONObject.parseObject(e.toString());
+                    headerList.add(jsonObject.getString("label"));
+                });
+                resList.add(headerList);
+            }
+            
+            //构造表数据
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+            list.forEach(e -> {
+                List<String> bodyList = new ArrayList<>();
+                bodyList.add(e.getCreateDate().format(formatter));
+                JSONArray arr= JSONArray.parseArray(e.getContent());
+                arr.forEach(json -> {
+                    JSONObject jsonObject = JSONObject.parseObject(json.toString());
+                    bodyList.add(jsonObject.getString("value"));
+                });
+                resList.add(bodyList);
+            });
+    
+            response.setContentType("application/octet-stream");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=引流详情.xlsx");
+            // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("引流详情").build();
+            
+            
+            excelWriter.write(resList, writeSheet);
+    
+            /// finish 会帮忙关闭流
+            excelWriter.finish();
+    }
 
     /**
      * 保存对象

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

@@ -1,5 +1,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.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -106,5 +108,9 @@ public class HelpActivity implements Serializable {
      */
     private int cityId;
 
+    /**
+     * 活动状态
+     */
+    private int activityStatus;
 
 }

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

@@ -183,6 +183,11 @@ public class TaBuildingDynamic implements Serializable {
      */
     private Integer maxEnlistByPerson;
 
+    /**
+     * 活动状态
+     */
+    private Integer activityStatus;
+
     /**
      * 公司Id
      */

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

@@ -0,0 +1,65 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 助力活动发起人员记录 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Data
+public class HelpInitiateRecordSucceed {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "发起时间", index = 2)
+    private LocalDateTime createDate;
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "发起者", index = 0)
+    private String name;
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "发起者手机号", index = 1)
+    private String phone;
+
+    /**
+     * 助力成功时间
+     */    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "助力成功时间", index = 3)
+    private LocalDateTime succeedDate;
+
+    /**
+     * 核销状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "核销状态", index = 4)
+    private String verificationStatus;
+}

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

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 助力活动发起人员记录
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Data
+public class HelpProceedAndFinish {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "发起时间", index = 1)
+    private LocalDateTime createDate;
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "助力成功", index = 0)
+    private String name;
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "发起者手机号", index = 1)
+    private String phone;
+
+    /**
+     * 助力成功时间
+     */    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "助力成功时间", index = 3)
+    private LocalDateTime succeedDate;
+
+}

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

@@ -26,9 +26,9 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param title
      * @param startDate
      * @param endDate
-     * @param status
+     * @param activityStatus
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")Data startDate, @Param("endDate") Data endDate, @Param("status")Integer status, @Param("orgId")Integer orgId);
+    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")Data startDate, @Param("endDate") Data endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
 }

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

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 助力活动发起人员记录  Mapper 接口
@@ -27,4 +30,13 @@ public interface HelpInitiateRecordMapper extends BaseMapper<HelpInitiateRecord>
      * @return
      */
     IPage<HelpInitiateRecord> selectPageList(IPage<HelpInitiateRecord> pg, @Param("helpActivityId") Integer helpActivityId, @Param("status") String status);
+
+    /**
+     * 助力成功记录导出
+     * @param i
+     * @param pageSize
+     * @param tel
+     * @param helpActivityId
+     */
+    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("tel") Integer tel, @Param("helpActivityId") Integer helpActivityId);
 }

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

@@ -3,8 +3,10 @@ package com.huiju.estateagents.service;
 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 javax.xml.crypto.Data;
+import java.util.List;
 
 /**
  * <p>
@@ -24,11 +26,11 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param title
      * @param startDate
      * @param endDate
-     * @param status
+     * @param activityStatus
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer status, Integer orgId);
+    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer activityStatus, Integer orgId);
 
     /**
      * 活动助力添加
@@ -66,4 +68,22 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @return
      */
     ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode);
+
+    /**
+     * 查询当前导出数据的总数
+     * @param tel
+     * @param helpActivityId
+     * @return
+     */
+    Integer getHelpInitiateRecordSucceed(Integer tel, Integer helpActivityId);
+
+    /**
+     * 导出助力成功数据
+     * @param i
+     * @param pageSize
+     * @param tel
+     * @param helpActivityId
+     * @return
+     */
+    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, Integer tel, Integer helpActivityId);
 }

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.base.ResponseBean;
 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.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
@@ -41,10 +42,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     HelpRecordMapper helpRecordMapper;
 
     @Override
-    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer status, Integer orgId) {
+    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer activityStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, status, orgId);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
         responseBean.addSuccess(result);
         return responseBean;
     }
@@ -88,14 +89,14 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
                 }
             }
             // 助力进行中（活动进行中，未结束）
-            if ("helpUnderway".equals(status) && "1".equals(helpActivity.getStatus())) {
+            if ("helpUnderway".equals(status) && helpActivity.getStatus().equals(1)) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }
             }
             // 活动助力失败
             // 活动进行中（活动已结束）
-            if ("helpUnfinished".equals(status) && "2".equals(helpActivity.getStatus())) {
+            if ("helpUnfinished".equals(status) && helpActivity.getStatus().equals(2)) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }
@@ -129,11 +130,27 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
             return responseBean;
         }
 
-        if (helpInitiateRecord.getVerification().equals(verifyCode)){
+        if (verifyCode.equals(Integer.valueOf(helpInitiateRecord.getVerification()))){
+            helpInitiateRecord.setVerificationStatus(1);
+            helpInitiateRecordMapper.updateById(helpInitiateRecord);
             responseBean.addSuccess("成功");
         }else {
             responseBean.addError("核销码错误");
         }
         return responseBean;
     }
+
+    @Override
+    public Integer getHelpInitiateRecordSucceed(Integer tel, Integer helpActivityId) {
+        QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery= new QueryWrapper<>();
+        helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
+        helpInitiateRecordQuery.eq("phone",tel);
+        return helpInitiateRecordMapper.selectCount(helpInitiateRecordQuery);
+    }
+
+    @Override
+    public List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, Integer tel, Integer helpActivityId) {
+         List<HelpInitiateRecordSucceed> lsit= helpInitiateRecordMapper.getHelpInitiateRecordSucceedExportList(i,pageSize,tel,helpActivityId);
+        return lsit;
+    }
 }

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

@@ -36,7 +36,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
 
         QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
-        queryWrapper.like(activityName != null, "activityName", activityName);
+        queryWrapper.like(activityName != null, "activity_name", activityName);
         queryWrapper.eq(status != null, "status", status);
         queryWrapper.eq(startTime != null, "start_time", startTime);
         queryWrapper.eq(endTime != null, "end_time", endTime);

src/main/resources/mapper/Activity.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
+
+    <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
+        SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type FROM ta_building_dynamic WHERE org_id = #{orgId}  and `status` = #{status}
+        UNION  all
+        SELECT group_acticity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'share' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status}
+        UNION  all
+        SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type from ta_help_activity WHERE org_id = #{orgId} and `status` = #{status}
+        ORDER BY weight desc,activity_status,start_date
+    </select>
+</mapper>

src/main/resources/mapper/HelpActivityMapper.xml

@@ -15,8 +15,8 @@
         </if>
         <if test="startDate != null and endDate != null">
         </if>
-        <if test="status != null and status != null">
-            and status = #{status}
+        <if test="activityStatus != null and activityStatus != null">
+            and activity_status = #{activityStatus}
         </if>
             and org_id=#{orgId}
         </where>

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -15,13 +15,23 @@
         </if>
        <if test="status == 'helpUnderway'">
            and (hi.verification = 'null' OR hi.verification = '')
-           AND ha.`status` = 1
+           AND ha.`activity_status` = 1
        </if>
 
        <if test="status == 'helpUnfinished '">
            and (hi.verification = 'null' OR hi.verification = '')
-           AND ha.`status` = 2
+           AND ha.`activity_status` = 2
        </if>
        </where>
     </select>
+
+    <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}
+     order by b.create_date desc
+     limit #{pageCode}, #{pageSize}
+    </select>
 </mapper>