Merge remote-tracking branch 'origin/dev' into dev

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.49
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

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.49</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

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
@@ -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>