Compare commits
No commits in common. "c00c0c9155acbdd4e247cc1096fb4ef11a279c63" and "ee652ca889eff3df0e169caa116013a98cc5e3cb" have entirely different histories.
c00c0c9155
...
ee652ca889
|
|
@ -15,8 +15,6 @@ import com.zcloud.basic.info.domain.model.UserEmploymentLogE;
|
||||||
import com.zcloud.basic.info.dto.CorpInfoAddCmd;
|
import com.zcloud.basic.info.dto.CorpInfoAddCmd;
|
||||||
import com.zcloud.basic.info.dto.DepartmentAddCmd;
|
import com.zcloud.basic.info.dto.DepartmentAddCmd;
|
||||||
import com.zcloud.basic.info.dto.UserAddCmd;
|
import com.zcloud.basic.info.dto.UserAddCmd;
|
||||||
import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
|
|
||||||
import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
|
|
||||||
import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
|
import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
|
||||||
import com.zcloud.basic.info.persistence.repository.UserEmploymentLogRepository;
|
import com.zcloud.basic.info.persistence.repository.UserEmploymentLogRepository;
|
||||||
import com.zcloud.basic.info.persistence.repository.UserRepository;
|
import com.zcloud.basic.info.persistence.repository.UserRepository;
|
||||||
|
|
@ -44,7 +42,6 @@ import java.util.Map;
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class CorpInfoAddExe {
|
public class CorpInfoAddExe {
|
||||||
private final CorpInfoGateway corpInfoGateway;
|
private final CorpInfoGateway corpInfoGateway;
|
||||||
private final CorpInfoRepository corpInfoRepository;
|
|
||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
private final DepartmentRepository departmentRepository;
|
private final DepartmentRepository departmentRepository;
|
||||||
private final UserEmploymentLogRepository userEmploymentLogRepository;
|
private final UserEmploymentLogRepository userEmploymentLogRepository;
|
||||||
|
|
@ -53,8 +50,6 @@ public class CorpInfoAddExe {
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Long execute(CorpInfoAddCmd cmd) {
|
public Long execute(CorpInfoAddCmd cmd) {
|
||||||
CorpInfoE examTypeE = new CorpInfoE();
|
CorpInfoE examTypeE = new CorpInfoE();
|
||||||
List<CorpInfoDO> corpinfoByCode = corpInfoRepository.getCorpinfoByCode(cmd.getCode());
|
|
||||||
examTypeE.checkList(corpinfoByCode == null ? 0 : corpinfoByCode.size());
|
|
||||||
try {
|
try {
|
||||||
examTypeE.initPassWord();
|
examTypeE.initPassWord();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,6 @@ import org.springframework.stereotype.Component;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* web-app
|
* web-app
|
||||||
*
|
*
|
||||||
|
|
@ -48,10 +46,6 @@ public class CorpInfoUpdateExe {
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public void execute(CorpInfoUpdateCmd corpInfoUpdateCmd) {
|
public void execute(CorpInfoUpdateCmd corpInfoUpdateCmd) {
|
||||||
CorpInfoE corpInfoE = new CorpInfoE();
|
CorpInfoE corpInfoE = new CorpInfoE();
|
||||||
|
|
||||||
List<CorpInfoDO> corpinfoByCodeAndId = corpInfoRepository.getCorpinfoByCodeAndId(corpInfoUpdateCmd.getCode(), corpInfoUpdateCmd.getId());
|
|
||||||
corpInfoE.checkList(corpinfoByCodeAndId == null ? 0 : corpinfoByCodeAndId.size());
|
|
||||||
|
|
||||||
BeanUtils.copyProperties(corpInfoUpdateCmd, corpInfoE);
|
BeanUtils.copyProperties(corpInfoUpdateCmd, corpInfoE);
|
||||||
boolean res = corpInfoGateway.update(corpInfoE);
|
boolean res = corpInfoGateway.update(corpInfoE);
|
||||||
if (!res) {
|
if (!res) {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
package com.zcloud.basic.info.domain.model;
|
package com.zcloud.basic.info.domain.model;
|
||||||
|
|
||||||
import com.alibaba.cola.domain.Entity;
|
import com.alibaba.cola.domain.Entity;
|
||||||
import com.alibaba.cola.exception.BizException;
|
|
||||||
import com.jjb.saas.framework.domain.model.BaseE;
|
import com.jjb.saas.framework.domain.model.BaseE;
|
||||||
import com.zcloud.gbscommon.utils.MD5;
|
import com.zcloud.gbscommon.utils.MD5;
|
||||||
import com.zcloud.gbscommon.utils.Sm2Util;
|
import com.zcloud.gbscommon.utils.Sm2Util;
|
||||||
|
|
@ -174,12 +173,5 @@ public class CorpInfoE extends BaseE {
|
||||||
|
|
||||||
this.setPassword(encrypt);
|
this.setPassword(encrypt);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void checkList(int size){
|
|
||||||
if(size > 0){
|
|
||||||
throw new BizException("社会统一信用代码重复。");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,5 @@ public interface CorpInfoRepository extends BaseRepository<CorpInfoDO> {
|
||||||
void updateCorpName(CorpInfoDO corpInfo);
|
void updateCorpName(CorpInfoDO corpInfo);
|
||||||
|
|
||||||
Map<Long, String> getCorpinfoNameByCorpinfoId(List<Long> collect);
|
Map<Long, String> getCorpinfoNameByCorpinfoId(List<Long> collect);
|
||||||
|
|
||||||
List<CorpInfoDO> getCorpinfoByCode(String code);
|
|
||||||
|
|
||||||
List<CorpInfoDO> getCorpinfoByCodeAndId(String code, Long id);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -125,20 +125,5 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
|
||||||
|
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<CorpInfoDO> getCorpinfoByCode(String code) {
|
|
||||||
QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
|
|
||||||
queryWrapper.eq("code", code);
|
|
||||||
return list(queryWrapper);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<CorpInfoDO> getCorpinfoByCodeAndId(String code, Long id) {
|
|
||||||
QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
|
|
||||||
queryWrapper.ne("id", id);
|
|
||||||
queryWrapper.eq("code", code);
|
|
||||||
return list(queryWrapper);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue