bug fix

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

@@ -373,4 +373,15 @@ public class CommConstant {
     // 私客
     public static final String CUTOMER_TYPE_PRIVATE = "private";
 
+
+    //项目
+    public static final String POSTER_CONTENT_TYPE_BUILDING = "building";
+    //活动
+    public static final String POSTER_CONTENT_TYPE_ACTIVITY = "activity";
+    //资讯
+    public static final String POSTER_CONTENT_TYPE_NEWS = "news";
+    //人员
+    public static final String POSTER_CONTENT_TYPE_PERSON = "person";
+
+
 }

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

@@ -71,12 +71,8 @@ public class TaChannelController extends BaseController {
         try {
             //使用分页插件
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaChannel> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(null != channelId, "channel_id", channelId);
-            queryWrapper.eq("org_id",orgId);
-            queryWrapper.orderByDesc("create_date");
-            IPage<TaChannel> result = taChannelService.page(pg, queryWrapper);
-          HashMap hashMap  = new HashMap<>();
+            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId);
+            HashMap hashMap  = new HashMap<>();
             hashMap.put("result",result);
             // 下拉列表的数据 all
             List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);

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

@@ -466,7 +466,7 @@ public class TaPersonController extends BaseController {
      * @param channelCode 渠道码
      * @return
      */
-    @RequestMapping(value="/wx/customer/recommend/beComeChannel/{channelCode}",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/customer/recommend/becomeChannel/{channelCode}",method= RequestMethod.PUT)
     public ResponseBean taRecommendAgentBecomeChannel(@PathVariable String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);

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

@@ -0,0 +1,154 @@
+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.TaPoster;
+import com.huiju.estateagents.service.TaPosterService;
+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-09-21
+ */
+@RestController
+@RequestMapping("/")
+public class TaPosterController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPosterController.class);
+
+    @Autowired
+    public TaPosterService iPosterService;
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/poster", method = RequestMethod.GET)
+    public ResponseBean posterList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaPoster> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPoster> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPoster> result = iPosterService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param poster 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/poster", method = RequestMethod.POST)
+    public ResponseBean posterAdd(@RequestBody TaPoster poster) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iPosterService.save(poster)) {
+                responseBean.addSuccess(poster);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/poster/{id}", method = RequestMethod.DELETE)
+    public ResponseBean posterDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iPosterService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id     实体ID
+     * @param poster 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/poster/{id}", method = RequestMethod.PUT)
+    public ResponseBean posterUpdate(@PathVariable Integer id,
+                                     @RequestBody TaPoster poster) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iPosterService.updateById(poster)) {
+                responseBean.addSuccess(poster);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/poster/{id}", method = RequestMethod.GET)
+    public ResponseBean posterGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iPosterService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaShareContentController.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.TaShareContent;
+import com.huiju.estateagents.service.TaShareContentService;
+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-09-21
+ */
+@RestController
+@RequestMapping("/")
+public class TaShareContentController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShareContentController.class);
+
+    @Autowired
+    public TaShareContentService iShareContentService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/shareContent",method= RequestMethod.GET)
+    public ResponseBean shareContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaShareContent> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaShareContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaShareContent> result = iShareContentService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("shareContentList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param shareContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/shareContent",method= RequestMethod.POST)
+    public ResponseBean shareContentAdd(@RequestBody TaShareContent shareContent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iShareContentService.save(shareContent)){
+                responseBean.addSuccess(shareContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("shareContentAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/shareContent/{id}", method= RequestMethod.DELETE)
+    public ResponseBean shareContentDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iShareContentService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("shareContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param shareContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/shareContent/{id}",method= RequestMethod.PUT)
+    public ResponseBean shareContentUpdate(@PathVariable Integer id,
+                                        @RequestBody TaShareContent shareContent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iShareContentService.updateById(shareContent)){
+                responseBean.addSuccess(shareContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("shareContentUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/shareContent/{id}",method= RequestMethod.GET)
+    public ResponseBean shareContentGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iShareContentService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("shareContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -231,4 +231,10 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<TaBuildingProjectType> buildingProjectType;
+
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
 }

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

@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -181,4 +182,10 @@ public class TaBuildingDynamic implements Serializable {
      * 公司Id
      */
     private Integer orgId;
+
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
 }

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

@@ -55,17 +55,20 @@ public class TaChannel implements Serializable {
     /**
      * 经纪人数
      */
-    private Integer agentsNum;
+    @TableField(exist = false)
+    private Integer brokerCount;
 
     /**
      * 有效推荐数
      */
-    private Integer recommendEffective;
+    @TableField(exist = false)
+    private Integer recommendCount;
 
     /**
      * 邀请经纪人数
      */
-    private Integer agentsInvite;
+    @TableField(exist = false)
+    private Integer inviteCount;
 
     /**
      * 创建时间

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

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -116,4 +117,10 @@ public class TaNews implements Serializable {
 
     @TableField(exist = false)
     private Integer isSave;
+
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
 }

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

@@ -260,4 +260,10 @@ public class TaPerson implements Serializable {
     private int inviteCount;
 
     private String miniappId;
+
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
 }

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

@@ -0,0 +1,77 @@
+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-09-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_poster")
+public class TaPoster implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 海报id
+     */
+    @TableId(value = "poster_id", type = IdType.AUTO)
+    private Integer posterId;
+
+    /**
+     * 目标id
+     */
+    private String targetId;
+
+    private String targetType;
+
+    /**
+     * 海报模板
+     */
+    private String posterModel;
+
+    /**
+     * 海报图片
+     */
+    private String posterImg;
+
+    /**
+     * 海报标题
+     */
+    private String posterTitle;
+
+    /**
+     * 海报描述
+     */
+    private String posterDescription;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

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

@@ -0,0 +1,75 @@
+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-09-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_share_content")
+public class TaShareContent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分享内容id
+     */
+    @TableId(value = "share_content_id", type = IdType.AUTO)
+    private Integer shareContentId;
+
+    /**
+     * 分享内容模板
+     */
+    private String shareContentModel;
+
+    /**
+     * 目标id
+     */
+    private String targetId;
+
+    /**
+     * 分享标题
+     */
+    private String shareContentTitle;
+
+    /**
+     * 分享图片
+     */
+    private String shareContentImg;
+
+    /**
+     * 分享内容类型
+     */
+    private String shareContentType;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -29,4 +30,11 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * @return
      */
     List<TaChannel> selectChannelList(@Param("orgId")Integer orgId);
+
+    /**
+     * 渠道列表
+     * @param pg
+     * @return
+     */
+    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPoster;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 分享海报表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-21
+ */
+@Mapper
+public interface TaPosterMapper extends BaseMapper<TaPoster> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaShareContent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-21
+ */
+@Mapper
+public interface TaShareContentMapper extends BaseMapper<TaShareContent> {
+
+}

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

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPoster;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 分享海报表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-21
+ */
+public interface TaPosterService extends IService<TaPoster> {
+
+    List<TaPoster> getPostersForTarget(String targetId,String targetType);
+
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaShareContent;
+
+import java.util.List;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-21
+ */
+public interface TaShareContentService extends IService<TaShareContent> {
+    List<TaShareContent> getPostersForTarget(String targetId, String targetType);
+}

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

@@ -0,0 +1,39 @@
+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaShareContent;
+import com.huiju.estateagents.mapper.TaShareContentMapper;
+import com.huiju.estateagents.service.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-21
+ */
+@Service
+public class ShareContentServiceImpl extends ServiceImpl<TaShareContentMapper, TaShareContent> implements TaShareContentService {
+    @Autowired
+    TaShareContentMapper taShareContentMapper;
+
+    @Override
+    public List<TaShareContent> getPostersForTarget(String targetId, String targetType){
+        QueryWrapper<TaShareContent>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id",targetId);
+        queryWrapper.eq("share_content_type",targetType);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaShareContent> data = taShareContentMapper.selectList(queryWrapper);
+        return data;
+    }
+
+}

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

@@ -15,6 +15,8 @@ import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import com.huiju.estateagents.service.ITaSaveService;
+import com.huiju.estateagents.service.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Service;
@@ -58,6 +60,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Autowired
     private ITaSaveService iTaSaveService;
 
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
     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反之
@@ -114,6 +122,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
         for (TaBuildingDynamic taBuildingDynamic:records){
             setExtendInfo(taBuildingDynamic, taPerson);
+
         }
         HashMap<String, Object> map = new HashMap<>();
         map.put("list", records);
@@ -288,6 +297,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         taActivityDynamicEnlist.eq("building_id", taBuildingDynamic.getBuildingId());
         int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
         taBuildingDynamic.setCount(applyCount);
+        taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(),CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
+        taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(),CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
 
         // 是否收藏
         TaSave taSave = iTaSaveService.getInfoBy(taPerson.getPersonId(), CommConstant.FAVOR_ACTIVITY, taBuildingDynamic.getDynamicId());

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

@@ -13,6 +13,8 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.service.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
 import jodd.util.CollectionUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.checkerframework.checker.units.qual.A;
@@ -68,6 +70,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaBuildingProjectTypeMapper taBuildingProjectTypeMapper;
 
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
 
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
@@ -116,6 +124,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingProjectTypeQueryWrapper.eq("building_id", building.getBuildingId());
         List<TaBuildingProjectType> taBuildingProjectTypes = taBuildingProjectTypeMapper.selectList(buildingProjectTypeQueryWrapper);
         building.setBuildingProjectType(taBuildingProjectTypes);
+        building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
         return ResponseBean.success(building);
     }
@@ -323,7 +333,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
     @Override
     public ResponseBean buildingApartmentUpdate(String parameter) {
+        ResponseBean responseBean = new ResponseBean();
         TaBuildingApartment building = JSONObject.parseObject(parameter,TaBuildingApartment.class);
+        if (StringUtils.isEmpty(building.getApartmentId())) {
+            responseBean.addError("id不存在!");
+            return responseBean;
+        }
         taBuildingImgMapper.delBuildingImgByApartment(building.getApartmentId());
 
         //删除户户型对应图片表
@@ -520,6 +535,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("building_id", id);
         buildingApartmentQueryWrapper.eq("status",1);
+        buildingApartmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> buildingApartment= taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
         return ResponseBean.success(buildingApartment);
     }

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

@@ -16,9 +16,7 @@ import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaFavorMapper;
 import com.huiju.estateagents.mapper.TaNewsMapper;
 import com.huiju.estateagents.mapper.TaSaveMapper;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaNewsService;
-import com.huiju.estateagents.service.ITaNewsTypeService;
+import com.huiju.estateagents.service.*;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +50,12 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     @Autowired
     private TaSaveMapper taSaveMapper;
 
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
 
     @Override
     public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
@@ -89,7 +93,10 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         if (null == newsId) {
             responseBean.addError("编号不能为空！");
         }
-        responseBean.addSuccess(this.getById(newsId));
+        TaNews data = this.getById(newsId);
+        data.setPosters(taPosterService.getPostersForTarget(newsId.toString(),CommConstant.POSTER_CONTENT_TYPE_NEWS));
+        data.setShareContents(taShareContentService.getPostersForTarget(newsId.toString(),CommConstant.POSTER_CONTENT_TYPE_NEWS));
+        responseBean.addSuccess(data);
         return  responseBean;
     }
 

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.MD5Utils;
@@ -14,10 +16,8 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.service.ITaPointsRecordsService;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -76,6 +76,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private ITaPointsRecordsService pointsRecordsService;
 
+    @Autowired
+    private ITaUserService taUserService;
+
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
 
     @Resource
     private ApplicationContext applicationContext;
@@ -225,13 +234,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
                 buildings.add(b.getBuildingId());
             }
         }
-
+        TaUser user = taUserService.getById(person.getUserId());
         Map<String, Object> result = new HashMap<>();
         result.put("id", person.getPersonId());
-        result.put("name", person.getName());
-        result.put("company", person.getCompany());
-        result.put("department", person.getDepartment());
-        result.put("picture", person.getPhoto());
+        result.put("name", user.getUserName());
+        result.put("company", user.getOrgName());
+        result.put("department", user.getDepartment());
+        result.put("picture", user.getAvatar());
         result.put("hotNum", person.getHotNum());
         result.put("likeNum", person.getLikeNum());
         result.put("pvNum", person.getPvNum());
@@ -244,6 +253,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("projects", buildings);
         result.put("address", person.getAddress());
         result.put("personTags",person.getPersonTags());
+        result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
+        result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
         QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
         saveQueryWrapper.eq("tagert_type", "card");
         saveQueryWrapper.eq("person_id",personId);

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

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPoster;
+import com.huiju.estateagents.mapper.TaPosterMapper;
+import com.huiju.estateagents.service.TaPosterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 分享海报表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-21
+ */
+@Service
+public class TaPosterServiceImpl extends ServiceImpl<TaPosterMapper, TaPoster> implements TaPosterService {
+
+    @Autowired
+    TaPosterMapper taPosterMapper;
+
+
+    @Override
+    public List<TaPoster> getPostersForTarget(String targetId, String targetType){
+        QueryWrapper<TaPoster>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id",targetId);
+        queryWrapper.eq("target_type",targetType);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaPoster> data =taPosterMapper.selectList(queryWrapper);
+        return data;
+
+    }
+
+}

src/main/resources/mapper/TaChannelMapper.xml

@@ -27,4 +27,24 @@
         select * from ta_channel
         where org_id = #{orgId}
     </select>
+
+    <select id="pageTaChannel" resultType="com.huiju.estateagents.entity.TaChannel">
+        SELECT
+        c.*,
+        COUNT(cp.person_id) AS brokerCount,
+        COUNT(rc.person_id) AS recommendCount,
+        (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
+        cp.person_id
+        FROM
+        ta_channel c
+        LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
+        LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.person_id AND rc.`status` = 1
+        <where>
+            <if test="channelId != null and channelId != ''">
+                c.channel_id = #{channelId}
+            </if>
+            and c.org_id = #{orgId}
+        </where>
+        GROUP BY c.channel_id
+    </select>
 </mapper>

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

src/main/resources/mapper/TaShareContentMapper.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.community.huiju.ta.mapper.ShareContentMapper">
+
+</mapper>