广告位，和活动

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

@@ -0,0 +1,149 @@
+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.ExtendContent;
+import com.huiju.estateagents.service.IExtendContentService;
+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;
+
+/**
+ * <p>
+    * 辅助内容表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class ExtendContentController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(ExtendContentController.class);
+
+    @Autowired
+    public IExtendContentService iExtendContentService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/extendContent",method= RequestMethod.GET)
+    public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param extendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/extendContent",method= RequestMethod.POST)
+    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iExtendContentService.save(extendContent)){
+                responseBean.addSuccess(extendContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/extendContent/{id}", method= RequestMethod.DELETE)
+    public ResponseBean extendContentDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iExtendContentService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param extendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.PUT)
+    public ResponseBean extendContentUpdate(@PathVariable Integer id,
+                                        @RequestBody ExtendContent extendContent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iExtendContentService.updateById(extendContent)){
+                responseBean.addSuccess(extendContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.GET)
+    public ResponseBean extendContentGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iExtendContentService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -5,7 +5,9 @@ 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.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import javax.swing.*;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -58,17 +61,35 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
-    public ResponseBean wxBuildingDynamiceList(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize, HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize);
+    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        /* buildingId 正在设计中*/
+        Integer buildingId = null;
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId);
         return responseBean;
     }
 
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId, HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId);
+    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             @RequestParam("buildingId")Integer buildingId){
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId);
         return responseBean;
     }
 
+    @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
+
+    public ResponseBean taActivityDynamicEnlist(@RequestParam("dynamicId")Integer dynamicId,
+                                                @RequestParam("phone")String phone,
+                                                @RequestParam("name")String name,
+                                                HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(dynamicId,phone,name);
+        return responseBean;
+    }
+
+
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
     public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();

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

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 辅助内容表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_extend_content")
+public class ExtendContent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 内容ID
+     */
+    @TableId(value = "content_id", type = IdType.AUTO)
+    private Integer contentId;
+
+    /**
+     * 打开方式
+     */
+    private String showType;
+
+    /**
+     * 发布位置
+     */
+    private String showPosition;
+
+    /**
+     * 类型
+     */
+    private String contentType;
+
+    /**
+     * 链接ID
+     */
+    private String targetId;
+
+    /**
+     * 图片
+     */
+    private String image;
+
+    /**
+     * 自定义内容
+     */
+    private String content;
+
+    /**
+     * 内容标题
+     */
+    private String title;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 点赞表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaActivityDynamicEnlist implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报名ID
+     */
+    @TableId(value = "favor_id", type = IdType.AUTO)
+    private Integer enlist_id;
+
+    /**
+     * 活动ID
+     */
+    private String dynamic_id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 楼盘id
+     */
+    private String building_id;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+
+}

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

@@ -81,4 +81,43 @@ public class TaBuildingDynamic implements Serializable {
     @TableField(exist = false)
     private TaBuilding building;
 
+    /**
+     * 活动总开关判断活动是否能开始报名_1:可以，0:不可以
+     */
+    private  String isEnlist;
+
+    /**
+     * 活动开始时间
+     */
+    private LocalDateTime startDate;
+
+    /**
+     * 活动结束时间
+     */
+    private  LocalDateTime endDate;
+
+    /**
+     *  报名开始时间
+     */
+    private  LocalDateTime enlistStart;
+
+    /**
+     * 报名结束时间
+     */
+    private  LocalDateTime enlistEnd;
+
+    /**
+     * 活动的当前状态1:进行中，2:未开始,3:结束
+     */
+    @TableField(exist = false)
+    private  Integer activityCondition;
+
+    /**
+     * 报名总数
+     */
+    @TableField(exist = false)
+    private  int count;
+
+
+
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.ExtendContent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 辅助内容表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Mapper
+public interface ExtendContentMapper extends BaseMapper<ExtendContent> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 楼盘户型对应图片表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Mapper
+public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDynamicEnlist> {
+
+}

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

@@ -53,5 +53,4 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      */
     @Update("UPDATE ta_building_dynamic  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE dynamic_id = #{newsId}")
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
-
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.ExtendContent;
+
+/**
+ * <p>
+ * 辅助内容表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+public interface IExtendContentService extends IService<ExtendContent> {
+
+}

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

@@ -33,14 +33,14 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId);
 
     /**
      * 微信小程序 项目详情
      * @param dynamicId
      * @return
      */
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId);
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId);
 
     /**
      * 动态管理添加
@@ -63,4 +63,12 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      */
     ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map);
 
+    /**
+     * 报名活动
+     * @param dynamicId
+     * @param phone
+     * @param name
+     * @return
+     */
+    ResponseBean taActivityDynamicEnlistAdd(Integer dynamicId, String phone, String name);
 }

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.mapper.ExtendContentMapper;
+import com.huiju.estateagents.service.IExtendContentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 辅助内容表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Service
+public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, ExtendContent> implements IExtendContentService {
+
+}

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

@@ -6,8 +6,10 @@ 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.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
@@ -22,6 +24,7 @@ import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -43,6 +46,11 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Autowired
     private TaBuildingMapper buildingMapper;
 
+
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
@@ -72,30 +80,43 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.orderByDesc("create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
-        records.forEach(e -> {
-            QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
-            buildingQueryWrapper.eq("building_id", e.getBuildingId());
-            TaBuilding building = buildingMapper.selectOne(buildingQueryWrapper);
-            e.setBuilding(building);
-        });
-
-        return ResponseBean.success(buildingDynamicIPage);
+        // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
+        for (TaBuildingDynamic taBuildingDynamic:records){
+            // 获取当前时间状态
+            taBuildingDynamic= timeCondition(taBuildingDynamic);
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("list", records);
+        map.put("total", buildingDynamicIPage.getTotal());
+        map.put("pageNum", buildingDynamicIPage.getCurrent());
+        map.put("pageSize", buildingDynamicIPage.getSize());
+        return ResponseBean.success(map);
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId) {
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId) {
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        buildingDynamicQueryWrapper.eq("status",1);
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        // 获取报名总数
+        QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
+        taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
+        taActivityDynamicEnlist.eq("building_id",buildingId);
+        int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+        buildingDynamic.setCount(applyCount);
+        // 获取当前时间状态
+        buildingDynamic = timeCondition(buildingDynamic);
         return ResponseBean.success(buildingDynamic);
     }
 
@@ -155,5 +176,42 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         return ResponseBean.success("成功");
     }
 
+    @Override
+    public ResponseBean taActivityDynamicEnlistAdd(Integer dynamicId, String phone, String name) {
+        // 查询当前活动属于哪个楼盘
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(dynamicId+"");
+
+        TaActivityDynamicEnlist taActivityDynamicEnlist= new TaActivityDynamicEnlist();
+        taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
+                               .setDynamic_id(dynamicId+"")
+                               .setPhone(phone).setName(name)
+                               .setBuilding_id(taBuildingDynamic.getDynamicId());
+        taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
+        return ResponseBean.success("成功");
+    }
 
+    // 根据报名开始时间和结束时间判断当前图标状态
+    private  TaBuildingDynamic  timeCondition(TaBuildingDynamic taBuildingDynamic){
+        Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        if (null == taBuildingDynamic.getEnlistEnd () && null == taBuildingDynamic.getEnlistStart()){
+            return  taBuildingDynamic;
+        }
+        // 报名截止时间
+        Long enlistEnd = taBuildingDynamic.getEnlistEnd ().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // 报名开始时间
+        Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
+            taBuildingDynamic.setActivityCondition(1);
+        }
+        //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
+        if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
+            taBuildingDynamic.setActivityCondition(2);
+        }
+        //(3:结束)当前时间大于报名结束时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
+            taBuildingDynamic.setActivityCondition(3);
+        }
+        return taBuildingDynamic;
+    }
 }

src/main/resources/mapper/ExtendContentMapper.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.ExtendContentMapper">
+
+</mapper>

src/main/resources/mapper/TaActivityDynamicEnlistMapper.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.TaActivityDynamicEnlistMapper">
+
+</mapper>