Browse Source

补充

feature/dangjian
YUJT 4 years ago
parent
commit
37760726e8
  1. 23
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java
  2. 9
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java

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

@ -66,8 +66,8 @@ public class PartyStandardBearerApplyEntity extends DeptScope {
/** /**
* 审核状态 0 已提交 * 审核状态 0 已提交
1 已通过 * 1 已通过
2 已驳回 * 2 已驳回
*/ */
private String examineFlag; private String examineFlag;
@ -76,4 +76,23 @@ public class PartyStandardBearerApplyEntity extends DeptScope {
*/ */
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;
}
}
} }

9
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.redis.UserRedis;
import com.elink.esua.epdc.user.util.AppUserUtils; import com.elink.esua.epdc.user.util.AppUserUtils;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.sun.xml.internal.ws.api.FeatureConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jsoup.helper.StringUtil; import org.jsoup.helper.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -1827,23 +1825,20 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
@Override @Override
public Result standarBearerApply(String userId, String gridId) { public Result standarBearerApply(String userId, String gridId) {
ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(gridId);
DeptEntityUtils.loadDeptInfo(
ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
PartyAuthenticationFailedEntity.class);
// 查询user表其他字段 // 查询user表其他字段
UserPartyStandardAppltResultDTO resultDto = baseDao.queryUserPartyApply(userId); UserPartyStandardAppltResultDTO resultDto = baseDao.queryUserPartyApply(userId);
ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(gridId);
PartyStandardBearerApplyEntity entity = new PartyStandardBearerApplyEntity(); PartyStandardBearerApplyEntity entity = new PartyStandardBearerApplyEntity();
entity.setDeptId(gridId); entity.setDeptId(gridId);
DeptEntityUtils.loadDeptInfo( DeptEntityUtils.loadDeptInfo(
ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class), ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
entity entity
); );
entity.setUserId(resultDto.getId()); entity.setUserId(resultDto.getId());
entity.setRealName(resultDto.getRealName()); entity.setRealName(resultDto.getRealName());
entity.setIdentityNo(resultDto.getIdentityNo()); entity.setIdentityNo(resultDto.getIdentityNo());
entity.setExamineFlag(PartyStandardBearerApplyEntity.ExamineFlagEnum.WAIT.value());
partyStandardBearerApplyDao.insert(entity); partyStandardBearerApplyDao.insert(entity);
return new Result(); return new Result();

Loading…
Cancel
Save