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

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@@ -11,6 +11,8 @@ public enum RequirePermissionEnum {
      */
     WORK_GRASSROOTS_GROUP_AUDITINGLIST("work_grassroots_group_auditinglist", "基层治理:群组管理:待审核列表", "基层治理:群组管理:待审核列表查询"),
     WORK_GRASSROOTS_GROUP_EDIT_AUDITINGLIST("work_grassroots_group_edit_auditinglist", "基层治理:群组管理:小组变更待审核列表", "基层治理:群组管理:小组变更待审核列表"),
+    WORK_GRASSROOTS_GROUP_EDIT_DETAIL("work_grassroots_group_edit_detail","基层治理:群组管理:变更申请","基层治理:群组管理:小组信息变更申请详情"),
+    WORK_GRASSROOTS_GROUP_EDIT_AUDIT("work_grassroots_group_edit_audit","基层治理:群组管理:变更审核","基层治理:群组管理:小组信息变更审核(通过或驳回)"),
     WORK_GRASSROOTS_GROUP_GROUPSINTHEGRID("work_grassroots_group_groupsinthegrid", "基层治理:群组管理:本网格小组列表", "基层治理:群组管理:本网格小组列表查询"),
     WORK_GRASSROOTS_GROUP_AUDIT("work_grassroots_group_audit", "基层治理:群组管理:审核建组", "基层治理:群组管理:审核建组（通过或驳回）"),
     WORK_GRASSROOTS_GROUP_AUDITED("work_grassroots_group_audited", "基层治理:群组管理:审核历史", "基层治理:群组管理:审核历史列表查询"),

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -353,4 +353,12 @@ public class RedisKeys {
 	public static String getCustomerFootbarKey(String customerId, String appType) {
 		return rootPrefix.concat("footbar").concat(":").concat(customerId).concat(":").concat(appType);
 	}
+
+
+	/**
+	 * @Description 用户缓存Key
+	 **/
+	public static String getResiUserKey(String userId){
+		return rootPrefix.concat("resi:user:").concat(userId);
+	}
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.Max;
@@ -17,7 +18,9 @@ import java.io.Serializable;
 public class WorkPointVerificationFormDTO implements Serializable {
     private static final long serialVersionUID = -590822390667788693L;
 
-    @NotBlank(message = "获取不到用户Id",groups = ResiCommonUserIdFormDTO.UserIdGroup.class)
+    public interface WorkPointVerifyGroup extends CustomerClientShowGroup{}
+
+    @NotBlank(message = "获取不到用户Id",groups = WorkPointVerifyGroup.class)
     private String staffId;
 
     /**

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java

@@ -6,7 +6,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.PointVerificationFormDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
 import com.epmet.dto.form.WorkPointVerificationFormDTO;
 import com.epmet.dto.result.PointVerificationResultDTO;
 import com.epmet.dto.result.WorkPointVerficationListResultDTO;
@@ -54,7 +53,7 @@ public class ExchangeController {
     @PostMapping("recordmonthly")
     public Result<WorkPointVerficationListResultDTO> getStaffVerificationRecordMonthly(@LoginUser TokenDto token,@RequestBody WorkPointVerificationFormDTO verificationParam){
         verificationParam.setStaffId(token.getUserId());
-        ValidatorUtils.validateEntity(verificationParam, ResiCommonUserIdFormDTO.UserIdGroup.class);
+        ValidatorUtils.validateEntity(verificationParam, WorkPointVerificationFormDTO.WorkPointVerifyGroup.class);
         return new  Result<WorkPointVerficationListResultDTO>().ok(pointVerificationLogService.getStaffVerificationRecordMonthly(verificationParam));
     }
 

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java

@@ -11,6 +11,7 @@ import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
 import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.ResiGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,6 +32,8 @@ import java.util.List;
 public class ResiGroupController {
 	@Autowired
 	ResiGroupService resiGroupService;
+	@Autowired
+	ResiGroupOpenFeignClient groupOpenFeignClient;
 	/**
 	 * 小组审核历史列表
 	 *
@@ -127,4 +130,49 @@ public class ResiGroupController {
 		ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO);
 		return resiGroupService.disagreeApplying(disAgreeApplyGroupFormDTO);
 	}
+
+	/**
+	 * @Description 工作端 查询组变更待审核列表
+	 * @param param
+	 * @return
+	 * @author wangc
+	 * @date 2020.11.03 10:19
+	 */
+	@PostMapping("edit-auditing-list")
+	//@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);
+	}
+
+	/**
+	 * @Description 工作端-查询小组修改信息的详情内容
+	 * @param param
+	 * @returncom.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO
+	 * @author wangc
+	 * @date 2020.11.03 14:10
+	 */
+	@PostMapping("edit-auditing-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);
+	}
+
+	/**
+	 * @Description 工作端-工作人员提交审核
+	 * @param param
+	 * @return void
+	 * @author wangc
+	 * @date 2020.11.03 16:02
+	 */
+	@PostMapping("audit-edit")
+	//@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);
+		return groupOpenFeignClient.govAuditEdit(param);
+	}
+
+
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/CommonGridAndPageFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.resi.group.dto.group.form;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
@@ -27,11 +28,13 @@ public class CommonGridAndPageFormDTO implements Serializable {
     /**
      * 页码
      */
+    @Min(1)
     private Integer pageNo;
 
     /**
      * 每页多少条数
      */
+    @Min(1)
     private Integer pageSize;
 
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GovGroupSummarizeFromDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.resi.group.dto.group.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -12,8 +14,12 @@ import java.io.Serializable;
 @Data
 public class GovGroupSummarizeFromDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
+
+	public interface GroupIdG extends CustomerClientShowGroup{}
+
 	/**
 	 * 小组id
 	 */
+	@NotBlank(message = "群组Id不能为空",groups = GroupIdG.class)
 	private String groupId;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupEditionApplyResultDTO.java

@@ -1,46 +0,0 @@
-package com.epmet.resi.group.dto.group.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Description 工作端 - 群组审核列表返参DTO
- * @ClassName GroupEditionApplyResultDTO
- * @Auth wangc
- * @Date 2020-11-03 09:06
- */
-@Data
-public class GroupEditionApplyResultDTO implements Serializable {
-    private static final long serialVersionUID = 437035656436226205L;
-
-    /**
-     * 组Id
-     */
-    private String groupId;
-
-    /**
-     * 原始组姓名
-     */
-    private String groupName;
-
-    /**
-     * 原始组头像
-     */
-    private String groupHeadPhoto;
-
-    /**
-     * 已读 未读
-     */
-    private String readFlag;
-
-    /**
-     * 审核人员查看待审核列表时的文案 如:党员李华申请变更小组【原小组名】，请审核。
-     */
-    private String messageText;
-
-    /**
-     * yyyy-MM-dd HH:mm:ss
-     */
-    private String submitTime;
-}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -1,9 +1,19 @@
 package com.epmet.resi.group.feign;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.group.form.CommonGridAndPageFormDTO;
+import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
+import com.epmet.resi.group.dto.group.form.GroupEditionAuditFormDTO;
+import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
+import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -11,6 +21,31 @@ import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:16
  */
+//@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class,url = "localhost:8095")
 @FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class)
 public interface ResiGroupOpenFeignClient {
+
+    @PostMapping("/resi/group/group/gov-edit-auditing-list")
+    Result<List<ApplyingGroupResultDTO>> govEditAuditingList(@RequestBody CommonGridAndPageFormDTO param);
+
+    /**
+     * @Description 查询小组修改信息的详情内容
+     * @param param
+     * @returncom.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO
+     * @author wangc
+     * @date 2020.11.03 14:10
+     */
+    @PostMapping("/resi/group/group/gov-edit-auditing-detail")
+    Result<GroupEditionDetailResultDTO> govEditAuditingDetail(@RequestBody GovGroupSummarizeFromDTO param);
+
+    /**
+     * @Description 工作人员提交审核
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2020.11.03 16:02
+     */
+    @PostMapping("/resi/group/group/gov-audit-edit")
+    Result govAuditEdit(@RequestBody GroupEditionAuditFormDTO param);
+
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -1,8 +1,18 @@
 package com.epmet.resi.group.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.group.form.CommonGridAndPageFormDTO;
+import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
+import com.epmet.resi.group.dto.group.form.GroupEditionAuditFormDTO;
+import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
+import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
@@ -11,4 +21,18 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClient {
+    @Override
+    public Result<List<ApplyingGroupResultDTO>> govEditAuditingList(CommonGridAndPageFormDTO param) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "govEditAuditingList", param);
+    }
+
+    @Override
+    public Result<GroupEditionDetailResultDTO> govEditAuditingDetail(GovGroupSummarizeFromDTO param) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "govEditAuditingDetail", param);
+    }
+
+    @Override
+    public Result govAuditEdit(GroupEditionAuditFormDTO param) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "govAuditEdit", param);
+    }
 }

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

@@ -384,4 +384,42 @@ public class ResiGroupController {
         return new Result();
     }
 
+
+    /**
+     * @Description 工作端 查询组变更待审核列表
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.11.03 10:19
+     */
+    @PostMapping("gov-edit-auditing-list")
+    public Result<List<ApplyingGroupResultDTO>> govEditAuditingList(@RequestBody CommonGridAndPageFormDTO param){
+        return new Result<List<ApplyingGroupResultDTO>>().ok(resiGroupService.getEditAuditingList(param));
+    }
+
+    /**
+     * @Description 工作端-查询小组修改信息的详情内容
+     * @param param
+     * @returncom.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO
+     * @author wangc
+     * @date 2020.11.03 14:10
+     */
+    @PostMapping("gov-edit-auditing-detail")
+    public Result<GroupEditionDetailResultDTO> govEditAuditingDetail(@RequestBody GovGroupSummarizeFromDTO param){
+        return new Result<GroupEditionDetailResultDTO>().ok(resiGroupService.getEditAuditingDetail(param));
+    }
+
+    /**
+     * @Description 工作端-作人员提交审核
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2020.11.03 16:02
+     */
+    @PostMapping("gov-audit-edit")
+    public Result govAuditEdit(@RequestBody GroupEditionAuditFormDTO param){
+        resiGroupService.auditEdit(param);
+        return new Result();
+    }
+
 }

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

@@ -19,10 +19,12 @@ package com.epmet.modules.group.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.group.entity.GroupEditSubmitRecordEntity;
+import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 组编辑提交记录表
@@ -49,4 +51,34 @@ public interface GroupEditSubmitRecordDao extends BaseDao<GroupEditSubmitRecordE
      * @param groupId
      */
     GroupEditSubmitRecordEntity getLatestEditSubmitRecord(@Param("groupId") String groupId);
+
+    /**
+     * @Description 工作端查询群组修改信息申请列表
+     * @param gridId
+     * @return
+     * @author wangc
+     * @date 2020.11.03 13:39
+     */
+    List<ApplyingGroupResultDTO> selectGroupEditApplyList(@Param("gridId")String gridId);
+
+    /**
+     * @Description 查询小组修改信息详情
+     * @param
+     * @return com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO
+     * @author wangc
+     * @date 2020.11.03 14:32
+    */
+    GroupEditSubmitRecordEntity selectEditDetail(@Param("groupId")String groupId,@Param("auditResult") String auditResult);
+
+    /**
+     * @Description 审核群信息更改
+     * @param groupId
+     * @param staffId
+     * @param auditStatus
+     * @param remark
+     * @return int
+     * @author wangc
+     * @date 2020.11.03 17:33
+    */
+    int updateAuditResult(@Param("groupId")String groupId,@Param("staffId") String staffId,@Param("auditStatus") String auditStatus,@Param("remark")String remark);
 }

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

@@ -26,6 +26,7 @@ import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+
 import java.util.List;
 
 /**

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

@@ -19,8 +19,12 @@ package com.epmet.modules.group.redis;
 
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.group.service.ResiGroupStatisticalService;
@@ -36,6 +40,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
@@ -57,6 +62,9 @@ public class ResiGroupRedis {
     @Autowired
     private ResiGroupStatisticalService statisticalService;
 
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
 
     public void delete(Object[] ids) {
 
@@ -215,4 +223,22 @@ public class ResiGroupRedis {
             }
         });
     }
+
+    /**
+     * @Description 从缓存中获取用户的真实姓名
+     * @param userId
+     * @return java.lang.String
+     * @author wangc
+     * @date 2020.11.03 15:27
+    */
+    public String getFullName(String userId){
+        String fieldValue = (String)redisUtils.hGet(RedisKeys.getResiUserKey(userId),"realName");
+        if(StringUtils.isNotBlank(fieldValue)) return fieldValue;
+        List<String> userParam = new LinkedList<>(); userParam.add(userId);
+        Result<List<UserBaseInfoResultDTO>> userCacheResult = epmetUserOpenFeignClient.queryUserBaseInfo(userParam);
+        if(userCacheResult.success() && !CollectionUtils.isEmpty(userCacheResult.getData())){
+            return userCacheResult.getData().iterator().next().getRealName();
+        }
+        return null;
+    }
 }

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

@@ -297,4 +297,31 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	GroupDetailResultDTO getGroupDetail(String groupId);
 
 	void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction);
+
+	/**
+	 * @Description 工作端 查询组变更待审核列表
+	 * @param param
+	 * @return
+	 * @author wangc
+	 * @date 2020.11.03 10:19
+	*/
+	List<ApplyingGroupResultDTO> getEditAuditingList(CommonGridAndPageFormDTO param);
+
+	/**
+	 * @Description 查询小组修改信息的详情内容
+	 * @param param
+	 * @returncom.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO
+	 * @author wangc
+	 * @date 2020.11.03 14:10
+	*/
+	GroupEditionDetailResultDTO getEditAuditingDetail(GovGroupSummarizeFromDTO param);
+
+	/**
+	 * @Description 工作人员提交审核
+	 * @param param
+	 * @return void
+	 * @author wangc
+	 * @date 2020.11.03 16:02
+	*/
+	void auditEdit(GroupEditionAuditFormDTO param);
 }

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

@@ -33,11 +33,9 @@ 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.ConvertUtils;
+import com.epmet.commons.tools.utils.*;
-import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -73,6 +71,7 @@ import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -144,6 +143,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Autowired
 	private LoginUserUtil loginUserUtil;
 
+	@Autowired
+	private CpUserDetailRedis sysUserInfoRedis;
+
 	@Value("${openapi.scan.server.url}")
 	private String scanApiUrl;
 
@@ -1258,4 +1260,74 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			}
 		}
 	}
+
+	/**
+	 * @Description 工作端 查询组变更待审核列表
+	 * @param param
+	 * @return
+	 * @author wangc
+	 * @date 2020.11.03 10:19
+	 */
+	@Override
+	public List<ApplyingGroupResultDTO> getEditAuditingList(CommonGridAndPageFormDTO param) {
+		 return Optional.ofNullable(PageHelper.startPage(null == param.getPageNo() ? NumConstant.ONE : param.getPageNo() , null == param.getPageSize() ? NumConstant.TWELVE : param.getPageSize())
+				 .doSelectPage(() -> {
+			groupEditSubmitRecordDao.selectGroupEditApplyList(param.getGridId());}).getResult()).orElse(new LinkedList<>())
+				 .stream().map(o -> { return (ApplyingGroupResultDTO)o; }).collect(Collectors.toList());
+	}
+
+	/**
+	 * @Description 查询小组修改信息的详情内容 不加事务！
+	 * @param param
+	 * @return com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO
+	 * @author wangc
+	 * @date 2020.11.03 14:10
+	 */
+	@Override
+	public GroupEditionDetailResultDTO getEditAuditingDetail(GovGroupSummarizeFromDTO param) {
+        GroupEditSubmitRecordEntity edit = groupEditSubmitRecordDao.selectEditDetail(param.getGroupId(),null);
+        if(null == edit) {
+            logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.getEditAuditingDetail，未找到小组变更信息记录，传参：{}",JSON.toJSONString(param));
+            return null;}
+        //取消未读状态
+        GroupEditSubmitRecordEntity _update = new GroupEditSubmitRecordEntity();
+        _update.setId(edit.getId());_update.setReadFlag(ModuleConstant.READ);
+        groupEditSubmitRecordDao.updateById(_update);
+        GroupEditionDetailResultDTO result = ConvertUtils.sourceToTarget(edit, GroupEditionDetailResultDTO.class);
+        result.setGroupLeaderName(resiGroupRedis.getFullName(edit.getCreatedBy()));
+        return result;
+	}
+
+    /**
+     * @Description 工作人员提交审核
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2020.11.03 16:02
+     */
+    @Override
+	@Transactional(rollbackFor = Exception.class)
+    public void auditEdit(GroupEditionAuditFormDTO param) {
+    	if(StringUtils.equals(param.getAuditResult(),ModuleConstant.AUDITING_OPERATION_REJECT) && StringUtils.isBlank(param.getRemark())){
+    		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));
+			throw new RenException("更新组编辑记录时受影响行数小于1");
+		}
+		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);
+		}
+
+    }
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -328,4 +328,14 @@ public interface ModuleConstant extends Constant {
 	String FIELD_OPERATION_TYPE = "OPERATION_TYPE";
 
 	String CLOSED_TOPIC_REASON_PREFIX="话题已关闭：";
+
+	/**
+	 * 审核操作 同意
+	 */
+	String AUDITING_OPERATION_APPROVAL = "approved";
+
+	/**
+	 * 审核操作 拒绝
+	 */
+	String AUDITING_OPERATION_REJECT = "rejected";
 }

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

@@ -66,5 +66,72 @@
         limit 1
     </select>
 
+    <!-- 作端查询群组修改信息申请列表 -->
+    <select id="selectGroupEditApplyList" resultType="com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO">
+        SELECT
+            edit.GROUP_ID,
+            groupp.GROUP_NAME,
+            groupp.GROUP_HEAD_PHOTO,
+            edit.READ_FLAG,
+            edit.MESSAGE_TEXT,
+            DATE_FORMAT( edit.CREATED_TIME, '%Y-%m-%d %H:%i' ) AS submitTime
+        FROM
+            group_edit_submit_record edit
+            LEFT JOIN resi_group groupp ON edit.GROUP_ID = groupp.ID
+        WHERE
+            edit.DEL_FLAG = '0'
+            AND edit.GRID_ID = #{gridId}
+            AND edit.AUDIT_STATUS = 'under_auditing'
+            AND edit.STAFF_ID IS NULL
+        ORDER BY edit.CREATED_TIME DESC
+    </select>
+
+    <!-- 查询小组修改信息详情 -->
+    <select id="selectEditDetail" resultType="com.epmet.modules.group.entity.GroupEditSubmitRecordEntity">
+        SELECT
+            ID,
+            GROUP_ID,
+            GROUP_NAME,
+            GROUP_HEAD_PHOTO,
+            GROUP_INTRODUCTION,
+            CREATED_BY
+        FROM
+            group_edit_submit_record
+        WHERE
+            DEL_FLAG = '0'
+            AND GROUP_ID = #{groupId}
+            <choose>
+                <when test='null == auditResult or "" == auditResult'>
+                    AND AUDIT_STATUS = 'under_auditing'
+                </when>
+                <otherwise>
+                    AND AUDIT_STATUS = #{auditResult}
+                </otherwise>
+            </choose>
+
+        ORDER BY CREATED_TIME DESC
+        LIMIT 1
+    </select>
+
 
+    <update id="updateAuditResult">
+        UPDATE
+        group_edit_submit_record
+        SET
+        AUDIT_STATUS = #{auditStatus},
+        STAFF_ID = #{staffId},
+        <if test='null != remark and "" != remark'>
+            REMARK = #{remark},
+        </if>
+        AUDIT_TIME = NOW(),UPDATED_TIME = NOW(),UPDATED_BY = #{staffId}
+        WHERE
+        DEL_FLAG = '0'
+        AND
+        GROUP_ID = #{groupId}
+        AND
+        AUDIT_STATUS = 'under_auditIng'
+        AND
+        STAFF_ID IS NULL
+        LIMIT 1
+    </update>
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java

@@ -1,6 +1,6 @@
 package com.epmet.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import lombok.Data;
 
 import java.io.Serializable;