Browse Source

新增党员亮旗申请提交,党员亮旗状态查询接口

feature/dangjian
HAHA 3 years ago
parent
commit
b69d721145
  1. 2
      esua-epdc/epdc-cloud-commons-shibei
  2. 35
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
  3. 31
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
  4. 19
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
  5. 25
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
  6. 37
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  7. 128
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyStandardBearerApplyDTO.java
  8. 25
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/StandardBearerStatusResultDTO.java
  9. 42
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPageResultDTO.java
  10. 29
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPartyStandardAppltResultDTO.java
  11. 38
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPendingTrialResultDTO.java
  12. 28
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
  13. 94
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyStandardBearerApplyController.java
  14. 33
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyStandardBearerApplyDao.java
  15. 18
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
  16. 98
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyStandardBearerApplyEntity.java
  17. 89
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyStandardBearerApplyExcel.java
  18. 47
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyStandardBearerApplyRedis.java
  19. 95
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyStandardBearerApplyService.java
  20. 41
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
  21. 104
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyStandardBearerApplyServiceImpl.java
  22. 60
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
  23. 28
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyStandardBearerApplyDao.xml
  24. 24
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
  25. 6
      renren-cloud-generator/src/main/resources/application.yml

2
esua-epdc/epdc-cloud-commons-shibei

@ -1 +1 @@
Subproject commit 3eb7590cbdd89224de0b0a8d7ec9a7a851667e49
Subproject commit 0308dc940b9fe23a8b4b20208cec7ac70643312e

35
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@ -6,13 +6,17 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.dto.StandardBearerStatusResultDTO;
import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
import com.elink.esua.epdc.dto.result.*;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
import com.elink.esua.epdc.service.AppUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -336,4 +340,31 @@ public class ApiAppUserController {
public Result signIn(@LoginUser TokenDto userDetail) {
return appUserService.signIn(userDetail);
}
/**
* 党员亮旗状态查询
*
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.StandardBearerStatusResultDTO>
* @author LZN
* @date 2022/4/28 14:06
*/
@GetMapping("/party/standardbearer/status")
public Result<StandardBearerStatusResultDTO> StandarBearerStatus(@LoginUser TokenDto userDetail) {
return appUserService.StandarBearerStatus(userDetail);
}
/**
* 党员亮旗申请提交
*
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author LZN
* @date 2022/4/28 15:05
*/
@PostMapping("/party/standardbearer/apply ")
public Result StandarBearerApply(@LoginUser TokenDto userDetail) {
return appUserService.StandarBearerApply(userDetail);
}
}

31
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@ -1,25 +1,22 @@
package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.CachingUserInfoDTO;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
import com.elink.esua.epdc.dto.UserGridRelationDTO;
import com.elink.esua.epdc.dto.UserWxFormIdDTO;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.*;
import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
import org.apache.ibatis.annotations.Param;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* appuser端接口
@ -370,6 +367,7 @@ public interface UserFeignClient {
/**
* 志愿者认证
* needCachingUserInfoByUserId
*
* @param userId
* @return
*/
@ -436,4 +434,19 @@ public interface UserFeignClient {
*/
@GetMapping("app-user/epdc-app/user/getActivePoints/{userId}")
Result<UserActivePointsResultDTO> getActivePoints(@PathVariable("userId") String userId);
@GetMapping("/app-user/epdc-app/user/brightFlag/{userId}")
Result<StandardBearerStatusResultDTO> BrightFlag(@PathVariable("userId") String userId);
/**
* 党员亮旗申请提交
*
* @param userId
* @param gridId
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author LZN
* @date 2022/4/28 15:15
*/
@PostMapping("/app-user/epdc-app/user/StandarBearerApply/{userId}/{gridId}")
Result StandarBearerApply(@PathVariable("userId") String userId, @PathVariable("gridId") Long gridId);
}

19
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@ -1,13 +1,10 @@
package com.elink.esua.epdc.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.CachingUserInfoDTO;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
import com.elink.esua.epdc.dto.UserGridRelationDTO;
import com.elink.esua.epdc.dto.UserWxFormIdDTO;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.*;
import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
@ -16,6 +13,7 @@ import com.elink.esua.epdc.feign.UserFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
* @author yujintao
@ -204,6 +202,7 @@ public class UserFeignClientFallback implements UserFeignClient {
public Result updateInvitationCodeUrl(UserGridInvitationCodeDTO userGridInvitationCodeDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateInvitationCodeUrl", userGridInvitationCodeDTO);
}
@Override
public Result saveInformation(UserLoginLogDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER,
@ -214,4 +213,14 @@ public class UserFeignClientFallback implements UserFeignClient {
public Result<UserActivePointsResultDTO> getActivePoints(String userId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getActivePoints", userId);
}
@Override
public Result<StandardBearerStatusResultDTO> BrightFlag(String userId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "brightFlag", userId);
}
@Override
public Result StandarBearerApply(String userId, Long gridId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "standarBearerApply", userId, gridId);
}
}

25
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@ -1,8 +1,11 @@
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.StandardBearerStatusResultDTO;
import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
import com.elink.esua.epdc.dto.UserPendingTrialResultDTO;
import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
@ -16,6 +19,7 @@ import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
import java.util.List;
import java.util.Map;
/**
* @author yujintao
@ -315,4 +319,25 @@ public interface AppUserService {
* @date 2021/9/29 16:15
*/
Result signIn(TokenDto userDetail);
/**
* 党员亮旗状态查询
*
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.StandardBearerStatusResultDTO>
* @author LZN
* @date 2022/4/28 14:07
*/
Result<StandardBearerStatusResultDTO> StandarBearerStatus(TokenDto userDetail);
/**
* 党员亮旗申请提交
*
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author LZN
* @date 2022/4/28 15:05
*/
Result StandarBearerApply(TokenDto userDetail);
}

37
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@ -12,6 +12,7 @@ import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.enums.*;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
import com.elink.esua.epdc.commons.tools.utils.*;
import com.elink.esua.epdc.dto.*;
@ -61,10 +62,7 @@ import javax.servlet.http.HttpServletRequest;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
@ -1444,4 +1442,35 @@ public class AppUserServiceImpl implements AppUserService {
pointLogFormDTO.setUserId(userDetail.getUserId());
return pointFeignClient.updataPoint(pointLogFormDTO);
}
@Override
public Result<StandardBearerStatusResultDTO> StandarBearerStatus(TokenDto userDetail) {
StandardBearerStatusResultDTO dto = new StandardBearerStatusResultDTO();
// 判断是否是党员
boolean isPartyMember = UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER);
if (isPartyMember == Boolean.FALSE) {
dto.setStatus(NumConstant.ZERO_STR);
return new Result<StandardBearerStatusResultDTO>().ok(dto);
}
// 判断是否亮党旗
boolean isBrightFlag = UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_STANDARD_BEARER);
if (isBrightFlag == Boolean.TRUE) {
dto.setStatus(NumConstant.TWO_STR);
return new Result<StandardBearerStatusResultDTO>().ok(dto);
}
// 查询是否申请过亮党旗
return userFeignClient.BrightFlag(userDetail.getUserId());
}
@Override
public Result StandarBearerApply(TokenDto userDetail) {
// 判断是否为党员
boolean isPartyMember = UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER);
if (isPartyMember == Boolean.FALSE) {
new Result().error("只允许党员用户发起申请");
}
return userFeignClient.StandarBearerApply(userDetail.getUserId(), userDetail.getGridId());
}
}

128
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyStandardBearerApplyDTO.java

@ -0,0 +1,128 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 党员亮旗申请
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-04-28
*/
@Data
public class PartyStandardBearerApplyDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 用户ID
*/
private String userId;
/**
* 真实姓名
*/
private String realName;
/**
* 身份证号
*/
private String identityNo;
/**
* 机构ID
*/
private String deptId;
/**
* 上级机构ID拼接
*/
private String parentDeptIds;
/**
* 上级机构名称拼接
*/
private String parentDeptNames;
/**
* 全部机构ID拼接
*/
private String allDeptIds;
/**
* 全部机构名称拼接
*/
private String allDeptNames;
/**
* 审核人姓名
*/
private String examinerName;
/**
* 审核状态 0 已提交
1 已通过
2 已驳回
*/
private String examineFlag;
/**
* 备注
*/
private String remark;
/**
* 删除标识 0.未删除 1.已删除
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

25
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/StandardBearerStatusResultDTO.java

@ -0,0 +1,25 @@
package com.elink.esua.epdc.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class StandardBearerStatusResultDTO implements Serializable {
private static final long serialVersionUID = 9128060857086420138L;
/**
* '0'不是党员
* '1'党员首次申请亮旗
* '2'已是亮旗党员
* '3'党员亮旗申请未通过
*/
private String status;
/**
* applyStatus = '3' 展示审核未通过的备注
*/
private String remark;
}

42
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPageResultDTO.java

@ -0,0 +1,42 @@
package com.elink.esua.epdc.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class UserPageResultDTO implements Serializable {
private static final long serialVersionUID = 5045626981759008058L;
/**
* 电话
*/
private String mobile;
/**
* 性别女性-0男性-1
*/
private String sex;
/**
* 手机号
*/
private String telePhone;
/**
* 真实姓名
*/
private String realName;
/**
* 身份证
*/
private String identityNo;
/**
* 小区名称
*/
private String villageName;
}

29
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPartyStandardAppltResultDTO.java

@ -0,0 +1,29 @@
package com.elink.esua.epdc.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class UserPartyStandardAppltResultDTO implements Serializable {
private static final long serialVersionUID = -110583735283145093L;
/**
* 主键
*/
private String id;
/**
* 真实姓名
*/
private String realName;
/**
*身份证号
*/
private String identityNo;
}

38
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPendingTrialResultDTO.java

@ -0,0 +1,38 @@
package com.elink.esua.epdc.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class UserPendingTrialResultDTO implements Serializable {
private static final long serialVersionUID = -3873561798809799809L;
/**
* 手机号
*/
private String mobile;
/**
* 真实姓名
*/
private String realName;
/**
*身份证号
*/
private String identityNo;
/**
*小区名称
*/
private String villageName;
/**
* 居民住址
*/
private String address;
}

28
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.CachingUserInfoDTO;
import com.elink.esua.epdc.dto.StandardBearerStatusResultDTO;
import com.elink.esua.epdc.dto.UserActivePointsResultDTO;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.dto.epdc.form.*;
@ -441,4 +442,31 @@ public class EpdcAppUserController {
return userService.getActivePoints(userId);
}
/**
* 是否申请过亮党旗
*
* @param userId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.StandardBearerStatusResultDTO>
* @author LZN
* @date 2022/4/28 14:22
*/
@GetMapping("/brightFlag/{userId}")
public Result<StandardBearerStatusResultDTO> BrightFlag(@PathVariable String userId) {
return userService.BrightFlag(userId);
}
/**
* 党员亮旗申请提交
*
* @param userId
* @param gridId
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author LZN
* @date 2022/4/28 15:14
*/
@PostMapping("/StandarBearerApply/{userId}/{gridId}")
public Result StandarBearerApply(@PathVariable String userId, @PathVariable String gridId) {
return userService.StandarBearerApply(userId, gridId);
}
}

94
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyStandardBearerApplyController.java

@ -0,0 +1,94 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.dto.PartyStandardBearerApplyDTO;
import com.elink.esua.epdc.excel.PartyStandardBearerApplyExcel;
import com.elink.esua.epdc.service.PartyStandardBearerApplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 党员亮旗申请
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-04-28
*/
@RestController
@RequestMapping("partystandardbearerapply")
public class PartyStandardBearerApplyController {
@Autowired
private PartyStandardBearerApplyService partyStandardBearerApplyService;
@GetMapping("page")
public Result<PageData<PartyStandardBearerApplyDTO>> page(@RequestParam Map<String, Object> params){
PageData<PartyStandardBearerApplyDTO> page = partyStandardBearerApplyService.page(params);
return new Result<PageData<PartyStandardBearerApplyDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<PartyStandardBearerApplyDTO> get(@PathVariable("id") String id){
PartyStandardBearerApplyDTO data = partyStandardBearerApplyService.get(id);
return new Result<PartyStandardBearerApplyDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody PartyStandardBearerApplyDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
partyStandardBearerApplyService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody PartyStandardBearerApplyDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
partyStandardBearerApplyService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
partyStandardBearerApplyService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<PartyStandardBearerApplyDTO> list = partyStandardBearerApplyService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, PartyStandardBearerApplyExcel.class);
}
}

33
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyStandardBearerApplyDao.java

@ -0,0 +1,33 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.entity.PartyStandardBearerApplyEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 党员亮旗申请
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-04-28
*/
@Mapper
public interface PartyStandardBearerApplyDao extends BaseDao<PartyStandardBearerApplyEntity> {
}

18
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@ -17,10 +17,10 @@
package com.elink.esua.epdc.dao;
import com.alibaba.druid.sql.visitor.functions.Char;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.CachingUserInfoDTO;
import com.elink.esua.epdc.dto.UserActivePointsResultDTO;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
@ -401,4 +401,16 @@ public interface UserDao extends BaseDao<UserEntity> {
* @param userBaseInfoDTO
*/
void updateUserResiInfo(EpmetUserResiInfoDTO userBaseInfoDTO);
/**
* 查询是否亮过党旗
* @param userId
*/
StandardBearerStatusResultDTO getBrightFlag(@Param("userId") String userId);
/**
* 查询user表其他字段
* @param userId
*/
UserPartyStandardAppltResultDTO queryUserPartyApply(@Param("userId") String userId);
}

98
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyStandardBearerApplyEntity.java

@ -0,0 +1,98 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 党员亮旗申请
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-04-28
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("epdc_party_standard_bearer_apply")
public class PartyStandardBearerApplyEntity extends BaseEpdcEntity {
private static final long serialVersionUID = 1L;
/**
* 用户ID
*/
private String userId;
/**
* 真实姓名
*/
private String realName;
/**
* 身份证号
*/
private String identityNo;
/**
* 机构ID
*/
private String deptId;
/**
* 上级机构ID拼接
*/
private String parentDeptIds;
/**
* 上级机构名称拼接
*/
private String parentDeptNames;
/**
* 全部机构ID拼接
*/
private String allDeptIds;
/**
* 全部机构名称拼接
*/
private String allDeptNames;
/**
* 审核人姓名
*/
private String examinerName;
/**
* 审核状态 0 已提交
1 已通过
2 已驳回
*/
private String examineFlag;
/**
* 备注
*/
private String remark;
}

89
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyStandardBearerApplyExcel.java

@ -0,0 +1,89 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 党员亮旗申请
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-04-28
*/
@Data
public class PartyStandardBearerApplyExcel {
@Excel(name = "主键")
private String id;
@Excel(name = "用户ID")
private String userId;
@Excel(name = "真实姓名")
private String realName;
@Excel(name = "身份证号")
private String identityNo;
@Excel(name = "机构ID")
private String deptId;
@Excel(name = "上级机构ID拼接")
private String parentDeptIds;
@Excel(name = "上级机构名称拼接")
private String parentDeptNames;
@Excel(name = "全部机构ID拼接")
private String allDeptIds;
@Excel(name = "全部机构名称拼接")
private String allDeptNames;
@Excel(name = "审核人姓名")
private String examinerName;
@Excel(name = "审核状态 0 已提交 1 已通过 2 已驳回")
private String examineFlag;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标识 0.未删除 1.已删除")
private String delFlag;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}

47
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyStandardBearerApplyRedis.java

@ -0,0 +1,47 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.redis;
import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 党员亮旗申请
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-04-28
*/
@Component
public class PartyStandardBearerApplyRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

95
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyStandardBearerApplyService.java

@ -0,0 +1,95 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dto.PartyStandardBearerApplyDTO;
import com.elink.esua.epdc.entity.PartyStandardBearerApplyEntity;
import java.util.List;
import java.util.Map;
/**
* 党员亮旗申请
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-04-28
*/
public interface PartyStandardBearerApplyService extends BaseService<PartyStandardBearerApplyEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<PartyStandardBearerApplyDTO>
* @author generator
* @date 2022-04-28
*/
PageData<PartyStandardBearerApplyDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<PartyStandardBearerApplyDTO>
* @author generator
* @date 2022-04-28
*/
List<PartyStandardBearerApplyDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return PartyStandardBearerApplyDTO
* @author generator
* @date 2022-04-28
*/
PartyStandardBearerApplyDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2022-04-28
*/
void save(PartyStandardBearerApplyDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2022-04-28
*/
void update(PartyStandardBearerApplyDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2022-04-28
*/
void delete(String[] ids);
}

41
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@ -41,25 +41,24 @@ public interface UserService extends BaseService<UserEntity> {
PageData<UserDTO> page(Map<String, Object> params);
/**
*
* 待认证党员列表
*
* @params [params]
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>
* @params [params]
* @author liuchuang
* @since 2020/3/23 15:57
*/
PageData<UserDTO> waitPartyPage(Map<String, Object> params);
List<UserDTO> list(Map<String, Object> params);
List<UserDTO> listExportUn(Map<String, Object> params);
/**
*
* 待认证党员导出
*
* @params [params]
* @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
* @params [params]
* @author liuchuang
* @since 2020/3/23 16:25
*/
@ -76,33 +75,30 @@ public interface UserService extends BaseService<UserEntity> {
void audit(UserDTO dto);
/**
*
* 党员认证
*
* @params [dto]
* @return void
* @params [dto]
* @author liuchuang
* @since 2020/3/23 17:56
*/
Result<List<PartyMembersDTO>> partyReview(UserDTO dto);
/**
*
* 党员认证通过并更新党员库信息
*
* @params [dto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @params [dto]
* @author liuchuang
* @since 2020/3/24 19:46
*/
Result modifyPartyInfo(PartyMemberModifyFormDTO dto);
/**
*
* 新增党员信息并认证通过
*
* @params [dto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @params [dto]
* @author liuchuang
* @since 2020/3/25 14:33
*/
@ -375,11 +371,10 @@ public interface UserService extends BaseService<UserEntity> {
UserDTO updateWxInfo(UserDTO userDto);
/**
*
* 事件修改组织机构信息
*
* @params [dto]
* @return void
* @params [dto]
* @author liuchuang
* @since 2020/3/7 1:23
*/
@ -417,4 +412,26 @@ public interface UserService extends BaseService<UserEntity> {
Result<Boolean> updatePointsUser(UserPointsFormDTO formDTO);
Result<UserActivePointsResultDTO> getActivePoints(String userId);
/**
* 是否申请过亮党旗
*
* @param userId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.StandardBearerStatusResultDTO>
* @author LZN
* @date 2022/4/28 14:23
*/
Result<StandardBearerStatusResultDTO> BrightFlag(String userId);
/**
* 党员亮旗申请提交
*
* @param userId
* @param gridId
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author LZN
* @date 2022/4/28 15:15
*/
Result StandarBearerApply(String userId, String gridId);
}

104
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyStandardBearerApplyServiceImpl.java

@ -0,0 +1,104 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.dao.PartyStandardBearerApplyDao;
import com.elink.esua.epdc.dto.PartyStandardBearerApplyDTO;
import com.elink.esua.epdc.entity.PartyStandardBearerApplyEntity;
import com.elink.esua.epdc.redis.PartyStandardBearerApplyRedis;
import com.elink.esua.epdc.service.PartyStandardBearerApplyService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 党员亮旗申请
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-04-28
*/
@Service
public class PartyStandardBearerApplyServiceImpl extends BaseServiceImpl<PartyStandardBearerApplyDao, PartyStandardBearerApplyEntity> implements PartyStandardBearerApplyService {
@Autowired
private PartyStandardBearerApplyRedis partyStandardBearerApplyRedis;
@Override
public PageData<PartyStandardBearerApplyDTO> page(Map<String, Object> params) {
IPage<PartyStandardBearerApplyEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, PartyStandardBearerApplyDTO.class);
}
@Override
public List<PartyStandardBearerApplyDTO> list(Map<String, Object> params) {
List<PartyStandardBearerApplyEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, PartyStandardBearerApplyDTO.class);
}
private QueryWrapper<PartyStandardBearerApplyEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<PartyStandardBearerApplyEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public PartyStandardBearerApplyDTO get(String id) {
PartyStandardBearerApplyEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, PartyStandardBearerApplyDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(PartyStandardBearerApplyDTO dto) {
PartyStandardBearerApplyEntity entity = ConvertUtils.sourceToTarget(dto, PartyStandardBearerApplyEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(PartyStandardBearerApplyDTO dto) {
PartyStandardBearerApplyEntity entity = ConvertUtils.sourceToTarget(dto, PartyStandardBearerApplyEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
}

60
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@ -40,10 +40,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.*;
import com.elink.esua.epdc.constant.AuthenticatedConsant;
import com.elink.esua.epdc.constant.UserFieldConsant;
import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao;
import com.elink.esua.epdc.dao.PartyMembersDao;
import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao;
import com.elink.esua.epdc.dao.UserDao;
import com.elink.esua.epdc.dao.*;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
@ -122,6 +119,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
@Autowired
private PointFeignClient pointFeignClient;
@Autowired
private PartyStandardBearerApplyDao partyStandardBearerApplyDao;
@Override
@DataSource(value = DataSourceNames.FIRST)
public PageData<UserDTO> page(Map<String, Object> params) {
@ -984,6 +984,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
/**
* 产品库推送用户居民端注册信息表user_resi_info
*
* @param userId
* @author wgf
*/
@ -1010,6 +1011,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
/**
* 产品库推送用户基本信息user_base_info
*
* @param userId
* @author wgf
*/
@ -1036,6 +1038,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
/**
* 产品库推送用户角色关系user_role
*
* @param userId
* @param partyFlag
* @param gridId
@ -1058,6 +1061,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
/**
* 产品库推送用户信息user
*
* @param userId
* @author wgf
*/
@ -1785,6 +1789,54 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
}
/**
* 是否申请过亮党旗
*
* @param userId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.StandardBearerStatusResultDTO>
* @author LZN
* @date 2022/4/28 14:24
*/
@Override
public Result<StandardBearerStatusResultDTO> BrightFlag(String userId) {
StandardBearerStatusResultDTO dto = baseDao.getBrightFlag(userId);
if (StringUtils.isBlank(dto.getStatus()) && StringUtils.isBlank(dto.getRemark())) {
dto.setStatus(NumConstant.ONE_STR);
return new Result<StandardBearerStatusResultDTO>().ok(dto);
}
if (dto.getStatus() == NumConstant.ZERO_STR) {
dto.setStatus(NumConstant.FOUR_STR);
return new Result<StandardBearerStatusResultDTO>().ok(dto);
}
dto.setStatus(NumConstant.THREE_STR);
return new Result<StandardBearerStatusResultDTO>().ok(dto);
}
@Override
public Result StandarBearerApply(String userId, String gridId) {
ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(gridId);
DeptEntityUtils.loadDeptInfo(
ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
PartyAuthenticationFailedEntity.class);
// 查询user表其他字段
UserPartyStandardAppltResultDTO resultDto = baseDao.queryUserPartyApply(userId);
PartyStandardBearerApplyEntity entity = new PartyStandardBearerApplyEntity();
entity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds());
entity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
entity.setDeptId(gridId);
entity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());
entity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames());
entity.setUserId(resultDto.getId());
entity.setRealName(resultDto.getRealName());
entity.setIdentityNo(resultDto.getIdentityNo());
partyStandardBearerApplyDao.insert(entity);
return new Result();
}
/**
* 用户信息校验
*

28
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyStandardBearerApplyDao.xml

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.elink.esua.epdc.dao.PartyStandardBearerApplyDao">
<resultMap type="com.elink.esua.epdc.entity.PartyStandardBearerApplyEntity" id="partyStandardBearerApplyMap">
<result property="id" column="ID"/>
<result property="userId" column="USER_ID"/>
<result property="realName" column="REAL_NAME"/>
<result property="identityNo" column="IDENTITY_NO"/>
<result property="deptId" column="DEPT_ID"/>
<result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
<result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
<result property="allDeptIds" column="ALL_DEPT_IDS"/>
<result property="allDeptNames" column="ALL_DEPT_NAMES"/>
<result property="examinerName" column="EXAMINER_NAME"/>
<result property="examineFlag" column="EXAMINE_FLAG"/>
<result property="remark" column="REMARK"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
</mapper>

24
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@ -1761,6 +1761,30 @@
where user.DEL_FLAG = '0'
and user.ID = #{userId}
</select>
<select id="getBrightFlag" resultType="com.elink.esua.epdc.dto.StandardBearerStatusResultDTO">
SELECT
a.EXAMINE_FLAG as status,
a.REMARK
FROM
epdc_party_standard_bearer_apply a
WHERE
a.USER_ID = #{userId} AND a.DEL_FLAG = '0'
ORDER BY
CREATED_TIME DESC
LIMIT 1
</select>
<select id="queryUserPartyApply" resultType="com.elink.esua.epdc.dto.UserPartyStandardAppltResultDTO">
SELECT
u.id,
u.REAL_NAME,
u.IDENTITY_NO
FROM
epdc_user u
WHERE
u.id = #{userId}
AND u.DEL_FLAG = '0'
</select>
<insert id="insertUserResiInfo" parameterType="com.elink.esua.epdc.dto.product.result.EpmetUserResiInfoDTO">
insert into epmet_user.user_resi_info

6
renren-cloud-generator/src/main/resources/application.yml

@ -9,9 +9,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
#MySQL配置
driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://47.104.224.45:3308/esua_epdc_kpi?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: epdc
password: elink833066
url: jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: Abc@123456
#oracle配置
# driverClassName: oracle.jdbc.OracleDriver
# url: jdbc:oracle:thin:@192.168.10.10:1521:helowin

Loading…
Cancel
Save