From 0edab788f512d3c269c6b5caa62682dc1ef396f4 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 30 三月 2021 18:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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..e09974d 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;
@@ -74,4 +76,31 @@
" 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() != ""'>" +
+ " 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