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

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/TaPosterController.java

@@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
-    * 分享海报表  前端控制器
-    * </p>
+ * 分享海报表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-09-21
@@ -38,25 +38,26 @@ public class TaPosterController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @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){
+    @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);
+            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){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("posterList -=- {}",e.toString());
+            logger.error("posterList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -64,21 +65,22 @@ public class TaPosterController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param poster 实体对象
      * @return
      */
-    @RequestMapping(value="/poster",method= RequestMethod.POST)
-    public ResponseBean posterAdd(@RequestBody TaPoster poster){
+    @RequestMapping(value = "/poster", method = RequestMethod.POST)
+    public ResponseBean posterAdd(@RequestBody TaPoster poster) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iPosterService.save(poster)){
+            if (iPosterService.save(poster)) {
                 responseBean.addSuccess(poster);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("posterAdd -=- {}",e.toString());
+            logger.error("posterAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -86,21 +88,22 @@ public class TaPosterController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/poster/{id}", method= RequestMethod.DELETE)
-    public ResponseBean posterDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/poster/{id}", method = RequestMethod.DELETE)
+    public ResponseBean posterDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iPosterService.removeById(id)){
+            if (iPosterService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("posterDelete -=- {}",e.toString());
+            logger.error("posterDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -108,23 +111,24 @@ public class TaPosterController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id     实体ID
      * @param poster 实体对象
      * @return
      */
-    @RequestMapping(value="/poster/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/poster/{id}", method = RequestMethod.PUT)
     public ResponseBean posterUpdate(@PathVariable Integer id,
-                                        @RequestBody TaPoster poster){
+                                     @RequestBody TaPoster poster) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iPosterService.updateById(poster)){
+            if (iPosterService.updateById(poster)) {
                 responseBean.addSuccess(poster);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("posterUpdate -=- {}",e.toString());
+            logger.error("posterUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -132,16 +136,17 @@ public class TaPosterController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/poster/{id}",method= RequestMethod.GET)
-    public ResponseBean posterGet(@PathVariable Integer 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){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("posterDelete -=- {}",e.toString());
+            logger.error("posterDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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/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/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>