Commit 2b8b37f5 authored by huyuchen's avatar huyuchen

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

parent ce5d63c3
...@@ -657,11 +657,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -657,11 +657,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
continue; continue;
} }
//入职日期需要小于等于保单截止日期 //入职日期需要小于等于保单截止日期
if (preVo.getJoinLeaveDate().after(insurancePreVo.getPolicyEnd())) { if (registration.getJoinLeaveDate().after(insurancePreVo.getPolicyEnd())) {
TEmployeeInsuranceExitCheckVo exitCheckVo = new TEmployeeInsuranceExitCheckVo(); TEmployeeInsuranceExitCheckVo exitCheckVo = new TEmployeeInsuranceExitCheckVo();
exitCheckVo.setBuyType(insurancePreVo.getBuyType()); exitCheckVo.setBuyType(insurancePreVo.getBuyType());
exitCheckVo.setEmployeeName(preVo.getEmployeeName()); exitCheckVo.setEmployeeName(registration.getEmployeeName());
exitCheckVo.setEmpIdcard(preVo.getEmpIdcard()); exitCheckVo.setEmpIdcard(registration.getEmpIdcard());
exitCheckVo.setPolicyStart(insurancePreVo.getPolicyStart()); exitCheckVo.setPolicyStart(insurancePreVo.getPolicyStart());
exitCheckVo.setPolicyEnd(insurancePreVo.getPolicyEnd()); exitCheckVo.setPolicyEnd(insurancePreVo.getPolicyEnd());
exitCheckVo.setBuyStandard(insurancePreVo.getBuyStandard()); exitCheckVo.setBuyStandard(insurancePreVo.getBuyStandard());
...@@ -1182,7 +1182,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1182,7 +1182,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo.setCreateBy(user.getId()); preVo.setCreateBy(user.getId());
preVo.setCreateName(user.getNickname()); preVo.setCreateName(user.getNickname());
preVo.setUpdateBy(user.getId()); preVo.setUpdateBy(user.getId());
preVo.setEmpIdcard(registration.getEmpIdcard());
preVo.setProcessStatus(status); preVo.setProcessStatus(status);
if (Common.isNotNull(preVo.getPushDate())) { if (Common.isNotNull(preVo.getPushDate())) {
preVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString( preVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
...@@ -1212,7 +1211,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1212,7 +1211,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//预计派单日期 //预计派单日期
if (Common.isEmpty(preVo.getExpectedCollectionTime()) && Common.isNotNull(preVo.getPolicyStartType()) && CommonConstants.ONE_STRING.equals(preVo.getPolicyStartType())) { if (Common.isEmpty(preVo.getExpectedCollectionTime()) && Common.isNotNull(preVo.getPolicyStartType()) && CommonConstants.ONE_STRING.equals(preVo.getPolicyStartType())) {
//新增选择保单开始日期类型= 默认等于入职日期 //新增选择保单开始日期类型= 默认等于入职日期
preVo.setPolicyStart(preVo.getJoinLeaveDate());
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING); dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(preVo.getJoinLeaveDate()); dayVo.setRegistDate(preVo.getJoinLeaveDate());
...@@ -1221,9 +1219,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1221,9 +1219,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
&& Common.isNotNull(dataR.getData().getRegistDate()) && Common.isNotNull(dataR.getData().getRegistDate())
&& Common.isNotNull(dataR.getData().getPriDisDate())) { && Common.isNotNull(dataR.getData().getPriDisDate())) {
preVo.setExpectedCollectionTime(dataR.getData().getPriDisDate()); preVo.setExpectedCollectionTime(dataR.getData().getPriDisDate());
preVo.setPolicyEffect(dataR.getData().getRegistDate());
preVo.setPolicyStart(dataR.getData().getRegistDate()); preVo.setPolicyStart(dataR.getData().getRegistDate());
} else { } else {
preVo.setExpectedCollectionTime(preVo.getJoinLeaveDate()); preVo.setExpectedCollectionTime(preVo.getJoinLeaveDate());
preVo.setPolicyEffect(preVo.getJoinLeaveDate());
preVo.setPolicyStart(preVo.getJoinLeaveDate()); preVo.setPolicyStart(preVo.getJoinLeaveDate());
} }
......
...@@ -66,13 +66,6 @@ public class TEmployeeInsurancePre extends BaseEntity { ...@@ -66,13 +66,6 @@ public class TEmployeeInsurancePre extends BaseEntity {
@Schema(description = "预计派单时间") @Schema(description = "预计派单时间")
private LocalDateTime expectedCollectionTime; private LocalDateTime expectedCollectionTime;
@Schema(description = "登记人")
private String registUser;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
@Schema(description = "登记时间")
private LocalDateTime registTime;
@Schema(description = "保险公司名称") @Schema(description = "保险公司名称")
private String insuranceCompanyName; private String insuranceCompanyName;
......
...@@ -96,21 +96,6 @@ public class TEmployeeInsurancePreVo implements Serializable { ...@@ -96,21 +96,6 @@ public class TEmployeeInsurancePreVo implements Serializable {
@Schema(description = "预计派单时间") @Schema(description = "预计派单时间")
@ExcelProperty("预计派单时间") @ExcelProperty("预计派单时间")
private Date expectedCollectionTime; private Date expectedCollectionTime;
/**
* 登记人
*/
@ExcelAttribute(name = "登记人")
@Schema(description = "登记人")
@ExcelProperty("登记人")
private String registUser;
/**
* 登记时间
*/
@ExcelAttribute(name = "登记时间")
@Schema(description = "登记时间")
@ExcelProperty("登记时间")
private Date registTime;
/** /**
* 保险公司名称 * 保险公司名称
......
...@@ -40,7 +40,7 @@ security: ...@@ -40,7 +40,7 @@ security:
- /actuator/** - /actuator/**
- /swagger-ui/** - /swagger-ui/**
- /insuranceDetail/urgentUpdateIsUse - /insuranceDetail/urgentUpdateIsUse
- /temployeeinsurancepre/**
# 文件上传相关 支持阿里云、华为云、腾讯、minio # 文件上传相关 支持阿里云、华为云、腾讯、minio
......
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
<result property="deptId" column="dept_id"/> <result property="deptId" column="dept_id"/>
<result property="expectedCollectionTime" column="expected_collection_time"/> <result property="expectedCollectionTime" column="expected_collection_time"/>
<result property="customerUserLoginname" column="customer_user_loginname"/> <result property="customerUserLoginname" column="customer_user_loginname"/>
<result property="registUser" column="regist_user"/>
<result property="registTime" column="regist_time"/>
<result property="insuranceCompanyName" column="insurance_company_name"/> <result property="insuranceCompanyName" column="insurance_company_name"/>
<result property="insuranceTypeName" column="insurance_type_name"/> <result property="insuranceTypeName" column="insurance_type_name"/>
<result property="insuranceTypeId" column="insurance_type_id"/> <result property="insuranceTypeId" column="insurance_type_id"/>
...@@ -77,8 +75,6 @@ ...@@ -77,8 +75,6 @@
a.dept_id, a.dept_id,
a.expected_collection_time, a.expected_collection_time,
a.customer_user_loginname, a.customer_user_loginname,
a.regist_user,
a.regist_time,
a.insurance_company_name, a.insurance_company_name,
a.insurance_type_name, a.insurance_type_name,
a.insurance_type_id, a.insurance_type_id,
...@@ -154,12 +150,6 @@ ...@@ -154,12 +150,6 @@
<if test="tEmployeeInsurancePre.expectedCollectionTime != null"> <if test="tEmployeeInsurancePre.expectedCollectionTime != null">
AND a.expected_collection_time = #{tEmployeeInsurancePre.expectedCollectionTime} AND a.expected_collection_time = #{tEmployeeInsurancePre.expectedCollectionTime}
</if> </if>
<if test="tEmployeeInsurancePre.registUser != null and tEmployeeInsurancePre.registUser.trim() != ''">
AND a.regist_user = #{tEmployeeInsurancePre.registUser}
</if>
<if test="tEmployeeInsurancePre.registTimeStart != null">
and a.regist_time <![CDATA[ >= ]]> concat(#{tEmployeeInsurancePre.registTimeStart}, ' 00:00:00')
</if>
<if test="tEmployeeInsurancePre.registTimeEnd != null"> <if test="tEmployeeInsurancePre.registTimeEnd != null">
and a.regist_time <![CDATA[ <= ]]> concat(#{tEmployeeInsurancePre.registTimeEnd}, ' 23:59:59') and a.regist_time <![CDATA[ <= ]]> concat(#{tEmployeeInsurancePre.registTimeEnd}, ' 23:59:59')
</if> </if>
......
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