From dba6589ffa794577b12af879d72ff699d6065fb1 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 4 Nov 2020 15:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=8F=98=E6=9B=B4=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=BB=E9=A1=B5=E7=BA=A2=E7=82=B9=E7=9A=84=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/ResiGroupController.java    |  6 +++---
 .../group/service/impl/ResiGroupServiceImpl.java | 16 ++++++++++------
 .../mapper/group/GroupEditSubmitRecordDao.xml    |  5 +++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
index 79fe109f52..193e5bac1e 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
@@ -139,7 +139,7 @@ public class ResiGroupController {
 	 * @date 2020.11.03 10:19
 	 */
 	@PostMapping("edit-auditing-list")
-	//@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_EDIT_AUDITINGLIST)
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_EDIT_AUDITINGLIST)
 	public Result<List<ApplyingGroupResultDTO>> getEditAuditingList(@RequestBody CommonGridAndPageFormDTO param){
 		ValidatorUtils.validateEntity(param, CommonGridAndPageFormDTO.GridPageGroup.class);
 		return groupOpenFeignClient.govEditAuditingList(param);
@@ -153,7 +153,7 @@ public class ResiGroupController {
 	 * @date 2020.11.03 14:10
 	 */
 	@PostMapping("edit-auditing-detail")
-	//@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_EDIT_DETAIL)
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_EDIT_DETAIL)
 	public Result<GroupEditionDetailResultDTO> getEditAuditingDetail(@RequestBody GovGroupSummarizeFromDTO param){
 		ValidatorUtils.validateEntity(param, GovGroupSummarizeFromDTO.GroupIdG.class);
 		return groupOpenFeignClient.govEditAuditingDetail(param);
@@ -167,7 +167,7 @@ public class ResiGroupController {
 	 * @date 2020.11.03 16:02
 	 */
 	@PostMapping("audit-edit")
-	//@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_EDIT_AUDIT)
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_EDIT_AUDIT)
 	public Result auditEdit(@LoginUser TokenDto tokenDto,@RequestBody GroupEditionAuditFormDTO param){
 		param.setStaffId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(param, GroupEditionAuditFormDTO.GroupEditionAuditGroup.class);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 00b85fcda6..3dad3f4555 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -1108,6 +1108,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if (groupEditSubmitRecordDao.insert(editRecord) == 0) {
 			throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), EpmetErrorCode.GROUP_EDIT_ERROR.getMsg());
 		}
+
+		resiGroupRedis.addWorkGrassrootsGroupRedDotValue(group.getGridId());
+
 	}
 
 	/**
@@ -1276,6 +1279,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
     	if(StringUtils.equals(param.getAuditResult(),ModuleConstant.AUDITING_OPERATION_REJECT) && StringUtils.isBlank(param.getRemark())){
     		throw new RenException("拒绝理由不能为空");
 		}
+		GroupEditSubmitRecordEntity edit = groupEditSubmitRecordDao.selectEditDetail(param.getGroupId(),param.getAuditResult());
+		if(null == edit){
+			logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.auditEdit，找不到待审核的组更新记录，传参：{}",JSON.toJSONString(param));
+			throw new RenException("找不到待审核的组更新记录");
+		}
+
 		int affectedRows = groupEditSubmitRecordDao.updateAuditResult(param.getGroupId(),param.getStaffId(),param.getAuditResult(),param.getRemark());
 		if(affectedRows <= NumConstant.ZERO){
 			logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.auditEdit，更新组编辑记录时受影响行数小于1，传参：{}",JSON.toJSONString(param));
@@ -1283,16 +1292,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		if(!StringUtils.equals(param.getAuditResult(),ModuleConstant.AUDITING_OPERATION_REJECT)){
 			//同意
-			GroupEditSubmitRecordEntity edit = groupEditSubmitRecordDao.selectEditDetail(param.getGroupId(),param.getAuditResult());
-			if(null == edit){
-				logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.auditEdit，找不到待审核的组更新记录，传参：{}",JSON.toJSONString(param));
-				throw new RenException("找不到待审核的组更新记录");
-			}
 			ResiGroupEntity _update = ConvertUtils.sourceToTarget(edit,ResiGroupEntity.class);
 			_update.setId(param.getGroupId());
 			baseDao.updateById(_update);
 		}
-
+		resiGroupRedis.subtractWorkGrassrootsPartyAuthRedDotValue(edit.getGridId());
     }
 
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml
index 5485a96af6..e45268966e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml
@@ -74,7 +74,7 @@
             groupp.GROUP_HEAD_PHOTO,
             edit.READ_FLAG,
             edit.MESSAGE_TEXT,
-            DATE_FORMAT( edit.CREATED_TIME, '%Y-%m-%d %H:%i' ) AS submitTime
+            DATE_FORMAT( edit.CREATED_TIME, '%Y-%m-%d %H:%i' ) AS createdTime
         FROM
             group_edit_submit_record edit
             LEFT JOIN resi_group groupp ON edit.GROUP_ID = groupp.ID
@@ -94,7 +94,8 @@
             GROUP_NAME,
             GROUP_HEAD_PHOTO,
             GROUP_INTRODUCTION,
-            CREATED_BY
+            CREATED_BY,
+            GRID_ID
         FROM
             group_edit_submit_record
         WHERE