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

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

@@ -143,11 +143,12 @@ public class TaChannelController extends BaseController {
      * @param channel 实体对象
      * @return
      */
-    @RequestMapping(value="/channel/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.PUT)
     public ResponseBean channelUpdate(@PathVariable Integer id,
                                         @RequestBody TaChannel channel){
         ResponseBean responseBean = new ResponseBean();
         try {
+            channel.setChannelId(id);
             if (taChannelService.updateById(channel)){
                 responseBean.addSuccess(channel);
             }else {
@@ -165,7 +166,7 @@ public class TaChannelController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/channel/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.GET)
     public ResponseBean channelGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -81,5 +82,9 @@ public class TaChannel implements Serializable {
      */
     private String buildingId;
 
-
+    /**
+     * 说明描述
+     */
+    @TableField(value = "`explain`")
+    private String explain;
 }

src/main/resources/mapper/TaChannelMapper.xml

@@ -24,6 +24,6 @@
     </select>
     
     <select id="selectChannelList" resultType="com.huiju.estateagents.entity.TaChannel">
-        select * from ta_channel ;
+        select * from ta_channel
     </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -493,20 +493,21 @@ FROM
     <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
         select
         p.avatarurl,
-        p.name,
         p.tel,
         p.sex,
+        rc.`name`,
+        rc.phone,
         COUNT(rc.person_id) as recommendCount
         from ta_person p
         LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id and rc.report_recommend_status = 1
         <where>
         <if test="name !=null and name !=''">
-            and name = #{name}
+            and rc.`name` = #{name}
         </if>
         <if test="phone !=null and phone !=''">
-            and tel = #{phone}
+            and rc.phone = #{phone}
         </if>
-        and person_type = 'estate agent'
+            and p.person_type = 'estate agent'
         </where>
         GROUP BY p.person_id
     </select>