Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -204,7 +204,7 @@ public class MiniAppController extends BaseController {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
 
-            if(null!=from&&from.contains("share") && com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count>0){
+            if(null!=from&&from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count>0){
                 // 校验是否点击过此人的分享
                 boolean checkPoint = checkSharePersonFrom(from,taPerson.getPersonId(),targetId,orgId);
                 if (checkPoint){

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

@@ -0,0 +1,142 @@
+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.common.CommConstant;
+import com.huiju.estateagents.entity.TaMiniappIcon;
+import com.huiju.estateagents.service.ITaMiniappIconService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+    * 小程序图标表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaMiniappIconController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMiniappIconController.class);
+
+    @Autowired
+    public ITaMiniappIconService iTaMiniappIconService;
+
+
+    /**
+     * 查询列表
+     * @return
+     */
+    @RequestMapping(value="/admin/taMiniappIcon",method= RequestMethod.GET)
+    public ResponseBean taMiniappIconList(){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TaMiniappIcon> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("create_date");
+
+            List<TaMiniappIcon> list = iTaMiniappIconService.list(queryWrapper);
+            responseBean.addSuccess(list);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappIconList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taMiniappIcon 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMiniappIcon",method= RequestMethod.POST)
+    public ResponseBean taMiniappIconAdd(@RequestBody TaMiniappIcon taMiniappIcon){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMiniappIconService.save(taMiniappIcon)){
+                responseBean.addSuccess(taMiniappIcon);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappIconAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taMiniappIcon/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taMiniappIconDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaMiniappIconService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappIconDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taMiniappIcon 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMiniappIcon/{id}",method= RequestMethod.PUT)
+    public ResponseBean taMiniappIconUpdate(@PathVariable Integer id,
+                                        @RequestBody TaMiniappIcon taMiniappIcon){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMiniappIconService.updateById(taMiniappIcon)){
+                responseBean.addSuccess(taMiniappIcon);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappIconUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taMiniappIcon/{id}",method= RequestMethod.GET)
+    public ResponseBean taMiniappIconGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaMiniappIconService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappIconDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,143 @@
+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.TaMiniappOrgIcon;
+import com.huiju.estateagents.service.ITaMiniappOrgIconService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+    * 小程序导航表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaMiniappOrgIconController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMiniappOrgIconController.class);
+
+    @Autowired
+    public ITaMiniappOrgIconService iTaMiniappOrgIconService;
+
+
+    /**
+     * 查询列表
+     * @return
+     */
+    @RequestMapping(value="/wx/taMiniappOrgIcon",method= RequestMethod.GET)
+    public ResponseBean taMiniappOrgIconList(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TaMiniappOrgIcon> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.orderByDesc("sort");
+            queryWrapper.orderByDesc("create_date");
+
+            List<TaMiniappOrgIcon> list = iTaMiniappOrgIconService.list(queryWrapper);
+            responseBean.addSuccess(list);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappOrgIconList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taMiniappOrgIcon 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMiniappOrgIcon",method= RequestMethod.POST)
+    public ResponseBean taMiniappOrgIconAdd(@RequestBody TaMiniappOrgIcon taMiniappOrgIcon){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMiniappOrgIconService.save(taMiniappOrgIcon)){
+                responseBean.addSuccess(taMiniappOrgIcon);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappOrgIconAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taMiniappOrgIcon/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taMiniappOrgIconDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaMiniappOrgIconService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappOrgIconDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taMiniappOrgIcon 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMiniappOrgIcon/{id}",method= RequestMethod.PUT)
+    public ResponseBean taMiniappOrgIconUpdate(@PathVariable Integer id,
+                                        @RequestBody TaMiniappOrgIcon taMiniappOrgIcon){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMiniappOrgIconService.updateById(taMiniappOrgIcon)){
+                responseBean.addSuccess(taMiniappOrgIcon);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappOrgIconUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taMiniappOrgIcon/{id}",method= RequestMethod.GET)
+    public ResponseBean taMiniappOrgIconGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaMiniappOrgIconService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappOrgIconDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -1,10 +1,18 @@
 package com.huiju.estateagents.controller;
 
 
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.service.ITaPersonBuildingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 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.RestController;
-import com.huiju.estateagents.base.BaseController;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
@@ -18,4 +26,33 @@ import com.huiju.estateagents.base.BaseController;
 @RequestMapping("/api")
 public class TaPersonBuildingController extends BaseController {
 
+    private final Logger logger = LoggerFactory.getLogger(TaPersonBuildingController.class);
+
+    @Autowired
+    private ITaPersonBuildingService taPersonBuildingService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/saleCountList",method= RequestMethod.GET)
+    public ResponseBean taShareCountList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                         @RequestParam(value ="endCreateDate",required = false) String endCreateDate, HttpServletRequest request
+    ){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = taPersonBuildingService.selectList(pageNum, pageSize, getOrgId(request), buildingId, startCreateDate, endCreateDate, getTaPersonBuildingListByUserId(request));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 }

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

@@ -375,32 +375,6 @@ public class TaPersonVisitRecordController extends BaseController {
                     e.setNewsNum(shareNum);
                     break;
                 case CommConstant.FAVOR_PROJECT:
-                    //获取项目类型里的价格
-                    QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
-                    projectTypeQueryWrapper.eq("building_id",e.getTargetId());
-                    projectTypeQueryWrapper.eq("building_type_id",e.getBuildingTypeId());
-                    TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
-                    //价格相同显示一个否则显示区间
-                    if (null != taBuildingProjectType){
-                        Integer startPrice = taBuildingProjectType.getStartPrice();
-                        Integer endPrice = taBuildingProjectType.getEndPrice();
-                        if (null != startPrice && null == endPrice){
-                            e.setPrice(String.valueOf(startPrice));
-                        }else if (null == startPrice && null != endPrice){
-                            e.setPrice(String.valueOf(endPrice));
-                        }else if(null != startPrice && null != endPrice){
-                            if (startPrice.equals(endPrice)){
-                                e.setPrice(String.valueOf(startPrice));
-                            }else{
-                                e.setPrice(startPrice + "--" + endPrice);
-                            }
-                        }else{
-                            e.setPrice(null);
-                        }
-                        e.setPriceType(taBuildingProjectType.getPriceType());
-                    } else {
-                        e.setPrice(null);
-                    }
                     e.setBuildingNum(shareNum);
                     break;
                 case CommConstant.EVENT_H5:

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

@@ -0,0 +1,177 @@
+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.common.StringUtils;
+import com.huiju.estateagents.entity.TaShareCount;
+import com.huiju.estateagents.mapper.TaSharePersonFromMapper;
+import com.huiju.estateagents.service.ITaShareCountService;
+import com.huiju.estateagents.service.ITaSharePersonFromService;
+import com.huiju.estateagents.service.impl.TaSharePersonFromServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalTime;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaShareCountController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShareCountController.class);
+
+    @Autowired
+    public ITaShareCountService iTaShareCountService;
+
+    @Autowired
+    private ITaSharePersonFromService iTaSharePersonFromService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/shareCountList",method= RequestMethod.GET)
+    public ResponseBean taShareCountList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "personId") String personId,
+                                         @RequestParam(value = "shareType", required = false) String shareType,
+                                         @RequestParam(value ="shareTitle",required = false) String shareTitle, HttpServletRequest request
+                                         ){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareCountService.selectList(pageNum, pageSize, getOrgId(request), personId, shareType, shareTitle);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/clickCountList",method= RequestMethod.GET)
+    public ResponseBean clickCountList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "personId") String personId,
+                                         @RequestParam(value = "shareType", required = false) String shareType,
+                                         @RequestParam(value ="shareTitle",required = false) String shareTitle, HttpServletRequest request
+    ){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (StringUtils.isEmpty(personId)){
+                return ResponseBean.success(null);
+            }
+            responseBean = iTaShareCountService.selectClickList(pageNum, pageSize, getOrgId(request), personId, shareType, shareTitle);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taShareCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taShareCount",method= RequestMethod.POST)
+    public ResponseBean taShareCountAdd(@RequestBody TaShareCount taShareCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaShareCountService.save(taShareCount)){
+                responseBean.addSuccess(taShareCount);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taShareCount/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taShareCountDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaShareCountService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taShareCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taShareCount/{id}",method= RequestMethod.PUT)
+    public ResponseBean taShareCountUpdate(@PathVariable Integer id,
+                                        @RequestBody TaShareCount taShareCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaShareCountService.updateById(taShareCount)){
+                responseBean.addSuccess(taShareCount);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taShareCount/{id}",method= RequestMethod.GET)
+    public ResponseBean taShareCountGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaShareCountService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -324,4 +324,19 @@ public class TaBuilding implements Serializable {
      * 项目亮点
      */
     private String highlights;
+
+    /**
+     * 项目公众号链接
+     */
+    private String highlightsLink;
+
+    /**
+     * 项目亮点类型
+     */
+    private String highlightsType;
+
+    /**
+     * 项目亮点封面
+     */
+    private String highlightsCover;
 }

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

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 小程序图标表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMiniappIcon implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 图标编码
+     */
+    private String iconCode;
+
+    /**
+     * 图标名称
+     */
+    private String iconName;
+
+    /**
+     * 图标地址
+     */
+    private String iconUrl;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -0,0 +1,74 @@
+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 2020-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMiniappOrgIcon implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小程序导航ID
+     */
+    @TableId(value = "org_icon_id", type = IdType.AUTO)
+    private Integer orgIconId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 图标名称
+     */
+    private String iconName;
+
+    /**
+     * 图标编码
+     */
+    private String iconCode;
+
+    /**
+     * 导航地址
+     */
+    private String iconUrl;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -2,6 +2,8 @@ package com.huiju.estateagents.entity;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -46,5 +48,15 @@ public class TaPersonBuilding implements Serializable {
      */
     private Integer userId;
 
+    @TableField(exist = false)
+    private String buildingName;
+
+    @TableField(exist = false)
+    private String consultantName;
+
+    @TableField(exist = false)
+    private Integer shareCount;
 
+    @TableField(exist = false)
+    private Integer clickNum;
 }

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

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaShareCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * share_count_id
+     */
+    private Integer shareCountId;
+
+    /**
+     * 分享人
+     */
+    private String personId;
+
+    /**
+     * 被分享对象
+     */
+    private String beShare;
+
+    /**
+     * 对象类型
+     */
+    private String tagertType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    @TableField(exist = false)
+    private String shareTitle;
+
+    @TableField(exist = false)
+    private String personPhone;
+
+    @TableField(exist = false)
+    private String personName;
+}

src/main/java/com/huiju/estateagents/excel/PrivateCustomerExport.java

@@ -45,4 +45,11 @@ public class PrivateCustomerExport {
     @ExcelProperty(value = "置业顾问电话", index = 4)
     private String consultTel;
 
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "项目名称", index = 5)
+    private String buildingName;
+
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaMiniappIcon;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 小程序图标表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@Mapper
+public interface TaMiniappIconMapper extends BaseMapper<TaMiniappIcon> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 小程序导航表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@Mapper
+public interface TaMiniappOrgIconMapper extends BaseMapper<TaMiniappOrgIcon> {
+
+}

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

@@ -1,8 +1,13 @@
 package com.huiju.estateagents.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPointsExchange;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,5 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaPersonBuildingMapper extends BaseMapper<TaPersonBuilding> {
-
+    List<TaPersonBuilding> selectListByParams(Page page, @Param("orgId")Integer orgId, @Param("buildingId") String buildingId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("personBuildingList")List<TaPersonBuilding> taPersonBuildingList);
 }

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

@@ -0,0 +1,35 @@
+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.TaShareCount;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@Mapper
+public interface TaShareCountMapper extends BaseMapper<TaShareCount> {
+    /**
+     * 统计分享次数
+     * @param personId
+     * @return
+     */
+    Integer countShare(@Param("personId") String personId, @Param("orgId")Integer orgId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
+
+    /**
+     * 根据条件查询分享内容
+     */
+    List<TaShareCount> selectListByParams(Page page, @Param("orgId") Integer orgId, @Param("personId") String personId, @Param("shareType") String shareType, @Param("shareTitle") String shareTitle);
+
+    List<TaShareCount> selectClickListByParams(Page page, @Param("orgId") Integer orgId, @Param("personId") String personId, @Param("shareType") String shareType, @Param("shareTitle") String shareTitle);
+}
+

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaSharePersonFrom;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaSharePersonFromMapper extends BaseMapper<TaSharePersonFrom> {
-
+    Integer countViewNum(@Param("userId") Integer userId, @Param("orgId")Integer orgId, @Param("personId")String personId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaMiniappIcon;
+
+/**
+ * <p>
+ * 小程序图标表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+public interface ITaMiniappIconService extends IService<TaMiniappIcon> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
+
+/**
+ * <p>
+ * 小程序导航表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+public interface ITaMiniappOrgIconService extends IService<TaMiniappOrgIcon> {
+
+}

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

@@ -1,8 +1,11 @@
 package com.huiju.estateagents.service;
 
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 人员授权项目 服务类
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2019-05-10
  */
 public interface ITaPersonBuildingService extends IService<TaPersonBuilding> {
-
+    ResponseBean selectList(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, String startCreateDate, String endCreateDate, List<TaPersonBuilding> getTaPersonBuildingListByUserId);
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaShareCount;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+public interface ITaShareCountService extends IService<TaShareCount> {
+    ResponseBean selectList(Integer pageNum, Integer pageSize, Integer orgId, String personId, String shareType, String shareTitle);
+
+    ResponseBean selectClickList(Integer pageNum, Integer pageSize, Integer orgId, String personId, String shareType, String shareTitle);
+}

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

@@ -330,20 +330,20 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Override
     public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
-//        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
+        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
         QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
         tdWxDictQueryWrapper.groupBy("scene_type");
         List<TdWxDict> tdWxDicts = tdWxDictMapper.selectList(tdWxDictQueryWrapper);
-//        tdWxDicts.forEach(e -> {
-//            int fromSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getFromNum).sum();
-//            int registerSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getRegisteredNum).sum();
-//            e.setFromData(fromSum);
-//            e.setRegisterSum(registerSum);
-//        });
+        tdWxDicts.forEach(e -> {
+            int fromSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getFromNum).sum();
+            int registerSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getRegisteredNum).sum();
+            e.setFromData(fromSum);
+            e.setRegisterSum(registerSum);
+        });
         Map<String,Object> map = new HashMap<>();
         map.put("tdWxDicts",tdWxDicts);
-//        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
-//        map.put("list",tableList);
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
+        map.put("list",tableList);
         responseBean.addSuccess(map);
         return responseBean;
     }

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

@@ -132,33 +132,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
                 List<TaBuildingImg> buildingListImg = taBuildingImgMapper.selectList(queryListWrapper);
                 taBuilding.setBuildingListImg(buildingListImg);
-
-                //获取项目类型里的价格
-                QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
-                projectTypeQueryWrapper.eq("building_id",taBuilding.getBuildingId());
-                projectTypeQueryWrapper.eq("building_type_id",taBuilding.getBuildingTypeId());
-                TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
-                //价格相同显示一个否则显示区间
-                if (null != taBuildingProjectType){
-                    Integer startPrice = taBuildingProjectType.getStartPrice();
-                    Integer endPrice = taBuildingProjectType.getEndPrice();
-                    if (null != startPrice && null == endPrice){
-                        taBuilding.setPrice(String.valueOf(startPrice));
-                    }else if (null == startPrice && null != endPrice){
-                        taBuilding.setPrice(String.valueOf(endPrice));
-                    }else if(null != startPrice && null != endPrice){
-                       if (startPrice.equals(endPrice)){
-                           taBuilding.setPrice(String.valueOf(startPrice));
-                       }else{
-                           taBuilding.setPrice(startPrice + "--" + endPrice);
-                       }
-                    }else{
-                        taBuilding.setPrice(null);
-                    }
-                    taBuilding.setPriceType(taBuildingProjectType.getPriceType());
-                } else {
-                    taBuilding.setPrice(null);
-                }
             }
         }
 
@@ -293,36 +266,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         projectTypeQueryWrapper.eq("status", 1);
         List<TaBuildingProjectType> buildingProjectTypes = taBuildingProjectTypeMapper.selectList(projectTypeQueryWrapper);
         building.setBuildingProjectType(buildingProjectTypes);
-        building.setPrice(null);
-        buildingProjectTypes.forEach(e -> {
-            //兼容老小程序展示均价取其一
-            if (null == e.getPrice() && e.getPriceType().equals(CommConstant.PRICE_TYPE_AVERAGE)){
-                if (null != e.getStartPrice()){
-                    e.setPrice(e.getStartPrice());
-                }else if (null != e.getEndPrice()){
-                    e.setPrice(e.getEndPrice());
-                }
-            }
-            if (e.getBuildingTypeId().equals(building.getBuildingTypeId())){
-                //价格相同显示一个否则显示区间
-                Integer startPrice = e.getStartPrice();
-                Integer endPrice = e.getEndPrice();
-                if (null != startPrice && null == endPrice){
-                    building.setPrice(String.valueOf(startPrice));
-                }else if (null == startPrice && null != endPrice){
-                    building.setPrice(String.valueOf(endPrice));
-                }else if(null != startPrice && null != endPrice){
-                    if (startPrice.equals(endPrice)){
-                        building.setPrice(String.valueOf(startPrice));
-                    }else{
-                        building.setPrice(startPrice + "--" + endPrice);
-                    }
-                }else{
-                    building.setPrice(null);
-                }
-                building.setPriceType(e.getPriceType());
-            }
-        });
 
         // 海报和分享
         building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
@@ -790,33 +733,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                         build.getBuildingImg().add(0, buildingListImg.get(0));
                     }
                 }
-
-                //获取项目类型里的价格
-                QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
-                projectTypeQueryWrapper.eq("building_id",build.getBuildingId());
-                projectTypeQueryWrapper.eq("building_type_id",build.getBuildingTypeId());
-                TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
-                //价格相同显示一个否则显示区间
-                if (null != taBuildingProjectType){
-                    Integer startPrice = taBuildingProjectType.getStartPrice();
-                    Integer endPrice = taBuildingProjectType.getEndPrice();
-                    if (null != startPrice && null == endPrice){
-                        build.setPrice(String.valueOf(startPrice));
-                    }else if (null == startPrice && null != endPrice){
-                        build.setPrice(String.valueOf(endPrice));
-                    }else if(null != startPrice && null != endPrice){
-                        if (startPrice.equals(endPrice)){
-                            build.setPrice(String.valueOf(startPrice));
-                        }else{
-                            build.setPrice(startPrice + "--" + endPrice);
-                        }
-                    }else{
-                        build.setPrice(null);
-                    }
-                    build.setPriceType(taBuildingProjectType.getPriceType());
-                } else {
-                    build.setPrice(null);
-                }
             }
         }
 
@@ -909,33 +825,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             IPage<TaShare> pageSN = new Page<>(1, 10);
             pageSN.setTotal(null == building.getShareNum() ? 0l : building.getShareNum());
             building.setShareList(pageSN);
-
-            //获取项目类型里的价格
-            QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
-            projectTypeQueryWrapper.eq("building_id",building.getBuildingId());
-            projectTypeQueryWrapper.eq("building_type_id",building.getBuildingTypeId());
-            TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
-            //价格相同显示一个否则显示区间
-            if (null != taBuildingProjectType){
-                Integer startPrice = taBuildingProjectType.getStartPrice();
-                Integer endPrice = taBuildingProjectType.getEndPrice();
-                if (null != startPrice && null == endPrice){
-                    building.setPrice(String.valueOf(startPrice));
-                }else if (null == startPrice && null != endPrice){
-                    building.setPrice(String.valueOf(endPrice));
-                }else if(null != startPrice && null != endPrice){
-                    if (startPrice.equals(endPrice)){
-                        building.setPrice(String.valueOf(startPrice));
-                    }else{
-                        building.setPrice(startPrice + "--" + endPrice);
-                    }
-                }else{
-                    building.setPrice(null);
-                }
-                building.setPriceType(taBuildingProjectType.getPriceType());
-            } else {
-                building.setPrice(null);
-            }
         }
 
         IPage<TaBuilding> page = new Page<>(1, 10);

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaMiniappIcon;
+import com.huiju.estateagents.mapper.TaMiniappIconMapper;
+import com.huiju.estateagents.service.ITaMiniappIconService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 小程序图标表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@Service
+public class TaMiniappIconServiceImpl extends ServiceImpl<TaMiniappIconMapper, TaMiniappIcon> implements ITaMiniappIconService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
+import com.huiju.estateagents.mapper.TaMiniappOrgIconMapper;
+import com.huiju.estateagents.service.ITaMiniappOrgIconService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 小程序导航表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@Service
+public class TaMiniappOrgIconServiceImpl extends ServiceImpl<TaMiniappOrgIconMapper, TaMiniappOrgIcon> implements ITaMiniappOrgIconService {
+
+}

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

@@ -1,11 +1,22 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaShareCount;
 import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaShareCountMapper;
+import com.huiju.estateagents.mapper.TaSharePersonFromMapper;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 人员授权项目 服务实现类
@@ -17,4 +28,31 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPersonBuildingServiceImpl extends ServiceImpl<TaPersonBuildingMapper, TaPersonBuilding> implements ITaPersonBuildingService {
 
+    @Autowired
+    private TaPersonBuildingMapper taPersonBuildingMapper;
+
+    @Autowired
+    private TaShareCountMapper taShareCountMapper;
+
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
+    @Autowired
+    private TaSharePersonFromMapper taSharePersonFromMapper;
+
+    @Override
+    public ResponseBean selectList(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, String startCreateDate, String endCreateDate, List<TaPersonBuilding> taPersonBuildingList) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaPersonBuilding> list = taPersonBuildingMapper.selectListByParams(page, orgId, buildingId, startCreateDate, endCreateDate, taPersonBuildingList);
+        for (TaPersonBuilding taPersonBuilding : list) {
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            taPersonQueryWrapper.eq("person_id", taPersonBuilding.getPersonId());
+            TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+            taPersonBuilding.setShareCount(taShareCountMapper.countShare(taPersonBuilding.getPersonId(), orgId, startCreateDate, endCreateDate));
+            taPersonBuilding.setClickNum(taPerson != null ? taSharePersonFromMapper.countViewNum(taPerson.getUserId(), taPerson.getOrgId(), taPerson.getPersonId(), startCreateDate, endCreateDate) : 0);
+        }
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
 }

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

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.service.impl;
+
+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.TaShareCount;
+import com.huiju.estateagents.mapper.TaShareCountMapper;
+import com.huiju.estateagents.service.ITaShareCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-03
+ */
+@Service
+public class TaShareCountServiceImpl extends ServiceImpl<TaShareCountMapper, TaShareCount> implements ITaShareCountService {
+
+    @Autowired
+    private TaShareCountMapper taShareCountMapper;
+
+    @Override
+    public ResponseBean selectList(Integer pageNum, Integer pageSize, Integer orgId, String personId, String shareType, String shareTitle) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaShareCount> list = taShareCountMapper.selectListByParams(page, orgId, personId, shareType, shareTitle);
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
+
+    @Override
+    public ResponseBean selectClickList(Integer pageNum, Integer pageSize, Integer orgId, String personId, String shareType, String shareTitle) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaShareCount> list = taShareCountMapper.selectClickListByParams(page, orgId, personId, shareType, shareTitle);
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
+}

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

@@ -36,6 +36,9 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     @Autowired
     TaShareMapper taShareMapper;
 
+    @Autowired
+    TaShareCountMapper taShareCountMapper;
+
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
@@ -65,6 +68,16 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
 //            return ResponseBean.success("成功");
         }
 
+        TaShareCount taShareCount = new TaShareCount();
+        taShareCount.setBeShare(id);
+        taShareCount.setCreateDate(LocalDateTime.now());
+        taShareCount.setPersonId(taPerson.getPersonId());
+        taShareCount.setTagertType(typeOf);
+        int countRow = taShareCountMapper.insert(taShareCount);
+        if (countRow < 1) {
+            return ResponseBean.error("分享增加失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         QueryWrapper<TaShare> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", taPerson.getPersonId());
         queryWrapper.eq("be_share", id);

src/main/java/com/huiju/estateagents/statistic/mapper/TsPersonFromStatisticMapper.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.statistic.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -20,11 +21,11 @@ public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStat
 
     void insertStatisticList(List<TsPersonFromStatistic> list);
 
-    List<TsPersonFromStatistic> selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
+    List<TsPersonFromStatistic> selectPersonFrom(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
-    List<TsPersonFromStatistic> selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate);
+    List<TsPersonFromStatistic> selectPersonFromGroupByDay(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
-    List<TsPersonFromStatistic> selectPersonFromGroupByData(Integer orgId, LocalDate startDate, LocalDate endDate);
+    List<TsPersonFromStatistic> selectPersonFromGroupByData(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     void deleteByData();
 }

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

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

src/main/resources/mapper/TaPersonBuildingMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaPersonBuildingMapper">
 
+    <select id="selectListByParams" resultType="com.huiju.estateagents.entity.TaPersonBuilding">
+        select  a.building_id, t.user_name as consultantName, d.building_name, b.person_id From ta_user t
+        left join ta_person_building a on t.user_id = a.user_id
+        left join ta_person b on t.user_id = b.user_id
+        left join ta_share_count c on b.person_id = c.person_id
+        LEFT JOIN ta_building d on a.building_id = d.building_id
+        where t.org_id = #{orgId}
+            <if test="buildingId != null and buildingId != ''">
+              and a.building_id = #{buildingId}
+            </if>
+            <if test="startCreateDate != null and startCreateDate != ''">
+                and  date_format(c.create_date,'%Y-%m-%d') >= date_format(#{startCreateDate},'%Y-%m-%d')
+            </if>
+            <if test="endCreateDate != null and endCreateDate != ''">
+                and  date_format(c.create_date,'%Y-%m-%d') &lt;= date_format(#{endCreateDate},'%Y-%m-%d')
+            </if>
+        group by t.user_id
+    </select>
+
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -618,13 +618,15 @@ FROM
         CASE
         WHEN b.tel IS NULL THEN
         c.tel ELSE b.tel
-        END AS consultTel
+        END AS consultTel,
+        t.building_name
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
         LEFT JOIN ta_person c ON a.realty_consultant = c.user_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1
+        left join ta_building t on a.building_id = t.building_id
         <where>
             a.status > 0
             and a.verify_status = 1
@@ -667,6 +669,7 @@ FROM
                 </foreach>
             </if>
         </where>
+        group by a.customer_id,a.building_id
         order by a.create_date desc
         limit #{pageCode}, #{pageSize}
     </select>

src/main/resources/mapper/TaShareCountMapper.xml

@@ -0,0 +1,108 @@
+<?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.TaShareCountMapper">
+    <select id="countShare" resultType="java.lang.Integer">
+        select count(1) from ta_share_count t
+        left join ta_person a on t.person_id = a.person_id
+        where
+        t.person_id = #{personId}
+        and a.org_id = #{orgId}
+        <if test="startCreateDate != null and startCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') >= date_format(#{startCreateDate},'%Y-%m-%d')
+        </if>
+        <if test="endCreateDate != null and endCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') &lt;= date_format(#{endCreateDate},'%Y-%m-%d')
+        </if>
+    </select>
+    <select id="selectListByParams" resultType="com.huiju.estateagents.entity.TaShareCount">
+        select
+
+        case
+        when a.title != null || a.title != '' then a.title
+        when b.title != null || b.title != '' then b.title
+        when c.activity_name != null || c.activity_name != '' then c.activity_name
+        when d.`name` != null || d.name != '' then d.`name`
+        when e.building_name != null || e.building_name != '' then e.building_name
+        when f.news_name != null || f.news_name != '' then f.news_name
+        when g.`name` != null || g.`name` != '' then g.`name`
+        else '空'
+        end as shareTitle,t.create_date
+
+        from ta_share_count t
+        left join ta_building_dynamic a on t.be_share = a.dynamic_id and t.tagert_type = 'activity'
+        left join ta_help_activity b on t.be_share = b.help_activity_id and t.tagert_type = 'help'
+        left join ta_share_activity c on t.be_share = c.share_id and t.tagert_type = 'group'
+        LEFT JOIN ta_drainage d on t.be_share = d.drainage_id and t.tagert_type = 'h5'
+        left join ta_building e on t.be_share = e.building_id and t.tagert_type = 'project'
+        LEFT JOIN ta_news f on t.be_share = f.news_id and t.tagert_type = 'news'
+        left JOIN ta_person g on t.be_share = g.person_id and t.tagert_type = 'consultant'
+        where t.person_id = #{personId}
+        <if test="shareType != null and shareType != ''">
+            and t.tagert_type = #{shareType}
+        </if>
+        <if test="shareTitle != null and shareTitle != ''">
+            and
+            (
+                a.title like CONCAT('%', #{shareTitle} , '%') or
+                b.title like CONCAT('%', #{shareTitle} , '%') or
+                c.activity_name like CONCAT('%', #{shareTitle} , '%') or
+                d.`name` like CONCAT('%', #{shareTitle} , '%') or
+                e.building_name like CONCAT('%', #{shareTitle} , '%') or
+                f.news_name like CONCAT('%', #{shareTitle} , '%') or
+                g.`name` like CONCAT('%', #{shareTitle} , '%')
+            )
+        </if>
+        order by t.create_date desc
+    </select>
+
+    <select id="selectClickListByParams" resultType="com.huiju.estateagents.entity.TaShareCount">
+        SELECT
+            case
+                when g.title != null || g.title != '' then g.title
+                when b.title != null || b.title != '' then b.title
+                when c.activity_name != null || c.activity_name != '' then c.activity_name
+                when d.`name` != null || d.name != '' then d.`name`
+                when e.building_name != null || e.building_name != '' then e.building_name
+                when f.news_name != null || f.news_name != '' then f.news_name
+                when a.`name` != null || a.`name` != '' then a.`name`
+                else '空'
+                end as shareTitle,
+                        a.phone as personPhone,
+                        a.nickName as personName,
+                        t.create_date
+
+        FROM
+            ta_share_person_from t
+
+        left join ta_building_dynamic g on t.target_id = g.dynamic_id and t.target_type = 'dynamic_share'
+                left join ta_help_activity b on t.target_id = b.help_activity_id and t.target_type = 'help_share'
+                left join ta_share_activity c on t.target_id = c.group_activity_id and t.target_type = 'group_share'
+                LEFT JOIN ta_drainage d on t.target_id = d.drainage_id and t.target_type = 'h5_share'
+                left join ta_building e on t.target_id = e.building_id and t.target_type = 'building_share'
+                LEFT JOIN ta_news f on t.target_id = f.news_id and t.target_type = 'news_share'
+
+        LEFT JOIN ta_person a ON t.person_id = a.person_id and t.target_type = 'card_share'
+        WHERE
+            (t.share_person = (select user_id from ta_person where person_id = #{personId}) or t.share_person = #{personId})
+        AND t.org_id = #{orgId}
+        AND t. STATUS = 1
+        AND t.person_id != #{personId}
+        <if test="shareType != null and shareType != ''">
+            and t.target_type = #{shareType}
+        </if>
+        <if test="shareTitle != null and shareTitle != ''">
+            and
+            (
+            g.title like CONCAT('%', #{shareTitle} , '%') or
+            b.title like CONCAT('%', #{shareTitle} , '%') or
+            c.activity_name like CONCAT('%', #{shareTitle} , '%') or
+            d.`name` like CONCAT('%', #{shareTitle} , '%') or
+            e.building_name like CONCAT('%', #{shareTitle} , '%') or
+            f.news_name like CONCAT('%', #{shareTitle} , '%') or
+            a.`name` like CONCAT('%', #{shareTitle} , '%')
+            )
+        </if>
+        GROUP BY
+            t.target_id,t.target_type,t.person_id,t.share_person order by t.create_date desc
+    </select>
+</mapper>

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -2,4 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaSharePersonFromMapper">
 
+    <select id="countViewNum" resultType="java.lang.Integer">
+      select count(*) from (
+        select count(1) from ta_share_person_from t
+        left join ta_person a on t.share_person = a.person_id or t.share_person = a.user_id
+        where
+        (t.share_person = #{userId}
+        <if test="personId != null and personId != ''">
+            or t.share_person = #{personId}
+        </if>
+        )
+        and t.org_id = #{orgId} and t.status = 1 and t.person_id != #{personId}
+        <if test="startCreateDate != null and startCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') >= date_format(#{startCreateDate},'%Y-%m-%d')
+        </if>
+        <if test="endCreateDate != null and endCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') &lt;= date_format(#{endCreateDate},'%Y-%m-%d')
+        </if>
+        GROUP BY t.person_id
+      ) t
+    </select>
 </mapper>