1

src/main/java/com/yunzhi/marketing/controller/TaBuildingController.java

@@ -13,6 +13,7 @@ import com.yunzhi.marketing.mapper.TaBuildingMapper;
 import com.yunzhi.marketing.mapper.TaOrgMapper;
 import com.yunzhi.marketing.reportCustomerAop.ReportCustomer;
 import com.yunzhi.marketing.service.ITaBuildingService;
+import com.yunzhi.marketing.service.ITaPersonBuildingService;
 import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.service.ITaSaveService;
 import io.swagger.annotations.Api;
@@ -39,7 +40,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-@Api(value = "楼盘")
+@Api(value = "xlk-楼盘", tags = "xlk-楼盘")
 public class TaBuildingController extends BaseController {
 
     @Autowired
@@ -57,6 +58,9 @@ public class TaBuildingController extends BaseController {
     @Autowired
     TaOrgMapper taOrgMapper;
 
+    @Autowired
+    ITaPersonBuildingService taPersonBuildingService;
+
 
     /**
      * 楼盘详情
@@ -397,5 +401,26 @@ public class TaBuildingController extends BaseController {
         }
         return ResponseBean.success("成功");
     }
+
+    @ApiOperation(value = "admin - 获取驻场人员信息", notes = "admin - 获取驻场人员信息")
+    @GetMapping(value = "/admin/building/marketing")
+    public  ResponseBean buildingDynamicFinish(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               @RequestParam String buildingId) {
+        return taBuildingService.getMarketingList(pageNum, pageSize, buildingId);
+    }
+
+    @ApiOperation(value = "admin - 解绑驻场人员", notes = "admin - 解绑驻场人员")
+    @DeleteMapping(value = "/admin/marketing/{id}")
+    public  ResponseBean buildingDynamicFinish(@PathVariable String id) {
+        ResponseBean responseBean = new ResponseBean();
+        boolean state = taPersonBuildingService.removeById(id);
+        if (state) {
+            responseBean.addSuccess("解绑成功");
+        }else {
+            responseBean.addError("请检查是否存在驻场人员");
+        }
+        return responseBean;
+    }
 }
 

src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java

@@ -734,8 +734,5 @@ public class TaBuildingDynamicController extends BaseController {
             // finish 会帮忙关闭流
             excelWriter.finish();
         }
-
-
-
 }
 

src/main/java/com/yunzhi/marketing/entity/TaPerson.java

@@ -341,4 +341,10 @@ public class TaPerson implements Serializable {
      * 推广码ID
      */
     private Integer qrCodeId;
+
+    /**
+     * ta_person_building 的主键
+     */
+    @TableField(exist = false)
+    private String id;
 }

src/main/java/com/yunzhi/marketing/entity/TaPersonBuilding.java

@@ -3,7 +3,9 @@ package com.yunzhi.marketing.entity;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,6 +25,12 @@ public class TaPersonBuilding implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.UUID)
+    private String id;
+
     /**
      * 人员ID
      */

src/main/java/com/yunzhi/marketing/mapper/TaPersonMapper.java

@@ -2,6 +2,8 @@ package com.yunzhi.marketing.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.entity.TaBuildingDynamic;
 import com.yunzhi.marketing.entity.TaChannel;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.entity.TaPersonPositon;
@@ -258,4 +260,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     List<Map<String, Object>> selectCityPerson(@Param("orgId") Integer orgId);
 
     Integer cancelConsulatant(@Param("personId") String personId);
+
+    IPage<TaPerson> getMarketingList(Page<TaBuildingDynamic> page,@Param("buildingId") String buildingId);
 }

src/main/java/com/yunzhi/marketing/service/ITaBuildingService.java

@@ -168,4 +168,11 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @return
      */
     int countNumByHeavy(Integer heavy, String dynamicId);
+
+    /**
+     * 获取当前楼盘的驻场信息
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getMarketingList(Integer pageNum, Integer pageSize, String buildingId);
 }

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -1190,4 +1190,17 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         return rows;
     }
+
+    /**
+     * 获取当前楼盘的驻场信息
+     *
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getMarketingList(Integer pageNum, Integer pageSize, String buildingId) {
+        Page<TaBuildingDynamic> page = new Page<>(pageNum,pageSize);
+        IPage<TaPerson> personList = taPersonMapper.getMarketingList(page,buildingId);
+        return ResponseBean.success(personList);
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/controller/BuildingSpecialRoomController.java

@@ -84,7 +84,7 @@ public class BuildingSpecialRoomController extends BaseController {
      * @return
      */
     @ApiOperation(value = "admin-保存特价房源", notes = "admin-保存特价房源")
-    @RequestMapping(value="/buildingSpecialRoom",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/buildingSpecialRoom",method= RequestMethod.POST)
     public ResponseBean buildingSpecialRoomAdd(@RequestBody BuildingSpecialRoomDTO buildingSpecialRoomDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -112,7 +112,7 @@ public class BuildingSpecialRoomController extends BaseController {
      */
     @ApiOperation(value = "admin-删除特价房源", notes = "admin-删除特价房源")
     @ResponseBody
-    @RequestMapping(value="/buildingSpecialRoom/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/buildingSpecialRoom/{id}", method= RequestMethod.DELETE)
     public ResponseBean buildingSpecialRoomDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -136,7 +136,7 @@ public class BuildingSpecialRoomController extends BaseController {
      * @return
      */
     @ApiOperation(value = "admin-修改特价房源", notes = "admin-修改特价房源")
-    @RequestMapping(value="/buildingSpecialRoom/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/buildingSpecialRoom/{id}",method= RequestMethod.PUT)
     public ResponseBean buildingSpecialRoomUpdate(@PathVariable String id,
                                                   @RequestBody BuildingSpecialRoomDTO buildingSpecialRoomDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -162,7 +162,7 @@ public class BuildingSpecialRoomController extends BaseController {
      * @param id  实体ID
      */
     @ApiOperation(value = "admin-获取特价房源详情", notes = "admin-获取特价房源详情")
-    @RequestMapping(value="/buildingSpecialRoom/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/buildingSpecialRoom/{id}",method= RequestMethod.GET)
     public ResponseBean buildingSpecialRoomGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/resources/mapper/TaPersonMapper.xml

@@ -639,6 +639,16 @@ FROM
             INNER JOIN td_city b ON b.citycode = a.citycode
             AND b.leveltype = 2
     </select>
+    <select id="getMarketingList" resultType="com.yunzhi.marketing.entity.TaPerson">
+        SELECT
+        t.id,
+        p.*
+        FROM
+        ta_person_building t
+        RIGHT JOIN ta_person p ON t.person_id = p.person_id
+        WHERE
+        t.building_id = #{buildingId}
+    </select>
 
     <insert id="savePersonPosition" parameterType="com.yunzhi.marketing.entity.TaPersonPositon">
         insert into ta_person_position