|
@@ -41,8 +41,6 @@ public class WorkContractService {
|
|
@Resource
|
|
@Resource
|
|
private SerialnumTplService serialnumTplService;
|
|
private SerialnumTplService serialnumTplService;
|
|
|
|
|
|
- private final String BIZ_CODE = "htdj";
|
|
|
|
-
|
|
|
|
public String saveInfo(WorkContractInfoDto workContractInfoDto) throws Exception {
|
|
public String saveInfo(WorkContractInfoDto workContractInfoDto) throws Exception {
|
|
if (StringUtils.isNotEmpty(workContractInfoDto.getId())) {
|
|
if (StringUtils.isNotEmpty(workContractInfoDto.getId())) {
|
|
WorkContractInfo info = workContractInfoMapper.selectById(workContractInfoDto.getId());
|
|
WorkContractInfo info = workContractInfoMapper.selectById(workContractInfoDto.getId());
|
|
@@ -86,7 +84,7 @@ public class WorkContractService {
|
|
//获取当前登录人信息
|
|
//获取当前登录人信息
|
|
UserDTO userDTO = UserUtils.getCurrentUserDTO();
|
|
UserDTO userDTO = UserUtils.getCurrentUserDTO();
|
|
//合同编号生成
|
|
//合同编号生成
|
|
- String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), BIZ_CODE);
|
|
|
|
|
|
+ String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
|
|
String id = UUID.randomUUID().toString().replace("-", "");
|
|
String id = UUID.randomUUID().toString().replace("-", "");
|
|
WorkContractInfo info = new WorkContractInfo();
|
|
WorkContractInfo info = new WorkContractInfo();
|
|
BeanUtils.copyProperties(workContractInfoDto, info);
|
|
BeanUtils.copyProperties(workContractInfoDto, info);
|
|
@@ -112,7 +110,7 @@ public class WorkContractService {
|
|
//获取当前登录人信息
|
|
//获取当前登录人信息
|
|
UserDTO userDTO = UserUtils.getCurrentUserDTO();
|
|
UserDTO userDTO = UserUtils.getCurrentUserDTO();
|
|
//合同编号生成
|
|
//合同编号生成
|
|
- String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), BIZ_CODE);
|
|
|
|
|
|
+ String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
|
|
WorkContractInfo info = new WorkContractInfo();
|
|
WorkContractInfo info = new WorkContractInfo();
|
|
BeanUtils.copyProperties(workContractInfoDto, info);
|
|
BeanUtils.copyProperties(workContractInfoDto, info);
|
|
info.setNo(serialNum);
|
|
info.setNo(serialNum);
|