Commit 1fbbaddf authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 2f92aa44
......@@ -752,13 +752,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//合同年限推算
if (Common.isEmpty(employeeContractPreVo.getContractStart())
&& Common.isEmpty(employeeContractPreVo.getContractEnd())
&& Common.isNotNull(employeeContractPreVo.getContractDurationYear())
&& Common.isNotNull(employeeContractPreVo.getContractDurationMonth())
&& (Common.isNotNull(employeeContractPreVo.getContractDurationYear())
|| Common.isNotNull(employeeContractPreVo.getContractDurationMonth()))
&& Common.isNotNull(employeeContractPreVo.getContractEndType())
&& CommonConstants.ZERO_STRING.equals(employeeContractPreVo.getContractEndType())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getContractDurationMonth()));
vo.setYearAfter(Integer.parseInt(employeeContractPreVo.getContractDurationYear()));
vo.setMonthAfter(Integer.parseInt(Common.isEmpty(employeeContractPreVo.getContractDurationMonth()) ? "0":employeeContractPreVo.getContractDurationMonth()));
vo.setYearAfter(Integer.parseInt(Common.isEmpty(employeeContractPreVo.getContractDurationYear()) ? "0":employeeContractPreVo.getContractDurationYear()));
vo.setRegistDate(employeeContractPreVo.getContractStart());
employeeContractPreVo.setContractEnd(this.addYearsMonths(vo));
}
......@@ -780,11 +780,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
//派遣开始日期、派遣结束日期
if (Common.isEmpty(employeeContractPreVo.getDispatchPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getDispatchPeriodYear())
&& Common.isNotNull(employeeContractPreVo.getDispatchPeriodMonth())) {
&& (Common.isNotNull(employeeContractPreVo.getDispatchPeriodYear())
|| Common.isNotNull(employeeContractPreVo.getDispatchPeriodMonth()))) {
employeeContractPreVo.setDispatchPeriodStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getDispatchPeriodMonth()));
vo.setYearAfter(Integer.parseInt(employeeContractPreVo.getDispatchPeriodYear()));
vo.setMonthAfter(Integer.parseInt(Common.isEmpty(employeeContractPreVo.getDispatchPeriodMonth()) ? "0":employeeContractPreVo.getDispatchPeriodMonth()));
vo.setYearAfter(Integer.parseInt(Common.isEmpty(employeeContractPreVo.getDispatchPeriodYear()) ? "0":employeeContractPreVo.getDispatchPeriodYear()));
vo.setRegistDate(employeeContractPreVo.getDispatchPeriodStart());
employeeContractPreVo.setDispatchPeriodEnd(this.addYearsMonths(vo));
}
......@@ -961,8 +961,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
initInsruancePreInfo(registration, insurancePreVo, user, domainR.getData());
insuranceDaprUtil.saveInsurancePreInfo(preVo);
}
TEmployeeContractPreVo employeeContractPreVo = preVo.getEmployeeContractPreVos();
if (preVo.getServerItem().contains("合同") && Common.isNotNull(employeeContractPreVo)) {
TEmployeeContractPreVo employeeContractPreVo = new TEmployeeContractPreVo();
if (preVo.getServerItem().contains("合同") && Common.isNotNull(preVo.getEmployeeContractPreVos())) {
BeanUtils.copyProperties(preVo.getEmployeeContractPreVos(),employeeContractPreVo);
//生成合同待购买数据
initContractPreInfo(registration, employeeContractPreVo, user, domainR.getData());
}
......
......@@ -133,7 +133,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
public R getIcbcTransactionFlowYesterdayInner() throws IcbcApiException {
log.info("开始推昨日新增网银到账明细条数");
String tranDate = DateUtil.addDay(-7).replace("-","");
String tranDate = DateUtil.addDay(-3).replace("-","");
String beginDate = tranDate;
String endDate = DateUtil.getThisDay();
......@@ -171,7 +171,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
if ("0".equals(flag)) {
serioList = baseMapper.getAllserioNo();
} else {
//ekp1.9.12 获取近天的到账明细的交易流水号
//ekp1.9.12 获取近天的到账明细的交易流水号
serioList = baseMapper.getAllserioNoLsatSevenDays();
}
// 整理各个账户下的流水:账号为key,账户下流水号列表作为value
......
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