Commit 77310fef authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents 4fcd2899 7743d1fc
......@@ -30,6 +30,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
......@@ -56,6 +57,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
private final TEmployeeContractAuditService tEmployeeContractAuditService;
@Autowired
private final TEmployeeContractInfoService contractInfoService;
@Autowired
......
......@@ -29,6 +29,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLog;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLogDetail;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeePreLogMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractPreService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeePreLogDetailService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeePreLogService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo;
......@@ -44,6 +45,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
......@@ -64,6 +66,8 @@ import static com.alibaba.fastjson.serializer.SerializerFeature.*;
public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMapper, TEmployeePreLog> implements TEmployeePreLogService {
private final DaprInsurancesProperties daprInsurancesProperties;
private final TEmployeePreLogDetailService tEmployeePreLogDetailService;
@Lazy
private final TEmployeeContractPreService contractPreService;
/**
* 入职确认信息变更日志表简单分页查询
......@@ -324,6 +328,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
if (!detailList.isEmpty()) {
tEmployeePreLogDetailService.saveBatch(detailList);
}
//保存合同待签订数据
if (contractOld != null && newInfo.getEmployeeContractPreVo() != null) {
contractPreService.saveContractPreInfo(newInfo.getEmployeeContractPreVo());
}
}
if (!saveOrUpdateList.isEmpty()) {
HttpDaprUtil.invokeMethodPost(daprInsurancesProperties.getAppUrl(), daprInsurancesProperties.getAppId()
......
......@@ -123,6 +123,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
private TEmployeeContractAuditService tEmployeeContractAuditService;
@Autowired
@Lazy
private EmployeeRegistrationPreService registrationPreService;
@Override
......
......@@ -1093,6 +1093,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
initInsruancePreInfo(registrationNow, insurancePreVo, user, domainR.getData());
}
insuranceDaprUtil.saveInsurancePreInfo(preVo);
TEmployeeContractPreVo employeeContractPreVo = preVo.getEmployeeContractPreVo();
if (Common.isNotNull(employeeContractPreVo) && Common.isNotNull(employeeContractPreVo.getContractFlag())
&& CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag())) {
//生成合同待购买数据
initContractPreInfo(registrationNow, employeeContractPreVo, user, domainR.getData());
}
}
}catch (Exception e) {
log.error("执行异常", e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment