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

epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.37
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.39
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

epmet-module/gov-issue/gov-issue-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">
-    <version>0.3.37</version>
+    <version>0.3.39</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -190,27 +190,15 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         } else {
             //折线数据=DB+Redis，今天之前转成的议题，今天 “已转项目”或“已结案”
             if (date.equals(LocalDate.now().toString())) {
-                Integer yesterdaySupport = NumConstant.ZERO;
+                polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount());
-                Integer yesterdayOppose = NumConstant.ZERO;
+                polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount());
-                for (PolyLineDTO lineDTO : polyLineDTOS) {
-                    yesterdaySupport += lineDTO.getSupportIncrement();
-                    yesterdayOppose += lineDTO.getOppositionIncrement();
-                }
-                polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount() == NumConstant.ZERO ? NumConstant.ZERO : voteRedisFormDTO.getSupportAmount() - yesterdaySupport);
-                polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount() == NumConstant.ZERO ? NumConstant.ZERO : voteRedisFormDTO.getOppositionAmount() - yesterdayOppose);
                 polyLineDTOS.add(polyLineDTO);
             }
             //从古至今一直在表决中
             IssueEntity issueEntity = issueDao.selectById(issueId.getIssueId());
             if (issueEntity.getIssueStatus().equals(IssueConstant.ISSUE_VOTING)){
-                Integer yesterdaySupport = NumConstant.ZERO;
+                polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount());
-                Integer yesterdayOppose = NumConstant.ZERO;
+                polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount());
-                for (PolyLineDTO lineDTO : polyLineDTOS) {
-                    yesterdaySupport += lineDTO.getSupportIncrement();
-                    yesterdayOppose += lineDTO.getOppositionIncrement();
-                }
-                polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount() == NumConstant.ZERO ? NumConstant.ZERO : voteRedisFormDTO.getSupportAmount() - yesterdaySupport);
-                polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount() == NumConstant.ZERO ? NumConstant.ZERO : voteRedisFormDTO.getOppositionAmount() - yesterdayOppose);
                 polyLineDTOS.add(polyLineDTO);
             }
         }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml

@@ -59,8 +59,8 @@
     <select id="polyLineData" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.PolyLineDTO">
         SELECT
             UNIX_TIMESTAMP(statistical_date) AS voteDate,
-            support_increment AS supportIncrement,
+            support_count AS supportIncrement,
-            opposition_increment AS oppositionIncrement
+            opposition_count AS oppositionIncrement
         FROM
             issue_vote_statistical_daily
         WHERE

epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.19
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.20
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络

epmet-module/oper-customize/oper-customize-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.19</version>
+    <version>0.3.20</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>

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.46
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.50
     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.46</version>
+    <version>0.3.50</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java

@@ -99,33 +99,6 @@ public class ResiGroupRedis {
                     List<ResiGroupStatisticalDTO> statisticalMySql = statisticalService.list(param);
                     if(null != statisticalMySql && statisticalMySql.size() >= 1){
                         if(statisticalMySql.size() > 1){
-                        /*
-                        Collections.sort(statisticalMySql, new Comparator<ResiGroupStatisticalDTO>() {
-                            @Override
-                            public int compare(ResiGroupStatisticalDTO o1, ResiGroupStatisticalDTO o2) {
-                                if(null != o1.getCreatedTime() && null != o2.getCreatedTime()){
-                                    return
-                                            o1.getCreatedTime().getTime() > o2.getCreatedTime().getTime() ?
-                                             -1 : (o1.getCreatedTime().getTime() == o2.getCreatedTime().getTime() ?
-                                                    0: 1);
-                                }else{
-                                        return 0;
-                                }
-                            }
-                        });
-
-                        statisticalMySql.sort((ResiGroupStatisticalDTO o1, ResiGroupStatisticalDTO o2) ->
-                                o1.getCreatedTime().compareTo(o2.getCreatedTime())
-                        );
-                        //升序
-                        statisticalMySql.sort(Comparator.comparing(e -> e.getCreatedTime()));
-
-                        statisticalMySql.sort(Comparator.comparing(ResiGroupStatisticalDTO :: getCreatedTime,
-                                (o1 , o2) -> {
-                                  return o2.compareTo(o 1);
-                                }));
-                        */
-
                             //按照createdTime降序排序
                             statisticalMySql.sort(Comparator.comparing(ResiGroupStatisticalDTO :: getCreatedTime,
                                     Collections.reverseOrder()));

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java

@@ -97,8 +97,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
 
         QueryWrapper<ResiGroupStatisticalEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-        wrapper.eq(StringUtils.isNotBlank((String)params.get(ModuleConstant.RESI_GROUP_ID_CAMEL)),ModuleConstant.RESI_GROUP_ID,params.get(ModuleConstant.RESI_GROUP_ID_CAMEL));
+        wrapper.eq(StringUtils.isNotBlank((String)params.get(ModuleConstant.RESI_GROUP_ID)),ModuleConstant.RESI_GROUP_ID,params.get(ModuleConstant.RESI_GROUP_ID));
-        wrapper.eq(StringUtils.isNotBlank((String)params.get(FieldConstant.DEL_FLAG_HUMP)),FieldConstant.DEL_FLAG,params.get(FieldConstant.DEL_FLAG_HUMP));
+        wrapper.eq(StringUtils.isNotBlank((String)params.get(FieldConstant.DEL_FLAG)),FieldConstant.DEL_FLAG,params.get(FieldConstant.DEL_FLAG));
         return wrapper;
     }
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -400,8 +400,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		baseDao.updateResiGroupStatistical(groupMemeberOperationDTO.getGroupId(), userRoleDTO);
 		//6、给用户发送消息
 		this.sendUserApprovedMessage(resiGroupMemberDTO);
-		//7、增加成员缓存信息
+		//7、增加成员缓存信息(调用user服务拿取用户信息)
-		resiGroupDTO.setCustomerId(resiGroupDTO.getCustomerId());
+		resiGroupMemberDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		ResiGroupMemberInfoRedisDTO memberRedis = transferToMemberInfoRedis(resiGroupMemberDTO);
 		resiGroupMemberRedis.set(memberRedis);
 		//8、修改群组缓存信息
@@ -657,7 +657,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		ResiGroupMemberInfoRedisDTO targetObject =
 				ConvertUtils.sourceToTarget(memberDTO,ResiGroupMemberInfoRedisDTO.class);
 		targetObject.setMemberStatus(memberDTO.getStatus());
-		targetObject.setUserId(memberDTO.getId());
+		targetObject.setUserId(memberDTO.getCustomerUserId());
+		targetObject.setGroupId(memberDTO.getResiGroupId());
 		UserResiInfoFormDTO resiInfoParam = new UserResiInfoFormDTO();
 		resiInfoParam.setCustomerId(memberDTO.getCustomerId());
 		resiInfoParam.setUserId(memberDTO.getCustomerUserId());

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 (
-          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.`STATUS` != 'removed'
                       AND rgm.CUSTOMER_USER_ID = #{userId}
+                      AND rgm.RESI_GROUP_ID = rg.ID
                 )
-          and rg.CUSTOMER_ID=#{customerId}
+          AND NOT EXISTS (
-          and rg.GRID_ID=#{gridId}
+                SELECT
-          and rg.STATE ='approved'
+                    rmo.GROUP_ID
-        order by totalMember desc,rgs.TOTAL_TOPICS desc
+                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.CUSTOMER_ID = #{customerId}
+          AND rg.GRID_ID = #{gridId}
+          AND rg.STATE = 'approved'
+        ORDER BY
+            totalMember DESC,
+            rgs.TOTAL_TOPICS DESC
         LIMIT #{pageSize}
     </select>
 

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml

@@ -45,14 +45,14 @@
     </select>
 
     <!--  同意进群之后修改统计值  -->
-    <update id="updateResiGroupStatistical" parameterType="map">
+    <update id="updateResiGroupStatistical">
         UPDATE resi_group_statistical rgs
             SET rgs.TOTAL_MEMBERS = rgs.TOTAL_MEMBERS + 1,
             rgs.TOTAL_NORMAL_MEMEBERS = rgs.TOTAL_NORMAL_MEMEBERS + 1
-            <if test="userRoleDTO.partymemberFlag != null and userRoleDTO.partymemberFlag== '1'">
+            <if test='null != userRoleDTO and userRoleDTO.partymemberFlag== "1"'>
                 ,rgs.TOTAL_PARTY_MEMBERS = rgs.TOTAL_PARTY_MEMBERS + 1
             </if>
-            <if test="userRoleDTO.warmHeartedFlag != null and userRoleDTO.warmHeartedFlag== '1'">
+            <if test='null != userRoleDTO and userRoleDTO.warmHeartedFlag== "1"'>
                 ,rgs.TOTAL_EARNEST_MEMEBERS = rgs.TOTAL_EARNEST_MEMEBERS + 1
             </if>
         WHERE

epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.39
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.42
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络

epmet-module/resi-partymember/resi-partymember-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.39</version>
+    <version>0.3.42</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -152,7 +152,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId()) ? true : false);
             result.setRegisterGridName(ModuleConstant.EMPTY_STR);
             if(StringUtils.isNotBlank(myselfMsg.getGridId())){
-                //registerGridName 首次注册的网格
+                //registerGridName 当前在哪个网格，显示哪个网格的名称
                 CustomerGridFormDTO gridId = new CustomerGridFormDTO();
                 gridId.setGridId(myResiUserInfoFormDTO.getGridId());
                 Result<CustomerGridDTO> gridResult = govOrgFeignClient.getCustomerGridByGridId(gridId);