Commit 82f4cb36 authored by huyuchen's avatar huyuchen

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

parent 958f9e59
...@@ -567,7 +567,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -567,7 +567,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (keyMap.get(key) == null) { if (keyMap.get(key) == null) {
keyMap.put(key, CommonConstants.ONE_INT); keyMap.put(key, CommonConstants.ONE_INT);
} else { } else {
return R.other(CommonConstants.TWO_INT,null,"保险公司、险种、购买标准、保单起、止日期不可同时重复;"); return R.other(CommonConstants.TWO_INT,null,"保险公司、险种、购买标准、保单起/止日期不可同时重复!");
} }
insurancePreVo.setEmpIdcard(preVo.getEmpIdcard()); insurancePreVo.setEmpIdcard(preVo.getEmpIdcard());
insurancePreVo.setDeptNo(preVo.getDeptNo()); insurancePreVo.setDeptNo(preVo.getDeptNo());
......
...@@ -8306,7 +8306,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -8306,7 +8306,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.and(wrapper -> wrapper.eq(TInsuranceDetail::getIsOverdue, CommonConstants.ZERO_INT) .and(wrapper -> wrapper.eq(TInsuranceDetail::getIsOverdue, CommonConstants.ZERO_INT)
.or().isNull(TInsuranceDetail::getIsOverdue) .or().isNull(TInsuranceDetail::getIsOverdue)
) )
.eq(TInsuranceDetail::getIsUse, CommonConstants.ZERO_INT) //在用
.and(wrapper -> wrapper.eq(TInsuranceDetail::getIsUse, CommonConstants.ZERO_INT)
.or().isNull(TInsuranceDetail::getIsUse)
)
.orderByDesc(TInsuranceDetail::getCreateTime) .orderByDesc(TInsuranceDetail::getCreateTime)
.last(CommonConstants.LAST_ONE_SQL) .last(CommonConstants.LAST_ONE_SQL)
); );
......
package com.yifu.cloud.plus.v1.yifu.social.vo; package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -16,9 +17,11 @@ import java.util.Date; ...@@ -16,9 +17,11 @@ import java.util.Date;
public class TEmployeeInsuranceWorkDayVo implements Serializable { public class TEmployeeInsuranceWorkDayVo implements Serializable {
@Schema(description = "保单开始日期/预计生效日期") @Schema(description = "保单开始日期/预计生效日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
private Date registDate; private Date registDate;
@Schema(description = "预计派单日期") @Schema(description = "预计派单日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
private Date priDisDate; private Date priDisDate;
@Schema(description = "类型 1 前一个工作日 2 后一个工作日") @Schema(description = "类型 1 前一个工作日 2 后一个工作日")
......
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