diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java index ec1cca017..c6442fcf0 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java @@ -27,53 +27,72 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 党员亮旗申请 + * 党员亮旗申请 * * @author elink elink@elink-cn.com * @since v1.0.0 2022-04-28 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("epdc_party_standard_bearer_apply") public class PartyStandardBearerApplyEntity extends DeptScope { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** * 用户ID */ - private String userId; + private String userId; /** * 真实姓名 */ - private String realName; + private String realName; /** * 身份证号 */ - private String identityNo; + private String identityNo; /** * 机构ID */ - private String deptId; + private String deptId; /** * 审核人姓名 */ - private String examinerName; + private String examinerName; /** * 审核状态 0 已提交 -1 已通过 -2 已驳回 + * 1 已通过 + * 2 已驳回 */ - private String examineFlag; + private String examineFlag; /** * 备注 */ - private String remark; + private String remark; + + + public enum ExamineFlagEnum { + + WAIT("0"), + PASS("1"), + REFUSE("2"); + + + private String value; + + public String value() { + return value; + } + + ExamineFlagEnum(String value) { + this.value = value; + } + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java index 4b696de35..2a0d96e03 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java @@ -68,12 +68,10 @@ import com.elink.esua.epdc.user.feign.PointFeignClient; import com.elink.esua.epdc.user.redis.UserRedis; import com.elink.esua.epdc.user.util.AppUserUtils; import com.google.common.collect.Lists; -import com.sun.xml.internal.ws.api.FeatureConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jsoup.helper.StringUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -1827,23 +1825,20 @@ public class UserServiceImpl extends BaseServiceImpl implem @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); + ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(gridId); PartyStandardBearerApplyEntity entity = new PartyStandardBearerApplyEntity(); entity.setDeptId(gridId); DeptEntityUtils.loadDeptInfo( ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class), entity ); - entity.setUserId(resultDto.getId()); entity.setRealName(resultDto.getRealName()); entity.setIdentityNo(resultDto.getIdentityNo()); + entity.setExamineFlag(PartyStandardBearerApplyEntity.ExamineFlagEnum.WAIT.value()); partyStandardBearerApplyDao.insert(entity); return new Result();