From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java |   43 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java
index 1159e5b..f4074c9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java
@@ -4,7 +4,9 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
+import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
 import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
+import com.panzhihua.common.model.vos.community.ComMngRealCompanyBelongsVO;
 import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
 import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
 import com.panzhihua.service_community.model.dos.ComMngRealCompanyDO;
@@ -37,17 +39,17 @@
             "  t.address,  " +
             "  t.create_at AS createAt  " +
             "FROM  " +
-            "  com_mng_real_company t " +
+            "  com_mng_real_company t  where 1=1" +
+            "<if test='pageComMngRealCompanyDTO.legalPerson != null and pageComMngRealCompanyDTO.legalPerson.trim() != &quot;&quot;'>" +
+            " and t.legal_person LIKE concat( #{pageComMngRealCompanyDTO.legalPerson}, '%' )  " +
+            " </if> " +
             "<if test='pageComMngRealCompanyDTO.comName != null and pageComMngRealCompanyDTO.comName.trim() != &quot;&quot;'>" +
-            " and t.com_name LIKE concat( #{pageComMngCarDTO.comName}, '%' )  " +
+            " and t.com_name LIKE concat( '%',#{pageComMngRealCompanyDTO.comName}, '%' )  " +
             " </if> " +
             "<if test='pageComMngRealCompanyDTO.communityId != null and pageComMngRealCompanyDTO.communityId != 0'>" +
             " and t.community_id = #{pageComMngRealCompanyDTO.communityId} " +
             " </if> " +
-            "<if test='pageComMngRealCompanyDTO.legalPerson != null and pageComMngRealCompanyDTO.legalPerson.trim() != &quot;&quot;'>" +
-            " and t.legal_person LIKE concat( #{pageComMngCarDTO.legalPerson}, '%' )  " +
-            " </if> " +
-            " order by t.create_at desc"+
+            " order by t.create_at desc" +
             "</script>")
     IPage<ComMngRealCompanyVO> pageQueryComMngRealCompany(Page page, @Param(value = "pageComMngRealCompanyDTO") PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
 
@@ -71,7 +73,34 @@
             "<if test='exportRealCompanyExcelDTO.legalPerson != null and exportRealCompanyExcelDTO.legalPerson.trim() != &quot;&quot;'>" +
             " and t.legal_person LIKE concat( #{exportRealCompanyExcelDTO.legalPerson}, '%' )  " +
             " </if> " +
-            " order by t.create_at desc"+
+            " order by t.create_at desc" +
             "</script>")
     List<ComMngRealCompanyExcelVO> exportRealCompanyExcel(@Param(value = "exportRealCompanyExcelDTO") ExportRealCompanyExcelDTO exportRealCompanyExcelDTO);
+
+    @Select("<script> " +
+            " SELECT distinct   " +
+            "  act.province_code AS provinceAdcode, " +
+            "  act.city_code AS cityAdcode, " +
+            "  act.area_code AS districtAdcode, " +
+            "  pr.province_name AS provinceName, " +
+            "  cty.city_name AS cityName, " +
+            "  dis.district_name AS districtName, " +
+            "  street.name AS streetName, " +
+            "  act.name AS communityName, " +
+            "  street.street_id AS streetId, " +
+            "  act.community_id AS communityId " +
+            " FROM  " +
+            "  com_act act " +
+            "  LEFT JOIN com_street street ON act.street_id = street.street_id " +
+            "  LEFT join com_mng_struct_area_province pr on street.province_code = pr.province_adcode " +
+            "  LEFT join com_mng_struct_area_city cty on street.city_code = cty.city_adcode " +
+            "  LEFT join com_mng_struct_area_district dis on street.area_code = dis.district_adcode " +
+            " WHERE  1=1  " +
+            "<if test='pageComMngRealCompanyBelongsDTO.actName != null and pageComMngRealCompanyBelongsDTO.actName.trim() != &quot;&quot;'>" +
+            " and  act.name = #{pageComMngRealCompanyBelongsDTO.actName}  " +
+            " </if> " +
+            " order by act.create_at desc " +
+            " limit 1 " +
+            "</script>")
+    ComMngRealCompanyBelongsVO queryComMngRealCompanyBelongs(@Param(value = "pageComMngRealCompanyBelongsDTO") ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);
 }

--
Gitblit v1.7.1