From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtBusinessDAO.java | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtBusinessDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtBusinessDAO.java
index 279872a..fe3c561 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtBusinessDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtBusinessDAO.java
@@ -1,5 +1,9 @@
package com.panzhihua.service_community.dao;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,47 +11,27 @@
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.service_community.model.dos.ComCvtBusinessDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
@Mapper
public interface ComCvtBusinessDAO extends BaseMapper<ComCvtBusinessDO> {
- @Select("<script> " +
- "SELECT " +
- "a.* " +
- "FROM " +
- "com_cvt_business a " +
- " <where>" +
- "<if test='pageComCvtBusinessDTO.name != null and pageComCvtBusinessDTO.name.trim() != ""'>" +
- " and a.name LIKE concat( #{pageComCvtBusinessDTO.name}, '%' ) " +
- " </if> " +
- "<if test='pageComCvtBusinessDTO.communityId != null and pageComCvtBusinessDTO.communityId != 0'>" +
- " and a.community_id = #{pageComCvtBusinessDTO.communityId} " +
- " </if> " +
- " </where>" +
- " order by a.create_at desc"+
- "</script>")
- IPage<ComCvtBusinessVO> pageComCvtBusiness(Page page, @Param("pageComCvtBusinessDTO") PageComCvtBusinessDTO pageComCvtBusinessDTO);
+ @Select("<script> " + "SELECT " + "a.*, "
+ + "IF(u.type=2,CONCAT('运营平台(',u.account,')'),CONCAT('社区平台(',u.account,')')) create_by_name " + "FROM "
+ + "com_cvt_business a " + "LEFT JOIN sys_user u ON a.create_by = u.user_id " + " <where>"
+ + "<if test='pageComCvtBusinessDTO.name != null and pageComCvtBusinessDTO.name.trim() != ""'>"
+ + " and a.name LIKE concat( '%', #{pageComCvtBusinessDTO.name}, '%' ) " + " </if> "
+ + "<if test='pageComCvtBusinessDTO.communityId != null and pageComCvtBusinessDTO.communityId != 0'>"
+ + " and a.community_id = ${pageComCvtBusinessDTO.communityId} " + " </if> " + " </where>"
+ + " order by a.create_at desc" + "</script>")
+ IPage<ComCvtBusinessVO> pageComCvtBusiness(Page page,
+ @Param("pageComCvtBusinessDTO") PageComCvtBusinessDTO pageComCvtBusinessDTO);
-
- @Select("<script> " +
- "SELECT " +
- "t.* " +
- "FROM " +
- "com_cvt_business t " +
- " <where>" +
- "<if test='comCvtBusinessAppletsDTO.communityId != null and comCvtBusinessAppletsDTO.communityId != 0'>" +
- " t.area_flag = 1 " +
- " OR (" +
- " t.area_flag = 2 " +
- " AND EXISTS ( SELECT * FROM com_cvt_business_area t2 WHERE t2.business_id = t.id AND t2.community_id = #{comCvtBusinessAppletsDTO.communityId} ) \n" +
- " ) " +
- " </if> " +
- " </where>" +
- " order by t.create_at desc"+
- "</script>")
- IPage<ComCvtBusinessVO> pageComCvtBusinessByServiceArea(Page page, @Param("comCvtBusinessAppletsDTO") PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);
+ @Select("<script> " + "SELECT " + "t.* " + "FROM " + "com_cvt_business t " + " <where>"
+ + "<if test='comCvtBusinessAppletsDTO.communityId != null and comCvtBusinessAppletsDTO.communityId != 0'>"
+ + " t.area_flag = 1 " + " OR (" + " t.area_flag = 2 "
+ + " AND EXISTS ( SELECT * FROM com_cvt_business_area t2 WHERE t2.business_id = t.id AND t2.community_id = ${comCvtBusinessAppletsDTO.communityId} ) \n"
+ + " ) " + " </if> " + " </where>" + " order by t.create_at desc" + "</script>")
+ IPage<ComCvtBusinessVO> pageComCvtBusinessByServiceArea(Page page,
+ @Param("comCvtBusinessAppletsDTO") PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);
}
--
Gitblit v1.7.1