From 40342103a0fea7316acfb0e0cfdf40de1209cee1 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Thu, 28 May 2020 12:39:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=BA=94=E8=A1=A8=E5=86=B3=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/group/ResiGroupDao.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 192d643add..5b9c922520 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -313,7 +313,7 @@
     <!-- 获取应表决数 -->
     <select id="shouldVoteCount" parameterType="com.epmet.resi.group.dto.group.form.ShouldVoteCountFormDTO" resultType="com.epmet.resi.group.dto.group.result.ShouldVoteCountResultDTO">
         SELECT
-            COUNT(*) AS shouldVoteCount
+            COUNT(DISTINCT CUSTOMER_USER_ID) AS shouldVoteCount
         FROM
             resi_group_member rgm
             LEFT JOIN resi_group rg ON rgm.resi_group_id = rg.id

From f8f3f2e96c5a93845b59af8283c405ff21f35923 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 28 May 2020 14:07:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?130=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=EF=BC=9Aresigrup=EF=BC=9A=E5=BA=94=E8=A1=A8=E5=86=B3=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-group/resi-group-server/deploy/docker-compose-dev.yml  | 2 +-
 epmet-module/resi-group/resi-group-server/pom.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index 10269ea017..1e38a0f82d 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.47
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.48
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 0356c3aab3..4d26b50fcb 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.47</version>
+    <version>0.3.48</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

From 323380dee8b5e1d39be981dbdb4c88cfb658a868 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 28 May 2020 15:39:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0-?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B0=8F=E7=BB=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/group/ResiGroupDao.xml   | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 5b9c922520..e316a46efd 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -350,22 +350,36 @@
             resi_group rg
                 LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
         WHERE
-            rg.DEL_FLAG = '0'
+            NOT EXISTS (
+                    SELECT
+                        rgm.RESI_GROUP_ID
+                    FROM
+                        resi_group_member rgm
+                    WHERE
+                        rgm.DEL_FLAG = '0'
+                      AND rgm.`STATUS` != 'removed'
+                      AND rgm.CUSTOMER_USER_ID = #{userId}
+                      AND rgm.RESI_GROUP_ID = rg.ID
+                )
+          AND NOT EXISTS (
+                SELECT
+                    rmo.GROUP_ID
+                FROM
+                    group_memeber_operation rmo
+                WHERE
+                    rmo.DEL_FLAG = '0'
+                  AND rmo.CUSTOMER_USER_ID = #{userId}
+                  AND rmo.OPERATE_STATUS = 'under_auditting'
+                  AND rmo.GROUP_ID = rg.ID
+            )
+          AND rg.DEL_FLAG = '0'
           AND rgs.DEL_FLAG = '0'
-          and rg.id not in (
-            SELECT
-                rgm.RESI_GROUP_ID
-            FROM
-                resi_group_member rgm
-            WHERE
-                rgm.DEL_FLAG = '0'
-              AND rgm.`STATUS` !='removed'
-              AND rgm.CUSTOMER_USER_ID = #{userId}
-        )
-          and rg.CUSTOMER_ID=#{customerId}
-          and rg.GRID_ID=#{gridId}
-          and rg.STATE ='approved'
-        order by totalMember desc,rgs.TOTAL_TOPICS desc
+          AND rg.CUSTOMER_ID = #{customerId}
+          AND rg.GRID_ID = #{gridId}
+          AND rg.STATE = 'approved'
+        ORDER BY
+            totalMember DESC,
+            rgs.TOTAL_TOPICS DESC
         LIMIT #{pageSize}
     </select>
 

From 9f1dc10166812a12fc20603a85ddc86b80754fe0 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 28 May 2020 15:41:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0-?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B0=8F=E7=BB=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-group/resi-group-server/deploy/docker-compose-dev.yml  | 2 +-
 epmet-module/resi-group/resi-group-server/pom.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index 1e38a0f82d..0045187e5c 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.48
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.49
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 4d26b50fcb..3e11f79724 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.48</version>
+    <version>0.3.49</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>