Merge branch 'master' into addEventBus

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

@@ -0,0 +1,144 @@
+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.ResponseBean;
+import com.huiju.estateagents.entity.SysOrgParams;
+import com.huiju.estateagents.service.ISysOrgParamsService;
+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;
+import com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 组织参数配置表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@RestController
+@RequestMapping("/")
+public class SysOrgParamsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysOrgParamsController.class);
+
+    @Autowired
+    public ISysOrgParamsService iSysOrgParamsService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/sysOrgParams",method= RequestMethod.GET)
+    public ResponseBean sysOrgParamsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysOrgParams> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysOrgParams> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysOrgParams> result = iSysOrgParamsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("sysOrgParamsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysOrgParams 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sysOrgParams",method= RequestMethod.POST)
+    public ResponseBean sysOrgParamsAdd(@RequestBody SysOrgParams sysOrgParams){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysOrgParamsService.save(sysOrgParams)){
+                responseBean.addSuccess(sysOrgParams);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysOrgParamsAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/sysOrgParams/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysOrgParamsDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysOrgParamsService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysOrgParamsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysOrgParams 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sysOrgParams/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysOrgParamsUpdate(@PathVariable Integer id,
+                                        @RequestBody SysOrgParams sysOrgParams){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysOrgParamsService.updateById(sysOrgParams)){
+                responseBean.addSuccess(sysOrgParams);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysOrgParamsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/sysOrgParams/{id}",method= RequestMethod.GET)
+    public ResponseBean sysOrgParamsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysOrgParamsService.getById(id));
+        }catch (Exception e){
+            logger.error("sysOrgParamsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,144 @@
+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.ResponseBean;
+import com.huiju.estateagents.entity.SysProjectParams;
+import com.huiju.estateagents.service.ISysProjectParamsService;
+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;
+import com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 项目参数配置表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@RestController
+@RequestMapping("/")
+public class SysProjectParamsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysProjectParamsController.class);
+
+    @Autowired
+    public ISysProjectParamsService iSysProjectParamsService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/sysProjectParams",method= RequestMethod.GET)
+    public ResponseBean sysProjectParamsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysProjectParams> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysProjectParams> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysProjectParams> result = iSysProjectParamsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("sysProjectParamsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysProjectParams 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sysProjectParams",method= RequestMethod.POST)
+    public ResponseBean sysProjectParamsAdd(@RequestBody SysProjectParams sysProjectParams){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysProjectParamsService.save(sysProjectParams)){
+                responseBean.addSuccess(sysProjectParams);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysProjectParamsAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/sysProjectParams/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysProjectParamsDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysProjectParamsService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysProjectParamsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysProjectParams 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sysProjectParams/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysProjectParamsUpdate(@PathVariable Integer id,
+                                        @RequestBody SysProjectParams sysProjectParams){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysProjectParamsService.updateById(sysProjectParams)){
+                responseBean.addSuccess(sysProjectParams);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysProjectParamsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/sysProjectParams/{id}",method= RequestMethod.GET)
+    public ResponseBean sysProjectParamsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysProjectParamsService.getById(id));
+        }catch (Exception e){
+            logger.error("sysProjectParamsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.controller;
 
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
@@ -229,4 +230,32 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
+    /**
+     * 修改对象
+     * @return
+     */
+    @RequestMapping(value="/admin/customer/recommend/verify/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam String verifyRemark){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
+            if(taRecommendCustomer.getVerifyStatus() != CommConstant.VERIFY_READY){
+                taRecommendCustomer.setVerifyStatus(verifyStatus);
+                taRecommendCustomer.setVerifyRemark(verifyRemark);
+                if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+                    responseBean.addSuccess(taRecommendCustomer);
+                }else {
+                    responseBean.addError("fail");
+                }
+            } else {
+                responseBean.addSuccess("客户已审核");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 }

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

@@ -0,0 +1,69 @@
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 组织参数配置表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysOrgParams implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 参数ID
+     */
+    @TableId(value = "param_id", type = IdType.AUTO)
+    private Integer paramId;
+
+    /**
+     * 参数名称
+     */
+    private String paramName;
+
+    /**
+     * 参数编码
+     */
+    private String paramCode;
+
+    /**
+     * 参数描述
+     */
+    private String paramDesc;
+
+    /**
+     * 参数值
+     */
+    private String paramValue;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

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

@@ -0,0 +1,74 @@
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 项目参数配置表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysProjectParams implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 参数ID
+     */
+    @TableId(value = "param_id", type = IdType.AUTO)
+    private Integer paramId;
+
+    /**
+     * 参数名称
+     */
+    private String paramName;
+
+    /**
+     * 参数编码
+     */
+    private String paramCode;
+
+    /**
+     * 参数描述
+     */
+    private String paramDesc;
+
+    /**
+     * 参数值
+     */
+    private String paramValue;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -158,4 +158,10 @@ public class TaRecommendCustomer implements Serializable {
 
     @TableField(exist = false)
     private TaPerson consultant;
+
+    @TableField(exist = false)
+    private String recommendName;
+
+    @TableField(exist = false)
+    private String recommendTel;
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysOrgParams;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 组织参数配置表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Mapper
+public interface SysOrgParamsMapper extends BaseMapper<SysOrgParams> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysProjectParams;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目参数配置表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Mapper
+public interface SysProjectParamsMapper extends BaseMapper<SysProjectParams> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysOrgParams;
+
+/**
+ * <p>
+ * 组织参数配置表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+public interface ISysOrgParamsService extends IService<SysOrgParams> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysProjectParams;
+
+/**
+ * <p>
+ * 项目参数配置表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+public interface ISysProjectParamsService extends IService<SysProjectParams> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.SysOrgParams;
+import com.huiju.estateagents.mapper.SysOrgParamsMapper;
+import com.huiju.estateagents.service.ISysOrgParamsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 组织参数配置表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Service
+public class SysOrgParamsServiceImpl extends ServiceImpl<SysOrgParamsMapper, SysOrgParams> implements ISysOrgParamsService {
+
+}

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

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.SysProjectParams;
+import com.huiju.estateagents.mapper.SysProjectParamsMapper;
+import com.huiju.estateagents.service.ISysProjectParamsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目参数配置表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Service
+public class SysProjectParamsServiceImpl extends ServiceImpl<SysProjectParamsMapper, SysProjectParams> implements ISysProjectParamsService {
+
+}

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

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

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -35,10 +35,13 @@ FROM
         SELECT
 	a.*,
 	b.name as consultantName,
-    b.tel as consultTel
+    b.tel as consultTel,
+    c.nickname as recommendName,
+    c.tel as recommendTel
 FROM
 	ta_recommend_customer a
 	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+    LEFT JOIN ta_person c on a.person_id = c.person_id
 	<where>
         a.status > 0
         <if test="building != null and building !=''">