parent
b78348262b
commit
4dd7a1a39d
|
|
@ -5,14 +5,12 @@ import com.alibaba.cola.dto.MultiResponse;
|
||||||
import com.alibaba.cola.dto.SingleResponse;
|
import com.alibaba.cola.dto.SingleResponse;
|
||||||
import com.zcloud.basic.info.api.UserServiceI;
|
import com.zcloud.basic.info.api.UserServiceI;
|
||||||
import com.zcloud.basic.info.command.convertor.UserCoConvertor;
|
import com.zcloud.basic.info.command.convertor.UserCoConvertor;
|
||||||
import com.zcloud.basic.info.dto.UserAddCmd;
|
|
||||||
import com.zcloud.basic.info.dto.clientobject.UserCO;
|
import com.zcloud.basic.info.dto.clientobject.UserCO;
|
||||||
import com.zcloud.basic.info.persistence.dataobject.UserDO;
|
import com.zcloud.basic.info.persistence.dataobject.UserDO;
|
||||||
import com.zcloud.basic.info.persistence.dataobject.UserImgDO;
|
import com.zcloud.basic.info.persistence.dataobject.UserImgDO;
|
||||||
import com.zcloud.basic.info.persistence.repository.UserRepository;
|
import com.zcloud.basic.info.persistence.repository.UserRepository;
|
||||||
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||||
import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserFacade;
|
import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserFacade;
|
||||||
import com.zcloud.gbscommon.zclouduser.request.ZcloudUserAddCmd;
|
|
||||||
import com.zcloud.gbscommon.zclouduser.request.ZcloudUserImgQry;
|
import com.zcloud.gbscommon.zclouduser.request.ZcloudUserImgQry;
|
||||||
import com.zcloud.gbscommon.zclouduser.request.ZcloudUserQry;
|
import com.zcloud.gbscommon.zclouduser.request.ZcloudUserQry;
|
||||||
import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo;
|
import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo;
|
||||||
|
|
@ -99,12 +97,4 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade {
|
||||||
return MultiResponse.of(zcloudUserImgBase64Cos);
|
return MultiResponse.of(zcloudUserImgBase64Cos);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public SingleResponse addHumanUser(ZcloudUserAddCmd cmd) {
|
|
||||||
UserAddCmd userAddCmd = new UserAddCmd();
|
|
||||||
BeanUtil.copyProperties(cmd, userAddCmd);
|
|
||||||
userServiceI.addHumanUser(userAddCmd);
|
|
||||||
return SingleResponse.buildSuccess();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -635,42 +635,5 @@ public class UserAddExe {
|
||||||
imgFilesRepository.saveBatch(newImgFiles);
|
imgFilesRepository.saveBatch(newImgFiles);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
|
||||||
public boolean executeHumanUser(UserAddCmd cmd) {
|
|
||||||
UserE userE = new UserE();
|
|
||||||
BeanUtils.copyProperties(cmd, userE);
|
|
||||||
userE.setTenantId(cmd.getCorpinfoId());
|
|
||||||
//校验手机号
|
|
||||||
List<Integer> employmentFlagList = Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode());
|
|
||||||
List<UserDO> userList = userRepository.getListByPhone(userE.getPhone(), employmentFlagList);
|
|
||||||
if (CollUtil.isNotEmpty(userList)) {
|
|
||||||
List<UserE> userEList = userCoConvertor.convertDOsToEs(userList);
|
|
||||||
userE.checkPhone(userEList);
|
|
||||||
}
|
|
||||||
|
|
||||||
CorpInfoDO corpInfoDO = corpInfoRepository.getById(userE.getCorpinfoId());
|
|
||||||
String corpName = null;
|
|
||||||
UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE();
|
|
||||||
BeanUtils.copyProperties(userE, userEmploymentLogE);
|
|
||||||
boolean res = false;
|
|
||||||
try {
|
|
||||||
userE.setUserType(CorpTypeEnum.getUserTypeByCode(corpInfoDO.getType()));
|
|
||||||
userE.resetPassword(corpInfoDO.getType());
|
|
||||||
userE.setDepartmentLeaderFlag(0);
|
|
||||||
res = userGateway.add(userE);
|
|
||||||
if (corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())) {
|
|
||||||
corpName = corpInfoDO.getCorpName();
|
|
||||||
}
|
|
||||||
userEmploymentLogE.initAdd(userEmploymentLogE, corpName, userE.getId());
|
|
||||||
userEmploymentLogGateway.add(userEmploymentLogE);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
if (!res) {
|
|
||||||
throw new BizException("保存失败");
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -265,11 +265,5 @@ public class UserServiceImpl implements UserServiceI {
|
||||||
public PageResponse<UserCO> pageByNopermission(UserPageQry qry) {
|
public PageResponse<UserCO> pageByNopermission(UserPageQry qry) {
|
||||||
return userQueryExe.pageByNopermission(qry);
|
return userQueryExe.pageByNopermission(qry);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public SingleResponse addHumanUser(UserAddCmd cmd) {
|
|
||||||
userAddExe.executeHumanUser(cmd);
|
|
||||||
return SingleResponse.buildSuccess();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,5 @@ public interface UserServiceI {
|
||||||
UserLoginCO getUserCorpByPhone(UserAppPhoneCmd cmd);
|
UserLoginCO getUserCorpByPhone(UserAppPhoneCmd cmd);
|
||||||
|
|
||||||
List<UserImgDO> listBase64ByUrl(Map<String, Object> map);
|
List<UserImgDO> listBase64ByUrl(Map<String, Object> map);
|
||||||
|
|
||||||
SingleResponse addHumanUser(UserAddCmd cmd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue