特殊客户-居民和热心居民显示名称修改

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

@@ -140,8 +140,9 @@ public class ResiGroupController {
 	 */
 	@PostMapping("edit-auditing-list")
 	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_EDIT_AUDITINGLIST)
-	public Result<List<ApplyingGroupResultDTO>> getEditAuditingList(@RequestBody CommonGridAndPageFormDTO param){
+	public Result<List<ApplyingGroupResultDTO>> getEditAuditingList(@LoginUser TokenDto tokenDto, @RequestBody CommonGridAndPageFormDTO param){
 		ValidatorUtils.validateEntity(param, CommonGridAndPageFormDTO.GridPageGroup.class);
+		param.setCustomerId(tokenDto.getCustomerId());
 		return groupOpenFeignClient.govEditAuditingList(param);
 	}
 

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

@@ -37,4 +37,6 @@ public class CommonGridAndPageFormDTO implements Serializable {
     @Min(1)
     private Integer pageSize;
 
+    private String customerId;
+
 }

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

@@ -19,6 +19,7 @@ package com.epmet.modules.group.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -405,7 +406,17 @@ public class ResiGroupController {
      */
     @PostMapping("gov-edit-auditing-list")
     public Result<List<ApplyingGroupResultDTO>> govEditAuditingList(@RequestBody CommonGridAndPageFormDTO param){
-        return new Result<List<ApplyingGroupResultDTO>>().ok(resiGroupService.getEditAuditingList(param));
+        List<ApplyingGroupResultDTO> list = resiGroupService.getEditAuditingList(param);
+        if (StrConstant.SPECIAL_CUSTOMER.equals(param.getCustomerId())) {
+            list.forEach(item -> {
+                if (item.getMessageText().contains("热心居民")) {
+                    item.setMessageText(item.getMessageText().replace("热心居民", "组长"));
+                } else if (item.getMessageText().contains("居民")) {
+                    item.setMessageText(item.getMessageText().replace("居民", "学员"));
+                }
+            });
+        }
+        return new Result<List<ApplyingGroupResultDTO>>().ok(list);
     }
 
     /**

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

@@ -21,10 +21,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.constant.*;
-import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -384,7 +381,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				applyCreateGroupFormDTO.getGridId());
 		if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
 			logger.info(String.format("创建小组异常:%s",EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg()));
-			throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
+			if (StrConstant.SPECIAL_CUSTOMER.equals(applyCreateGroupFormDTO.getCustomerId())) {
+				throw new RenException(8002, "只有组长才能创建小组");
+			} else {
+				throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
+			}
 		}
 		String roleName = "";
 		if(NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag())){
@@ -495,7 +496,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 		if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) {
 			logger.info(String.format("加入小组界面初始化查询成功,当前用户非注册居民,epmet-user-server接口入参%s,返回%s",JSON.toJSONString(resiUserInfoFormDTO),JSON.toJSONString(result)));
-			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+			if (StrConstant.SPECIAL_CUSTOMER.equals(initApplyGroupFormDTO.getCustomerId())) {
+				throw new RenException(8001, "只有注册学员才可以加入小组");
+			} else {
+				throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+			}
+
 		}
 	}
 
@@ -526,7 +532,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				initApplyCreatedGroupFormDTO.getGridId());
 		if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
 			logger.info(String.format("创建小组界面初始化查询成功,用户角色列表%s",JSON.toJSONString(userRoleDTO)));
-			throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
+			if (StrConstant.SPECIAL_CUSTOMER.equals(initApplyCreatedGroupFormDTO.getCustomerId())) {
+				throw new RenException(8002, "只有组长才能创建小组");
+			} else {
+				throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
+			}
 		}
 	}
 
@@ -849,7 +859,17 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			throw new RenException(ModuleConstant.PAGE_INDEX_NOT_NULL);
 		}
 		params.setPageNo((params.getPageNo() - NumConstant.ONE) * params.getPageSize());
-		return new Result<List<ApplyingGroupResultDTO>>().ok(baseDao.getApplyingGroupsByCustIdAndGridId(params));
+		List<ApplyingGroupResultDTO> list = baseDao.getApplyingGroupsByCustIdAndGridId(params);
+		if (StrConstant.SPECIAL_CUSTOMER.equals(params.getCustomerId())) {
+			list.forEach(item -> {
+				if (item.getMessageText().contains("热心居民")) {
+					item.setMessageText(item.getMessageText().replace("热心居民", "组长"));
+				} else if (item.getMessageText().contains("居民")) {
+					item.setMessageText(item.getMessageText().replace("居民", "学员"));
+				}
+			});
+		}
+		return new Result<List<ApplyingGroupResultDTO>>().ok(list);
 	}
 
 	/**
@@ -1234,7 +1254,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			}
 		}
 		if (!isWarmhearted && !isPartymember) {
-			throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode(), "只有党员和热心居民才能创建和编辑小组");
+			if (StrConstant.SPECIAL_CUSTOMER.equals(customerId)) {
+				throw new RenException(8002, "只有组长才能创建小组");
+			} else {
+				throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
+			}
 		}
 		String roleName = "";
 		if (isPartymember) {

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

@@ -387,7 +387,11 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		//4、校验是否已经注册居民
 		if(null==result.getData().getUserRoleList()||result.getData().getUserRoleList().size()==0){
 			logger.warn(String.format("用户通过邀请链接入组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
-			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+			if (StrConstant.SPECIAL_CUSTOMER.equals(resiGroupDTO.getCustomerId())) {
+				throw new RenException(8001, "只有注册学员才可以加入小组");
+			} else {
+				throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+			}
 		}
 		UserRoleDTO userRoleDTO=this.getUserRoleDTO(result.getData().getUserRoleList());
 		//5、新增一条邀请入群、直接审核通过的入群记录
@@ -481,7 +485,11 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		//4、校验是否已经注册居民
 		if(null==result.getData().getUserRoleList()||result.getData().getUserRoleList().size()==0){
 			logger.warn(String.format("用户通过扫码入组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
-			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+			if (StrConstant.SPECIAL_CUSTOMER.equals(resiGroupDTO.getCustomerId())) {
+				throw new RenException(8001, "只有注册学员才可以加入小组");
+			} else {
+				throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+			}
 		}
 		//2020.11.17 sun 新增扫描或邀请进组是否需要审核的逻辑  start
 		GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();

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

@@ -226,7 +226,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 					resiGroupDTO.getGridId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
 				logger.error(String.format("居民端用户【%s】申请加入小组【%s】失败,%s", applyJoinGroupFormDTO.getUserId(), applyJoinGroupFormDTO.getGroupId(), EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
-				throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+				if (StrConstant.SPECIAL_CUSTOMER.equals(resiGroupDTO.getCustomerId())) {
+					throw new RenException(8001, "只有注册学员才可以加入小组");
+				} else {
+					throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+				}
 			}
 		}
 		//查看用户最新一条成员处理记录，避免重复申请

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@@ -153,8 +153,13 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		userResiInfoFormDTO.setUserId(formDTO.getUserId());
 		Result<UserResiInfoResultDTO> result1 = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
 		if (!result1.success() || null == result1.getData()) {
-			result.setCode(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode());
+			if (StrConstant.SPECIAL_CUSTOMER.equals(formDTO.getCustomerId())) {
-			result.setMsg(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
+				result.setCode(8201);
+				result.setMsg("请完善学员信息");
+			} else {
+				result.setCode(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode());
+				result.setMsg(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
+			}
 			return result;
 		}
 		//1:热心居民申请行为记录表新增数据