From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
index e72972f..a0636a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
@@ -43,7 +43,7 @@
@Select("select village_id,alley,house_num,group_at,type,address,update_at from com_mng_village where village_id = #{villageId}")
ComMngVillageVO getVillageById(@Param("villageId") Long villageId);
- @Select("<script> " + "SELECT " + " village_id, " + " `name` AS userName, " + " (select count(id) from com_mng_building where village_id = cmv.village_id) as buildSum, " + " address, "
+ @Select("<script> " + "SELECT " + " village_id, " + " `name` AS userName, " + " IFNULL((select count(id) from com_mng_building where village_id = cmv.village_id),0) as buildSum, " + " address, "
+ " create_at as createAt, " + " lng, " + " lat, "
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id ) AS userSum, "
+ " ( SELECT count( id ) FROM com_mng_population_house WHERE village_id = cmv.village_id ) AS houseNum, "
@@ -66,6 +66,9 @@
IPage<PageComMngVillageVO> getGridVillageList(Page page,
@Param("villageListAppDTO") ComMngVillageListAppDTO villageListAppDTO);
+ IPage<PageComMngVillageVO> getGridVillageListApp(Page page,
+ @Param("villageListAppDTO") ComMngVillageListAppDTO villageListAppDTO);
+
@Select("<script> " + "SELECT " + " alley, " + " house_num as doorNum, " + " `name` AS userName, " + " build_sum, "
+ " address, " + " create_at as createAt, "
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id ) AS userSum, "
--
Gitblit v1.7.1