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

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

@@ -394,4 +394,7 @@ public class CommConstant {
 	
 	//助力活动
 	public static final Object HELP_ACTIVITY = "helpActivity";
+	
+	//分享活动
+	public static final Object GROUP_ACTIVITY = "groupActivity";
 }

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

@@ -85,6 +85,8 @@ public class HelpActivityController extends BaseController {
     @Autowired
     private TaShareContentService taShareContentService;
 
+    @Autowired
+    private HelpInitiateRecordMapper helpInitiateRecordMapper;
     /**
      * 活动助力列表
      *
@@ -130,7 +132,8 @@ public class HelpActivityController extends BaseController {
         Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
         helpActivity.setCityId(cityId);
         // 活动暂且定位为未开始
-        helpActivity.setActivityStatus(0);
+        helpActivity.setActivityStatus(1);
+        helpActivity.setStatus(0);
         helpActivity.setWeight(0);
         helpActivity.setIsMain(false);
         taHelpActivityService.helpActivityAdd(helpActivity, orgId);
@@ -214,6 +217,13 @@ public class HelpActivityController extends BaseController {
         // 结束活动操作
         if (activityStatus.equals("2")) {
             helpActivity.setActivityStatus(2);
+            QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery= new QueryWrapper<>();
+            helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
+                List<HelpInitiateRecord> list= helpInitiateRecordMapper.selectList(helpInitiateRecordQuery);
+                for (HelpInitiateRecord helpInitiateRecord:list){
+                    helpInitiateRecord.setStatus(2);
+                    helpInitiateRecordMapper.updateById(helpInitiateRecord);
+                }
         }
         Boolean isA = taHelpActivityService.updateById(helpActivity);
         responseBean.addSuccess(isA);
@@ -331,7 +341,7 @@ public class HelpActivityController extends BaseController {
     }
 
     /**
-     * 导出数据 客户列表 公客/私客
+     * 助力活动发起人
      *
      * @param request
      * @param response

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

@@ -171,7 +171,7 @@ public class HelpInitiateRecordController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
-            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
         try {
@@ -198,13 +198,27 @@ public class HelpInitiateRecordController extends BaseController {
         Integer orgId = getOrgId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
-            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
         try {
+ 
+            //查看是否发起过助力
+            QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
+            helpInitiateRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+            helpInitiateRecordQueryWrapper.eq("org_id",orgId);
+            helpInitiateRecordQueryWrapper.eq("person_id",person.getPersonId());
+            HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
+            if (null != recordServiceOne){
+                responseBean.addSuccess(helpInitiateRecord);
+                return responseBean;
+            }
+ 
             helpInitiateRecord.setPersonId(person.getPersonId());
+ 
             helpInitiateRecord.setCreateDate(LocalDateTime.now());
             helpInitiateRecord.setOrgId(orgId);
+            helpInitiateRecord.setStatus(1);
             if (taHelpInitiateRecordService.save(helpInitiateRecord)){
                 responseBean.addSuccess(helpInitiateRecord);
             }else {

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

@@ -169,7 +169,7 @@ public class HelpRecordController extends BaseController {
         Integer orgId = getOrgId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
-            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
         try {

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaDocumentImg;
+import com.huiju.estateagents.service.ITaDocumentImgService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 资料图片库  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+@RestController
+@RequestMapping("/")
+public class TaDocumentImgController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaDocumentImgController.class);
+
+    @Autowired
+    public ITaDocumentImgService iTaDocumentImgService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/documentImg",method= RequestMethod.GET)
+    public ResponseBean documentImgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaDocumentImg> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaDocumentImg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaDocumentImg> result = iTaDocumentImgService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param documentImg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/documentImg",method= RequestMethod.POST)
+    public ResponseBean documentImgAdd(@RequestBody TaDocumentImg documentImg){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDocumentImgService.save(documentImg)){
+                responseBean.addSuccess(documentImg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/documentImg/{id}", method= RequestMethod.DELETE)
+    public ResponseBean documentImgDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaDocumentImgService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param documentImg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/documentImg/{id}",method= RequestMethod.PUT)
+    public ResponseBean documentImgUpdate(@PathVariable Integer id,
+                                        @RequestBody TaDocumentImg documentImg){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDocumentImgService.updateById(documentImg)){
+                responseBean.addSuccess(documentImg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/documentImg/{id}",method= RequestMethod.GET)
+    public ResponseBean documentImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaDocumentImgService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.service.ITaDocumentVerifyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 资料审核  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+@RestController
+@RequestMapping("/")
+public class TaDocumentVerifyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaDocumentVerifyController.class);
+
+    @Autowired
+    public ITaDocumentVerifyService iTaDocumentVerifyService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/documentVerify",method= RequestMethod.GET)
+    public ResponseBean documentVerifyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaDocumentVerify> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param documentVerify 实体对象
+     * @return
+     */
+    @RequestMapping(value="/documentVerify",method= RequestMethod.POST)
+    public ResponseBean documentVerifyAdd(@RequestBody TaDocumentVerify documentVerify){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDocumentVerifyService.save(documentVerify)){
+                responseBean.addSuccess(documentVerify);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/documentVerify/{id}", method= RequestMethod.DELETE)
+    public ResponseBean documentVerifyDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaDocumentVerifyService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param documentVerify 实体对象
+     * @return
+     */
+    @RequestMapping(value="/documentVerify/{id}",method= RequestMethod.PUT)
+    public ResponseBean documentVerifyUpdate(@PathVariable Integer id,
+                                        @RequestBody TaDocumentVerify documentVerify){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDocumentVerifyService.updateById(documentVerify)){
+                responseBean.addSuccess(documentVerify);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/documentVerify/{id}",method= RequestMethod.GET)
+    public ResponseBean documentVerifyGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaDocumentVerifyService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -7,13 +7,17 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPoster;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import com.huiju.estateagents.service.ITaShareRecordService;
+import com.huiju.estateagents.service.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,6 +54,13 @@ public class TaShareActivityController extends BaseController {
     
     @Autowired
     private ITaShareChildRecordService taShareChildRecordService;
+    
+    @Autowired
+    private TaPosterService taPosterService;
+    
+    @Autowired
+    private TaShareContentService taShareContentService;
+    
 
     /**
      * 分页查询列表
@@ -224,7 +235,8 @@ public class TaShareActivityController extends BaseController {
      * @param groupActicityId  实体ID
      */
     @RequestMapping(value="/wx/taShareActivity/{groupActicityId}",method= RequestMethod.GET)
-    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActicityId, HttpServletRequest request){
+    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActicityId,
+                                           @RequestParam(value = "recordId",required = false) Integer recordId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
@@ -240,24 +252,40 @@ public class TaShareActivityController extends BaseController {
             map.put("taShareActivity",taShareActivity);
             
             //发起者团长信息
-            QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("group_activity_id",groupActicityId);
-            queryWrapper.eq("person_id",person.getPersonId());
-            queryWrapper.eq("org_id",orgId);
-            TaShareRecord taShareRecord = taShareRecordService.getOne(queryWrapper);
-            if (null != taShareRecord){
-                //团长
-                taShareActivity.setGroupStatus(CommConstant.HELP_STATUS_INITIATE);
-                map.put("taShareRecord",taShareRecord);
-                
-                //团员
-                QueryWrapper<TaShareChildRecord> childRecordQueryWrapper = new QueryWrapper<>();
-                childRecordQueryWrapper.eq("org_id",orgId);
-                childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
-                childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
-                List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
-                map.put("shareChildRecordList",shareChildRecordList);
-            }
+             if (null != recordId){
+                 TaShareRecord taShareRecord = taShareRecordService.getById(recordId);
+                 if (null != taShareRecord){
+                     //团长
+                     taShareActivity.setGroupStatus(CommConstant.HELP_STATUS_INITIATE);
+                     map.put("taShareRecord",taShareRecord);
+        
+                     //团员
+                     QueryWrapper<TaShareChildRecord> childRecordQueryWrapper = new QueryWrapper<>();
+                     childRecordQueryWrapper.eq("org_id",orgId);
+                     childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+                     childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
+                     List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
+                     map.put("shareChildRecordList",shareChildRecordList);
+                 }
+             }
+            
+    
+            //获取海报信息
+            QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
+            posterQueryWrapper.eq("target_type",CommConstant.GROUP_ACTIVITY);
+            posterQueryWrapper.eq("target_id",groupActicityId);
+            posterQueryWrapper.eq("org_id",orgId);
+            List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
+            map.put("postList",postList);
+    
+            //获取分享信息
+            QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
+            taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);
+            taShareContentQueryWrapper.eq("target_id",groupActicityId);
+            taShareContentQueryWrapper.eq("org_id",orgId);
+            List<TaShareContent> shareContentList = taShareContentService.list(taShareContentQueryWrapper);
+            map.put("shareContentList",shareContentList);
+            
             responseBean.addSuccess(map);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -97,6 +97,8 @@ public class HelpInitiateRecord implements Serializable {
      * 助力人数 发起助力后，参与人数
      */
     private Integer enlistNum;
+    
+    private Integer status;
 
     /**
      * 助力

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

@@ -0,0 +1,68 @@
+package com.huiju.estateagents.entity;
+
+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-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_document_img")
+public class TaDocumentImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Integer documentImgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 用户Id
+     */
+    private String personId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 资料表id 对应ta_document_verify
+     */
+    private Integer documentVerifyId;
+
+    /**
+     * 图片
+     */
+    private String img;
+
+    /**
+     * 说明
+     */
+    private String instructions;
+
+    /**
+     * 标签
+     */
+    private String tag;
+
+
+}

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

@@ -0,0 +1,66 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_document_verify")
+public class TaDocumentVerify implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "document_verify_id", type = IdType.AUTO)
+    private Integer documentVerifyId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 用户Id
+     */
+    private String personId;
+
+    /**
+     * 审核人id
+     */
+    private String verifyUser;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 审核状态 0未审核  1审核通过  2审核不通过
+     */
+    private Integer verifyStatus;
+
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaDocumentImg;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 资料图片库  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+@Mapper
+public interface TaDocumentImgMapper extends BaseMapper<TaDocumentImg> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaDocumentVerify;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 资料审核  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+@Mapper
+public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaDocumentImg;
+
+
+/**
+ * <p>
+ * 资料图片库  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+public interface ITaDocumentImgService extends IService<TaDocumentImg> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaDocumentVerify;
+
+/**
+ * <p>
+ * 资料审核  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
+
+}

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

@@ -93,14 +93,14 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
                 }
             }
             // 助力进行中（活动进行中，未结束）
-            if ("helpUnderway".equals(status) && helpActivity.getStatus().equals(1)) {
+            if ("helpUnderway".equals(status) && helpInitiateRecord.getStatus().equals(1)) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }
             }
             // 活动助力失败
             // 活动进行中（活动已结束）
-            if ("helpUnfinished".equals(status) && helpActivity.getStatus().equals(2)) {
+            if ("helpUnfinished".equals(status) && helpInitiateRecord.getStatus().equals(2)) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }

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

@@ -96,6 +96,8 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 			
 			//生成核销码
 			helpInitiateRecord.setVerification(String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()+System.currentTimeMillis()));
+			helpInitiateRecord.setSucceedDate(LocalDateTime.now());
+			helpInitiateRecord.setStatus(0);
 		}
 		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaDocumentImg;
+import com.huiju.estateagents.mapper.TaDocumentImgMapper;
+import com.huiju.estateagents.service.ITaDocumentImgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资料图片库  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+@Service
+public class TaDocumentImgServiceImpl extends ServiceImpl<TaDocumentImgMapper, TaDocumentImg> implements ITaDocumentImgService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.mapper.TaDocumentVerifyMapper;
+import com.huiju.estateagents.service.ITaDocumentVerifyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资料审核  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+@Service
+public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMapper, TaDocumentVerify> implements ITaDocumentVerifyService {
+
+}

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -24,12 +24,12 @@
         </if>
        <if test="status == 'helpUnderway'">
            and (hi.verification = 'null' OR hi.verification = '')
-           AND ha.`activity_status` = 1
+           AND hi.`status` = 1
        </if>
 
        <if test="status == 'helpUnfinished '">
            and (hi.verification = 'null' OR hi.verification = '')
-           AND ha.`activity_status` = 2
+           AND hi.`status` =  2
        </if>
        </where>
     </select>

src/main/resources/mapper/TaDocumentImgMapper.xml

@@ -0,0 +1,5 @@
+<?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.mapper.TaDocumentImgMapper">
+
+</mapper>

src/main/resources/mapper/TaDocumentVerifyMapper.xml

@@ -0,0 +1,5 @@
+<?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.mapper.TaDocumentVerifyMapper">
+
+</mapper>