合并

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.controller;
 
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.service.ITaBuildingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -174,6 +175,12 @@ public class TaBuildingController extends BaseController {
     public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id){
         return taBuildingService.buildingAllSelectId(id);
     }
-
-
+    /**
+     * 查询当前所有项目
+     */
+    @RequestMapping(value = "/admin/buildingAll", method = RequestMethod.GET)
+    public  ResponseBean buildingAll(){
+        ResponseBean taBuilding= taBuildingService.buildingAll();
+        return taBuilding;
+    }
 }

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

@@ -3,12 +3,15 @@ package com.huiju.estateagents.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.JWTUtils;
 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.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -22,6 +25,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.HashMap;
 
 /**
  * <p>
@@ -38,6 +42,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private ITaBuildingDynamicService iBuildingDynamicService;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -112,7 +119,7 @@ public class TaBuildingDynamicController extends BaseController {
     public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
-        dynamic.setStatus(0);
+        dynamic.setStatus(1);
 //        dynamic.setDynamicId(idGen.nextId()+"");
         dynamic.setCreateDate(LocalDateTime.now());
         iBuildingDynamicService.save(dynamic);
@@ -157,4 +164,53 @@ public class TaBuildingDynamicController extends BaseController {
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
-}
+
+    @RequestMapping(value = "/admin/buildingDynamic/Details", method = RequestMethod.GET)
+    public ResponseBean buildingDynamicDetails(@RequestParam("dynamicId")String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
+        TaBuilding building= taBuildingMapper.selectBuilding(dynamic.getBuildingId());
+        dynamic.setBuildingName(building.getBuildingName());
+        responseBean.addSuccess(dynamic);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
+    public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                    @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                    @RequestParam(value = "dynamicId",required = false)String dynamicId) {
+        Page<TaActivityDynamicEnlist> page = new Page<>();
+        page.setSize(pageSize);
+        page.setCurrent(pageNum);
+        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId);
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("list", signList);
+        map.put("total", page.getTotal());
+        map.put("pageNum", page.getCurrent());
+        map.put("pageSize", page.getSize());
+        return ResponseBean.success(map);
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/finish" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicFinish(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject object = JSONObject.parseObject(parameter);
+        String dynamicId = object.getString("dynamicId");
+        String top = object.getString("top");
+        QueryWrapper<TaBuildingDynamic> taBuildingDynamic = new QueryWrapper<>();
+        taBuildingDynamic.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(taBuildingDynamic);
+        if ("1".equals(top)) {
+            dynamic.setCreateDate(LocalDateTime.now());
+        } else {
+            dynamic.setIsEnlist("2");
+        }
+        iBuildingDynamicService.update(dynamic, taBuildingDynamic);
+        responseBean.addSuccess("成功");
+        return responseBean;
+    }
+    }
+

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

@@ -143,4 +143,20 @@ public class TaBuildingDynamic implements Serializable {
      * 点赞
      */
     private  int favorNum;
+
+    /**
+     * 项目名称
+     */
+    @TableField(exist = false)
+    private  String buildingName;
+
+    /**
+     *活动地点
+     */
+    private  String address;
+
+    /**
+     * 活动人数
+     */
+    private  String personNum;
 }

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

@@ -1,8 +1,12 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +19,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDynamicEnlist> {
 
+    /**
+     * 查询活动报名记录
+     * @param page
+     * @param dynamicId
+     * @return
+     */
+    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId);
 }

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

@@ -25,4 +25,14 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @return
      */
     List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code);
+
+
+    List<TaBuilding> buildingAll();
+
+    /**
+     * 查询当前楼盘
+     * @param buildingId
+     * @return
+     */
+    TaBuilding selectBuilding(@Param("buildingId") String buildingId);
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
@@ -69,4 +70,11 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @return
      */
     ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist);
+
+    /**
+     * 报名列表
+     * @param page
+     * @return
+     */
+    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId);
 }

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

@@ -128,4 +128,10 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @return
      */
     ResponseBean apartmentDel(String id);
+
+    /**
+     * 查询所有项目
+     * @return
+     */
+    ResponseBean buildingAll();
 }

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

@@ -69,7 +69,14 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
         IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId);
-        List<TaBuildingDynamic> buildingDynamicList=buildingDynamic.getRecords();
+        List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
+        for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
+            QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();
+            taActivityDynamicEnlist.eq("dynamic_id",taBuildingDynamic.getDynamicId());
+            taActivityDynamicEnlist.eq("building_id",taBuildingDynamic.getBuildingId());
+            int singCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+            taBuildingDynamic.setCount(singCount);
+        }
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingDynamicList);
@@ -219,6 +226,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         return ResponseBean.success(state);
     }
 
+    @Override
+    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId) {
+        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId);
+        return ResponseBean.success(signList);
+    }
+
     /**
      *     根据报名开始时间和结束时间判断当前图标状态
      */

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

@@ -452,6 +452,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
        return ResponseBean.success("");
     }
 
+    @Override
+    public ResponseBean buildingAll() {
+        List<TaBuilding> taBuilding= taBuildingMapper.buildingAll();
+        return ResponseBean.success(taBuilding);
+    }
+
 
     int insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
         int rows = 0;

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -1,5 +1,7 @@
 <?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">
-
+        <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
+            select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId}
+        </select>
 </mapper>

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -24,6 +24,7 @@
         <if test="buildingId != null and buildingId !=''">
             and building_id = #{buildingId}
         </if>
+        ORDER BY create_date DESC
   </select>
 
     <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">

src/main/resources/mapper/TaBuildingMapper.xml

@@ -15,4 +15,14 @@
         ORDER BY create_date DESC
     </select>
 
+    <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">
+         SELECT * FROM ta_building
+         where status > -1
+    </select>
+
+    <select id="selectBuilding" resultType="com.huiju.estateagents.entity.TaBuilding">
+         SELECT * FROM ta_building
+         where building_id = #{buildingId}
+    </select>
+
 </mapper>