Commit 597a082b authored by huyuchen's avatar huyuchen

huych-入职登记商险待办提交

parent 020cacbd
......@@ -33,7 +33,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.EmployeePreLogListVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceExitCheckVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.BeanUtils;
......@@ -494,11 +493,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} else {
return R.failed("保险公司、险种、购买标准、保单起、止日期不可同时重复!");
}
// 2:是否工作日判断
String error = checkInsuranceBuy(insurancePreVo);
if (null != error) {
return R.failed(error);
}
insurancePreVo.setEmpIdcard(employeeRegistrationPre.getEmpIdcard());
insurancePreVo.setDeptNo(employeeRegistrationPre.getDeptNo());
......@@ -785,35 +779,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
private String checkInsuranceBuy(TEmployeeInsurancePre preVo) {
//新增判断保单开始日期
TEmployeeInsuranceWorkDayVo vo = new TEmployeeInsuranceWorkDayVo();
R<Boolean> dataR;
if (preVo.getBuyType() == 1) {
vo.setRegistDate(preVo.getPolicyStart());
dataR = socialDaprUtils.checkIsWorkDay(vo);
if (Common.isNotNull(dataR) && Boolean.TRUE.equals(dataR.getData())) {
return "新增类型的保单开始日期不能为工作日;";
}
}
if (preVo.getBuyType() == 3 && Common.isNotNull(preVo.getExpectedCollectionTime())){
// 将 LocalDateTime 转换为 java.util.Date
vo.setRegistDate(DateUtil.convertToDateByLocalDateTime(preVo.getExpectedCollectionTime()));
dataR = socialDaprUtils.checkIsWorkDay(vo);
if (Common.isNotNull(dataR) && Boolean.TRUE.equals(dataR.getData())) {
return "批增类型的预计派单日期不能为工作日;";
}
}
if (preVo.getBuyType() == 4 && Common.isNotNull(preVo.getExpectedCollectionTime())){
vo.setRegistDate(DateUtil.convertToDateByLocalDateTime(preVo.getExpectedCollectionTime()));
dataR = socialDaprUtils.checkIsWorkDay(vo);
if (Common.isNotNull(dataR) && Boolean.TRUE.equals(dataR.getData())) {
return "替换类型的预计派单日期不能为工作日;";
}
}
return null;
}
// 商险是否存在判断 type 1 单个接收 2 批量接收
private TEmployeeInsuranceExitCheckVo checkInsuranceExit(TEmployeeInsurancePreVo preVo) {
//查询入职确认信息数据
......
......@@ -644,11 +644,30 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
TEmployeeInsuranceExitCheckVo checkVo;
List<EmployeeRegistrationReceiveVo> receiveVoList = new ArrayList<>();
R<TEmployeeInsuranceWorkDayVo> dataR;
for (EmployeeRegistration registration:registrationList) {
if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) {
TEmployeeInsurancePreVo insurancePreVo = preVo.getEmployeeInsurancePreVos().get(0);
insurancePreVo.setEmpIdcard(registration.getEmpIdcard());
insurancePreVo.setDeptNo(registration.getDeptNo());
//日期赋值
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(registration.getJoinLeaveDate());
dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo);
if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData())
&& Common.isNotNull(dataR.getData().getRegistDate())
&& Common.isNotNull(dataR.getData().getPriDisDate())) {
insurancePreVo.setExpectedCollectionTime(dataR.getData().getPriDisDate());
insurancePreVo.setPolicyEffect(dataR.getData().getRegistDate());
if (Common.isEmpty(insurancePreVo.getPolicyStart())) {
insurancePreVo.setPolicyStart(dataR.getData().getRegistDate());
}
} else {
insurancePreVo.setExpectedCollectionTime(registration.getJoinLeaveDate());
insurancePreVo.setPolicyEffect(registration.getJoinLeaveDate());
insurancePreVo.setPolicyStart(registration.getJoinLeaveDate());
}
//商险是否存在判断
checkVo = checkInsuranceExit(insurancePreVo, registration.getEmployeeName(), registration.getEmpIdcard());
if (null != checkVo) {
......@@ -1208,58 +1227,28 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo.setUpdateBy(user.getId());
//预计派单日期
if (Common.isEmpty(preVo.getExpectedCollectionTime()) && Common.isNotNull(preVo.getPolicyStartType()) && CommonConstants.ONE_STRING.equals(preVo.getPolicyStartType())) {
//新增选择保单开始日期类型= 默认等于入职日期
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(preVo.getJoinLeaveDate());
R<TEmployeeInsuranceWorkDayVo> dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo);
if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData())
&& Common.isNotNull(dataR.getData().getRegistDate())
&& Common.isNotNull(dataR.getData().getPriDisDate())) {
preVo.setExpectedCollectionTime(dataR.getData().getPriDisDate());
preVo.setPolicyEffect(dataR.getData().getRegistDate());
preVo.setPolicyStart(dataR.getData().getRegistDate());
} else {
preVo.setExpectedCollectionTime(preVo.getJoinLeaveDate());
preVo.setPolicyEffect(preVo.getJoinLeaveDate());
preVo.setPolicyStart(preVo.getJoinLeaveDate());
}
}
// if (Common.isEmpty(preVo.getExpectedCollectionTime()) && Common.isNotNull(preVo.getPolicyStartType()) && CommonConstants.ONE_STRING.equals(preVo.getPolicyStartType())) {
// //新增选择保单开始日期类型= 默认等于入职日期
// TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
// dayVo.setType(CommonConstants.TWO_STRING);
// dayVo.setRegistDate(preVo.getJoinLeaveDate());
// R<TEmployeeInsuranceWorkDayVo> dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo);
// if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData())
// && Common.isNotNull(dataR.getData().getRegistDate())
// && Common.isNotNull(dataR.getData().getPriDisDate())) {
// preVo.setExpectedCollectionTime(dataR.getData().getPriDisDate());
// preVo.setPolicyEffect(dataR.getData().getRegistDate());
// preVo.setPolicyStart(dataR.getData().getRegistDate());
// } else {
// preVo.setExpectedCollectionTime(preVo.getJoinLeaveDate());
// preVo.setPolicyEffect(preVo.getJoinLeaveDate());
// preVo.setPolicyStart(preVo.getJoinLeaveDate());
// }
// }
preVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
preVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 15:20", DateUtil.DATETIME_PATTERN_MINUTE));
}
//商险的工作日判断 type 1 单个接收 2 批量接收
private String checkInsuranceBuy(TEmployeeInsurancePreVo preVo,String type) {
//新增判断保单开始日期
TEmployeeInsuranceWorkDayVo vo = new TEmployeeInsuranceWorkDayVo();
R<Boolean> dataR;
if (preVo.getBuyType() == 1) {
vo.setRegistDate(preVo.getPolicyStart());
dataR = socialDaprUtils.checkIsWorkDay(vo);
if (Common.isNotNull(dataR) && Boolean.TRUE.equals(dataR.getData())) {
return "新增类型的保单开始日期不能为工作日;";
}
}
if (preVo.getBuyType() == 3 && CommonConstants.ONE_STRING.equals(type)){
vo.setRegistDate(preVo.getExpectedCollectionTime());
dataR = socialDaprUtils.checkIsWorkDay(vo);
if (Common.isNotNull(dataR) && Boolean.TRUE.equals(dataR.getData())) {
return "批增类型的预计派单日期不能为工作日;";
}
}
if (preVo.getBuyType() == 4 && CommonConstants.ONE_STRING.equals(type)){
vo.setRegistDate(preVo.getExpectedCollectionTime());
dataR = socialDaprUtils.checkIsWorkDay(vo);
if (Common.isNotNull(dataR) && Boolean.TRUE.equals(dataR.getData())) {
return "替换类型的预计派单日期不能为工作日;";
}
}
return null;
}
//商险是否存在判断
private TEmployeeInsuranceExitCheckVo checkInsuranceExit(TEmployeeInsurancePreVo preVo,String empName,String empIdcard) {
//查询入职确认信息数据
......@@ -1269,7 +1258,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//查询商险数据
TInsuranceDetail insuranceDetail= null;
R<TEmployeeInsuranceSelectVo> dataInsurR = insuranceDaprUtil.selectInsuranceInfo(preVo);
if (Common.isNotNull(dataInsurR) && Common.isNotNull(dataInsurR.getData().getInsuranceDetail())) {
if (Common.isNotNull(dataInsurR) && Common.isNotNull(dataInsurR.getData())&& Common.isNotNull(dataInsurR.getData().getInsuranceDetail())) {
insuranceDetail = dataInsurR.getData().getInsuranceDetail();
}
//二次确认接收场景
......
......@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -136,6 +137,7 @@ public class TInsuranceDetail extends BaseEntity {
* 办理时间
*/
@Schema(description = "办理时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime batchDate;
/**
......@@ -289,6 +291,7 @@ public class TInsuranceDetail extends BaseEntity {
* 商险办理时间
*/
@Schema(description = "商险办理时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime handledTime;
/**
......
......@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -17,6 +18,7 @@ import java.util.Date;
* @date 2025-03-31 12:25:13
*/
@Data
@ColumnWidth(18)
public class TEmployeeInsurancePreExportVo implements Serializable {
/**
......
......@@ -37,7 +37,7 @@ public interface TEmployeeInsurancePreMapper extends BaseMapper<TEmployeeInsuran
void updateBatchById(@Param("idList") List<String> idList);
List<TEmployeeInsurancePreExportVo> selectExportList(@Param("employeeRegistration") TEmployeeInsurancePreSearchVo employeeRegistration);
List<TEmployeeInsurancePreExportVo> selectExportList(@Param("tEmployeeInsurancePre") TEmployeeInsurancePreSearchVo employeeRegistration);
List<TEmployeeInsurancePre> getAllUnconfimData();
......
......@@ -226,20 +226,20 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
addParam.setInsurancePreId(insurancePre.getId());
batchAddParamList.add(addParam);
}
if (CommonConstants.THREE_INT == insurancePre.getBuyType()) {
if (CommonConstants.FOUR_INT == insurancePre.getBuyType()) {
InsuranceReplaceParam addParam = new InsuranceReplaceParam();
addParam.setEmpName(insurancePre.getEmployeeName());
addParam.setEmpIdcardNo(insurancePre.getEmpIdcard());
addParam.setDeptNo(insurancePre.getDeptNo());
addParam.setEmpName(insurancePre.getReplaceEmployeeName());
addParam.setEmpIdcardNo(insurancePre.getReplaceEmpIdcard());
addParam.setDeptNo(insurancePre.getReplaceDeptNo());
addParam.setInsuranceCompanyName(insurancePre.getInsuranceCompanyName());
addParam.setInsuranceTypeName(insurancePre.getInsuranceTypeName());
addParam.setBuyStandard(insurancePre.getBuyStandard());
addParam.setPolicyStart(DateUtil.dateToString(insurancePre.getPolicyStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT));
addParam.setPolicyEnd(DateUtil.dateToString(insurancePre.getPolicyEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT));
addParam.setPost(insurancePre.getPosition());
addParam.setReplaceEmpName(insurancePre.getReplaceEmployeeName());
addParam.setReplaceDeptNo(insurancePre.getReplaceDeptNo());
addParam.setReplaceEmpIdcardNo(insurancePre.getReplaceEmpIdcard());
addParam.setReplaceEmpName(insurancePre.getEmployeeName());
addParam.setReplaceDeptNo(insurancePre.getDeptNo());
addParam.setReplaceEmpIdcardNo(insurancePre.getEmpIdcard());
addParam.setRemark(CommonConstants.EMPTY_STRING);
addParam.setInsurancePreId(insurancePre.getId());
replaceAddParamList.add(addParam);
......
......@@ -2979,12 +2979,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
// 结算月份 >= 派单月份(结算月 < 派单月份的记录予以拦截,并提示)
if(!LocalDateUtil.isDate(param.getSettleMonth(),LocalDateUtil.NORM_MONTH_PATTERN)){
if(Common.isNotNull(param.getSettleMonth()) && !LocalDateUtil.isDate(param.getSettleMonth(),LocalDateUtil.NORM_MONTH_PATTERN)){
param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_PARSE_ERROR);
listResult.add(param);
continue;
}
if(!LocalDateUtil.isCurrentOrFutureMonth(param.getSettleMonth())){
if(Common.isNotNull(param.getSettleMonth()) && !LocalDateUtil.isCurrentOrFutureMonth(param.getSettleMonth())){
param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_SHOULD_IS_FUTURE);
listResult.add(param);
continue;
......@@ -3347,12 +3347,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
// 结算月份 >= 派单月份(结算月 < 派单月份的记录予以拦截,并提示)
if(!LocalDateUtil.isDate(param.getSettleMonth(),LocalDateUtil.NORM_MONTH_PATTERN)){
if(Common.isNotNull(param.getSettleMonth()) && !LocalDateUtil.isDate(param.getSettleMonth(),LocalDateUtil.NORM_MONTH_PATTERN)){
param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_PARSE_ERROR);
listResult.add(param);
continue;
}
if(!LocalDateUtil.isCurrentOrFutureMonth(param.getSettleMonth())){
if(Common.isNotNull(param.getSettleMonth()) && !LocalDateUtil.isCurrentOrFutureMonth(param.getSettleMonth())){
param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_SHOULD_IS_FUTURE);
listResult.add(param);
continue;
......@@ -3564,18 +3564,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//校验身份合法
TCheckIdCard checkIdCard = new TCheckIdCard();
checkIdCard.setName(param.getReplaceEmpName());
checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
if (null != tCheckIdCardR && tCheckIdCardR.getCode() == CommonConstants.SUCCESS){
TCheckIdCard data = tCheckIdCardR.getData();
if (CommonConstants.ONE_INT != data.getIsTrue()){
param.setErrorMessage(InsurancesConstants.REPLACE_EMP_ID_CARD_NO_NOT_FIT);
listResult.add(param);
continue;
}
}
// TCheckIdCard checkIdCard = new TCheckIdCard();
// checkIdCard.setName(param.getReplaceEmpName());
// checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
// R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
// if (null != tCheckIdCardR && tCheckIdCardR.getCode() == CommonConstants.SUCCESS){
// TCheckIdCard data = tCheckIdCardR.getData();
// if (CommonConstants.ONE_INT != data.getIsTrue()){
// param.setErrorMessage(InsurancesConstants.REPLACE_EMP_ID_CARD_NO_NOT_FIT);
// listResult.add(param);
// continue;
// }
// }
if (param.getEmpName().equals(param.getReplaceEmpName()) && param.getEmpIdcardNo().equals(param.getReplaceEmpIdcardNo())){
param.setErrorMessage(InsurancesConstants.REPLACE_EMP_INFO_SAME);
......@@ -6470,12 +6470,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
continue;
}
// 结算月份 >= 派单月份(结算月 < 派单月份的记录予以拦截,并提示)
if(!LocalDateUtil.isDate(param.getSettleMonth(),LocalDateUtil.NORM_MONTH_PATTERN)){
if(Common.isNotNull(param.getSettleMonth()) && !LocalDateUtil.isDate(param.getSettleMonth(),LocalDateUtil.NORM_MONTH_PATTERN)){
param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_PARSE_ERROR);
errorList.add(param);
continue;
}
if(!LocalDateUtil.isCurrentOrFutureMonth(param.getSettleMonth())){
if(Common.isNotNull(param.getSettleMonth()) && !LocalDateUtil.isCurrentOrFutureMonth(param.getSettleMonth())){
param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_SHOULD_IS_FUTURE);
errorList.add(param);
continue;
......@@ -8295,8 +8295,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.eq(TInsuranceDetail::getBuyStandard, preVo.getBuyStandard())
.eq(TInsuranceDetail::getInsuranceTypeName, preVo.getInsuranceTypeName())
.eq(TInsuranceDetail::getInsuranceCompanyName, preVo.getInsuranceCompanyName())
.eq(TInsuranceDetail::getPolicyStart, preVo.getPolicyStart())
.eq(TInsuranceDetail::getPolicyEnd, preVo.getPolicyEnd())
.eq(TInsuranceDetail::getPolicyStart, LocalDateUtil.parseLocalDate(DateUtil.dateToString(preVo.getPolicyStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT)))
.eq(TInsuranceDetail::getPolicyEnd, LocalDateUtil.parseLocalDate(DateUtil.dateToString(preVo.getPolicyEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)))
.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
//有效
.and(wrapper -> wrapper.eq(TInsuranceDetail::getIsEffect, CommonConstants.ZERO_INT)
......
......@@ -39,6 +39,7 @@
<result property="replaceEmpIdcard" column="replace_emp_idcard"/>
<result property="replaceDeptNo" column="replace_dept_no"/>
<result property="configName" column="config_name"/>
<result property="insurancesId" column="insurances_id"/>
<result property="createBy" column="create_by"/>
<result property="createName" column="create_name"/>
<result property="createTime" column="create_time"/>
......@@ -97,7 +98,7 @@
a.create_name,
a.create_time,
a.update_by,
a.update_time,a.policy_no,a.config_name,a.policy_effect
a.update_time,a.policy_no,a.config_name,a.policy_effect,a.insurances_id
</sql>
<sql id="tEmployeeInsurancePre_where">
<if test="tEmployeeInsurancePre != null">
......@@ -181,7 +182,7 @@
AND a.is_address = #{tEmployeeInsurancePre.isAddress}
</if>
<if test="tEmployeeInsurancePre.position != null and tEmployeeInsurancePre.position.trim() != ''">
AND a.position = #{tEmployeeInsurancePre.position}
AND a.position like CONCAT('%',#{tEmployeeInsurancePre.position},'%')
</if>
<if test="tEmployeeInsurancePre.dataSource != null and tEmployeeInsurancePre.dataSource.trim() != ''">
AND a.data_source = #{tEmployeeInsurancePre.dataSource}
......@@ -225,6 +226,7 @@
1=1
<include refid="tEmployeeInsurancePre_where"/>
</where>
order by a.create_time desc
</select>
<!--tEmployeeInsurancePre不分页查询-->
......@@ -236,6 +238,7 @@
1=1
<include refid="tEmployeeInsurancePre_where"/>
</where>
order by a.create_time desc
</select>
<!--查询list,用来对比,记录日志-->
......@@ -294,7 +297,7 @@
WHEN a.buy_type='3' THEN "批增"
WHEN a.buy_type ='4' THEN "替换"
ELSE a.buy_type END as buy_type,
if(a.is_address = '0','是','否') as is_address
if(a.is_address = '0','是',if(a.is_address = '1','否','')) as is_address
FROM t_employee_insurance_pre a
<where>
1=1
......
......@@ -312,7 +312,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
}
//查找入职日期的前一个工作日
TEmployeeInsuranceWorkDayVo newVo = new TEmployeeInsuranceWorkDayVo();
newVo.setRegistDate(vo.getRegistDate());
newVo.setRegistDate(DateUtil.addDayByDate(vo.getRegistDate(), CommonConstants.ONE_INT_NEGATE));
newVo.setType(CommonConstants.ONE_STRING);
getWorkDay(holidayMap, newVo);
......@@ -333,11 +333,11 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
} else {
// 如果当前时间在15:20之后
TEmployeeInsuranceWorkDayVo afterVo = new TEmployeeInsuranceWorkDayVo();
afterVo.setRegistDate(LocalDateTimeUtils.convertLDToDate(today));
afterVo.setRegistDate(DateUtil.addDayByDate(LocalDateTimeUtils.convertLDToDate(today), CommonConstants.ONE_INT));
afterVo.setType(CommonConstants.TWO_STRING);
getWorkDay(holidayMap, afterVo);
vo.setPriDisDate(afterVo.getRegistDate());
vo.setRegistDate(DateUtil.addDayByDate(newVo.getRegistDate(), CommonConstants.ONE_INT));
vo.setRegistDate(DateUtil.addDayByDate(vo.getPriDisDate(), CommonConstants.ONE_INT));
}
} else {
//如果前一个工作日日期大于今天
......
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