From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 f4074c9..4664e92 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
@@ -6,9 +6,7 @@
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.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComMngRealCompanyDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -88,7 +86,8 @@
" street.name AS streetName, " +
" act.name AS communityName, " +
" street.street_id AS streetId, " +
- " act.community_id AS communityId " +
+ " act.community_id AS communityId, " +
+ " act.create_at AS creatAt " +
" FROM " +
" com_act act " +
" LEFT JOIN com_street street ON act.street_id = street.street_id " +
@@ -103,4 +102,7 @@
" limit 1 " +
"</script>")
ComMngRealCompanyBelongsVO queryComMngRealCompanyBelongs(@Param(value = "pageComMngRealCompanyBelongsDTO") ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);
+
+ @Select("select count(id) as companyTotal from com_mng_real_company where community_id = #{communityId}")
+ ComMngRealCompanyTotalVO getComMngRealCompanyTotalByAdmin(@Param("communityId") Long communityId);
}
--
Gitblit v1.7.1