From a7002e25ec105e5f73c27f91944f1c0b4991c355 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 30 十二月 2021 14:23:41 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 a0636a7..aa86c6b 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
@@ -35,9 +35,9 @@
ComMngVillageVO getStatisticsCount(@Param("villageId") Long villageId);
@Select("select count(distinct `name`) as villageTotal"
- + ",(select count(distinct `name`) from com_mng_village where community_id = #{communityId} and type = 1) as townTotal"
- + ",(select count(distinct `name`) from com_mng_village where community_id = #{communityId} and type = 2) as countrysideTotal"
- + " from com_mng_village where community_id = #{communityId}")
+ + ",(select count(distinct `name`) from com_mng_village where community_id = ${communityId} and type = 1) as townTotal"
+ + ",(select count(distinct `name`) from com_mng_village where community_id = ${communityId} and type = 2) as countrysideTotal"
+ + " from com_mng_village where community_id = ${communityId}")
ComMngVillageTotalVO getVillageStatisticsCount(@Param("communityId") Long communityId);
@Select("select village_id,alley,house_num,group_at,type,address,update_at from com_mng_village where village_id = #{villageId}")
@@ -50,7 +50,7 @@
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id AND out_or_local = 1 ) AS registerNum, "
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id AND is_rent = 2 ) AS rentNum "
+ "FROM " + " com_mng_village AS cmv where 1=1 " + "<if test='villageListAppDTO.communityId != null'>"
- + " and cmv.community_id = #{villageListAppDTO.communityId} " + " </if> "
+ + " and cmv.community_id = ${villageListAppDTO.communityId} " + " </if> "
+ "<if test='villageListAppDTO.address != null and villageListAppDTO.address != ""'>"
+ " and cmv.address like concat(#{villageListAppDTO.address},'%') " + " </if> "
+ "<if test='villageListAppDTO.alley != null and villageListAppDTO.alley != ""'>"
@@ -74,7 +74,7 @@
+ " ( 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 "
+ "FROM " + " com_mng_village AS cmv where 1=1 " + "<if test='villageListAppDTO.communityId != null'>"
- + " and cmv.community_id = #{villageListAppDTO.communityId} " + " </if> "
+ + " and cmv.community_id = ${villageListAppDTO.communityId} " + " </if> "
+ "<if test='villageListAppDTO.villageIds != null and villageListAppDTO.villageIds.size > 0'>"
+ " and cmv.village_id in "
+ "<foreach item='item' collection='villageListAppDTO.villageIds' separator=',' open='(' close=')' index=''> "
--
Gitblit v1.7.1