Merge remote-tracking branch 'origin/dev_group_edit' into dev_temp

# Conflicts:
#	epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@@ -143,7 +143,7 @@ public interface ResiGroupFeignClient {
 	 * @param gridIdList
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
-	 * @Description 查询网格下待审核的小组总数
+	 * @Description 查询网格下待审核的小组总数+变更小组信息申请数
 	 * @Date 2020/5/13 15:49
 	 **/
 	@PostMapping(value = "/resi/group/group/groupprocessingcount",consumes = MediaType.APPLICATION_JSON_VALUE)

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java

@@ -108,7 +108,7 @@ public class RemindServiceImpl implements RemindService {
                 }
             }
         }else{
-            logger.error(String.format("查询网格内待审核小组数失败,%s",groupProcessingCountResult.getMsg()));
+            logger.error(String.format("查询群组管理待办事项数失败,%s",groupProcessingCountResult.getMsg()));
         }
         return false;
     }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@@ -297,7 +297,7 @@ public class ResiGroupController {
      * @param gridIdList
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO>>
      * @Author yinzuomei
-     * @Description 传入网格id列表，返回每个网格的待审核小组总数
+     * @Description 传入网格id列表，返回每个网格的待审核小组总数+变更小组信息申请数
      * @Date 2020/5/13 21:33
      **/
     @PostMapping("groupprocessingcount")

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/GroupEditSubmitRecordDao.java

@@ -81,4 +81,12 @@ public interface GroupEditSubmitRecordDao extends BaseDao<GroupEditSubmitRecordE
      * @date 2020.11.03 17:33
     */
     int updateAuditResult(@Param("groupId")String groupId,@Param("staffId") String staffId,@Param("auditStatus") String auditStatus,@Param("remark")String remark);
+
+    /**
+     * @param gridId
+     * @author yinzuomei
+     * @description 根据网格id查询  待审核的变更小组信息申请 总数
+     * @Date 2020/11/13 10:05
+     **/
+    Integer selectCountAuditingRec(String gridId);
 }

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

@@ -33,7 +33,6 @@ import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
-import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.ReadFlagConstant;
@@ -64,9 +63,9 @@ import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.*;
 import com.epmet.resi.group.dto.UserRoleDTO;
 import com.epmet.resi.group.dto.group.*;
-import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.form.GridIdFormDTO;
 import com.epmet.resi.group.dto.group.form.ShouldVoteCountFormDTO;
+import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
@@ -891,7 +890,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		for(String gridId:gridIdList){
 			GroupProcessingCountResultDTO resultDTO=new GroupProcessingCountResultDTO();
 			resultDTO.setGridId(gridId);
-			Integer auditingCount=resiGroupRedis.getWorkGrassrootsGroupRedDotValue(gridId);
+			Integer auditingCreateGroupCount=resiGroupRedis.getWorkGrassrootsGroupRedDotValue(gridId);
+			Integer auditingGroupEditRecordCount=groupEditSubmitRecordDao.selectCountAuditingRec(gridId);
+			Integer auditingCount=auditingCreateGroupCount+auditingGroupEditRecordCount;
 			if (null == auditingCount) {
 				resultDTO.setCount(0);
 			} else {

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

@@ -135,4 +135,16 @@
         STAFF_ID IS NULL
         LIMIT 1
     </update>
+
+    <!--  根据网格id查询  待审核的变更小组信息申请 总数  -->
+    <select id="selectCountAuditingRec" resultType="java.lang.Integer">
+        SELECT
+            count( 1 ) AS total
+        FROM
+            group_edit_submit_record m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.AUDIT_STATUS = 'under_auditting'
+            AND m.GRID_ID = #{gridId}
+    </select>
 </mapper>