完成 意向值，合并代码

src/main/java/com/huiju/estateagents/controller/TaBuildingIntentionController.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.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingIntention;
+import com.huiju.estateagents.entity.TdBizEvent;
 import com.huiju.estateagents.service.ITaBuildingIntentionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,6 +19,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import java.util.List;
+
 /**
  * <p>
     * 项目意向表  前端控制器
@@ -27,7 +30,7 @@ import com.huiju.estateagents.base.BaseController;
  * @since 2019-08-07
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaBuildingIntentionController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingIntentionController.class);
@@ -42,7 +45,7 @@ public class TaBuildingIntentionController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taBuildingIntention",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taBuildingIntention",method= RequestMethod.GET)
     public ResponseBean taBuildingIntentionList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -66,7 +69,7 @@ public class TaBuildingIntentionController extends BaseController {
      * @param taBuildingIntention 实体对象
      * @return
      */
-    @RequestMapping(value="/taBuildingIntention",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taBuildingIntention",method= RequestMethod.POST)
     public ResponseBean taBuildingIntentionAdd(@RequestBody TaBuildingIntention taBuildingIntention){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -82,12 +85,26 @@ public class TaBuildingIntentionController extends BaseController {
         return responseBean;
     }
 
+
+    /**
+     *  批量 保存 或者 修改 对象  意向值和列表
+     * @param tdBizEventList 实体对象集合
+     * @return
+     */
+    @RequestMapping(value="/admin/taBuildingIntentionAddOrUpdate/{buildingId}",method= RequestMethod.POST)
+    public ResponseBean taBuildingIntentionAddOrUpdate(@RequestBody List<TdBizEvent> tdBizEventList, @PathVariable String buildingId){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaBuildingIntentionService.taBuildingIntentionAddOrUpdate(tdBizEventList, buildingId);
+        return responseBean;
+    }
+
+
     /**
      * 根据id删除对象
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taBuildingIntention/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/taBuildingIntention/{id}", method= RequestMethod.DELETE)
     public ResponseBean taBuildingIntentionDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -109,7 +126,7 @@ public class TaBuildingIntentionController extends BaseController {
      * @param taBuildingIntention 实体对象
      * @return
      */
-    @RequestMapping(value="/taBuildingIntention/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taBuildingIntention/{id}",method= RequestMethod.PUT)
     public ResponseBean taBuildingIntentionUpdate(@PathVariable Integer id,
                                         @RequestBody TaBuildingIntention taBuildingIntention){
         ResponseBean responseBean = new ResponseBean();
@@ -130,7 +147,7 @@ public class TaBuildingIntentionController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taBuildingIntention/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taBuildingIntention/{id}",method= RequestMethod.GET)
     public ResponseBean taBuildingIntentionGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -44,13 +44,14 @@ public class TaPersonIntentionRecordController extends BaseController {
      */
     @RequestMapping(value="/taPersonIntentionRecord",method= RequestMethod.GET)
     public ResponseBean taPersonIntentionRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                    @RequestParam(value = "buildingId", required = false) String buildingId){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaPersonIntentionRecord> pg = new Page<>(pageNum, pageSize);
 
-            responseBean = iTaPersonIntentionRecordService.selectAll(pg);
+            responseBean = iTaPersonIntentionRecordService.selectAll(pg, buildingId);
         }catch (Exception e){
             logger.error("taPersonIntentionRecordList -=- {}",e.toString());
             responseBean.addError(e.getMessage());

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

@@ -61,6 +61,29 @@ public class TdBizEventController extends BaseController {
         return responseBean;
     }
 
+
+    /**
+     * 分页查询列表，并携带意向值
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/tdBizEventIntention",method= RequestMethod.GET)
+    public ResponseBean tdBizEventAndIntention(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value = "buildingId", required = false) String buildingId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TdBizEvent> pg = new Page<>(pageNum, pageSize);
+            responseBean = iTdBizEventService.getBizEventAndIntention(pg, buildingId);
+        }catch (Exception e){
+            logger.error("tdBizEventList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 分页查询列表
      * @param pageNum

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -54,4 +55,22 @@ public class TdBizEvent implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 意向值
+     */
+    @TableField(exist = false)
+    private Integer intention;
+
+    /**
+     * 是否选中了意向值
+     */
+    @TableField(exist = false)
+    private Boolean checkbox;
+
+    /**
+     * 项目意向ID
+     */
+    @TableField(exist = false)
+    private Integer intentionId;
+
 }

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

@@ -2,8 +2,12 @@ package com.huiju.estateagents.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TdBizEvent;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -16,4 +20,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdBizEventMapper extends BaseMapper<TdBizEvent> {
 
+    /**
+     * 获取意向值选项和意向值
+     * @param pg
+     * @param buildingId
+     * @return
+     */
+    IPage<TdBizEvent> selectBizEventAndIntention(IPage<TdBizEvent> pg, @Param("buildingId") String buildingId);
 }

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

@@ -2,7 +2,11 @@ package com.huiju.estateagents.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingIntention;
+import com.huiju.estateagents.entity.TdBizEvent;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,10 @@ import com.huiju.estateagents.entity.TaBuildingIntention;
  */
 public interface ITaBuildingIntentionService extends IService<TaBuildingIntention> {
 
+    /**
+     * 添加或者修改
+     * @param tdBizEventsList
+     * @return
+     */
+    ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent> tdBizEventsList, String buildingId);
 }

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

@@ -17,5 +17,5 @@ import com.huiju.estateagents.entity.TaPersonIntentionRecord;
 public interface ITaPersonIntentionRecordService extends IService<TaPersonIntentionRecord> {
 
 
-    ResponseBean selectAll(IPage<TaPersonIntentionRecord> pg);
+    ResponseBean selectAll(IPage<TaPersonIntentionRecord> pg,String buildingId);
 }

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

@@ -1,7 +1,9 @@
 package com.huiju.estateagents.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TdBizEvent;
 
 /**
@@ -14,4 +16,12 @@ import com.huiju.estateagents.entity.TdBizEvent;
  */
 public interface ITdBizEventService extends IService<TdBizEvent> {
 
+    /**
+     * 获取意向值选项和意向值
+     * @param pg
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId);
+
 }

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

@@ -1,11 +1,16 @@
 package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingIntention;
+import com.huiju.estateagents.entity.TdBizEvent;
 import com.huiju.estateagents.mapper.TaBuildingIntentionMapper;
 import com.huiju.estateagents.service.ITaBuildingIntentionService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 项目意向表  服务实现类
@@ -17,4 +22,27 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntentionMapper, TaBuildingIntention> implements ITaBuildingIntentionService {
 
+
+    @Override
+    public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 获取所有需要 保存 或者 修改
+        List<TaBuildingIntention> taBuildingIntentions = tdBizEventsList.stream().filter(e -> e.getCheckbox()).map(e -> {
+                TaBuildingIntention taBuildingIntention = new TaBuildingIntention();
+                taBuildingIntention.setIntentionId(e.getIntentionId());
+                taBuildingIntention.setEventId(e.getEventId());
+                taBuildingIntention.setEventCode(e.getEventCode());
+                taBuildingIntention.setEventName(e.getEventName());
+                taBuildingIntention.setIntention(e.getIntention());
+                taBuildingIntention.setCreateDate(e.getCreateDate());
+                taBuildingIntention.setBuildingId(buildingId);
+                taBuildingIntention.setStatus(1);
+                return taBuildingIntention;
+        }).collect(Collectors.toList());
+
+        this.saveOrUpdateBatch(taBuildingIntentions);
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
 }

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

@@ -1,12 +1,14 @@
 package com.huiju.estateagents.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
 import com.huiju.estateagents.mapper.TaPersonIntentionRecordMapper;
 import com.huiju.estateagents.service.ITaPersonIntentionRecordService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,9 +27,11 @@ public class TaPersonIntentionRecordServiceImpl extends ServiceImpl<TaPersonInte
     private TaPersonIntentionRecordMapper taPersonIntentionRecordMapper;
 
     @Override
-    public ResponseBean selectAll(IPage<TaPersonIntentionRecord> pg) {
+    public ResponseBean selectAll(IPage<TaPersonIntentionRecord> pg, String buildingId) {
         ResponseBean responseBean = new ResponseBean();
-        IPage<TaPersonIntentionRecord> taPersonIntentionRecordIPage = taPersonIntentionRecordMapper.selectAll(pg);
+        QueryWrapper<TaPersonIntentionRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
+        IPage<TaPersonIntentionRecord> taPersonIntentionRecordIPage = taPersonIntentionRecordMapper.selectPage(pg, queryWrapper);
         responseBean.addSuccess(taPersonIntentionRecordIPage);
         return responseBean;
     }

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

@@ -1,11 +1,16 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TdBizEvent;
 import com.huiju.estateagents.mapper.TdBizEventMapper;
 import com.huiju.estateagents.service.ITdBizEventService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * <p>
  * 事件字典  服务实现类
@@ -17,4 +22,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class TdBizEventServiceImpl extends ServiceImpl<TdBizEventMapper, TdBizEvent> implements ITdBizEventService {
 
+    @Autowired
+    private TdBizEventMapper tdBizEventMapper;
+
+    @Override
+    public ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TdBizEvent> page = tdBizEventMapper.selectBizEventAndIntention(pg, buildingId);
+        responseBean.addSuccess(page);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TdBizEventMapper.xml

@@ -1,5 +1,35 @@
 <?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.TdBizEventMapper">
+<mapper namespace="com.huiju.estateagents.mapper.TdBizEventMapper">
+
+    <select id="selectBizEventAndIntention" resultType="com.huiju.estateagents.entity.TdBizEvent">
+        select
+            biz_event.*,
+            building_intention.intention AS intention,
+            IF( building_intention.event_code IS NOT NULL, 'true', 'false' ) AS checkbox,
+            building_intention.building_id AS buildingId,
+            building_intention.intention_id AS intentionId
+        FROM
+        (
+            SELECT
+              tbe.*
+            FROM
+                td_biz_event tbe
+        ) as biz_event
+        LEFT JOIN
+        (select
+            tbi.*
+         from
+            ta_building_intention tbi
+            <trim prefix="where" prefixOverrides="and | or">
+                <if test="buildingId != null and buildingId != ''">
+                    tbi.building_id = #{buildingId}
+                </if>
+            </trim>
+        ) as building_intention
+
+        ON biz_event.event_id = building_intention.event_id
+
+    </select>
 
 </mapper>