Commit 036b1a4d authored by 查济's avatar 查济

Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!138
parents 283420fd e91f1c2d
...@@ -69,13 +69,13 @@ public class InsurancesConstants { ...@@ -69,13 +69,13 @@ public class InsurancesConstants {
*/ */
public static final String EDIT_NOT_ALLOW = "不允许编辑"; public static final String EDIT_NOT_ALLOW = "不允许编辑";
/** /**
* 投保信息已存在 * 投保记录已存在
*/ */
public static final String DATA_IS_EXIST = "投保信息已存在"; public static final String DATA_IS_EXIST = "投保记录已存在";
/** /**
* 投保信息不存在 * 投保记录不存在
*/ */
public static final String DATA_IS_NOT_EXIST = "投保信息不存在"; public static final String DATA_IS_NOT_EXIST = "投保记录不存在";
/** /**
* 结算信息不存在 * 结算信息不存在
*/ */
......
...@@ -121,6 +121,7 @@ public class TInsuranceDetail extends BaseEntity { ...@@ -121,6 +121,7 @@ public class TInsuranceDetail extends BaseEntity {
* 保单生效日期 * 保单生效日期
*/ */
@Schema(description = "保单生效日期") @Schema(description = "保单生效日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDate policyEffect; private LocalDate policyEffect;
/** /**
...@@ -255,6 +256,7 @@ public class TInsuranceDetail extends BaseEntity { ...@@ -255,6 +256,7 @@ public class TInsuranceDetail extends BaseEntity {
* 是否过期 0未过期 1已过期 * 是否过期 0未过期 1已过期
*/ */
@Schema(description = "是否过期 0未过期 1已过期") @Schema(description = "是否过期 0未过期 1已过期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer isOverdue; private Integer isOverdue;
/** /**
......
...@@ -411,6 +411,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -411,6 +411,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
newDetail.setIsUse(null); newDetail.setIsUse(null);
newDetail.setIsEffect(null); newDetail.setIsEffect(null);
newDetail.setReduceHandleStatus(null); newDetail.setReduceHandleStatus(null);
newDetail.setSignFlag(CommonConstants.ZERO_INT);
//创建时间是新数据插入时间 //创建时间是新数据插入时间
newDetail.setCreateTime(LocalDateTime.now()); newDetail.setCreateTime(LocalDateTime.now());
newDetail.setCreateBy(user.getId()); newDetail.setCreateBy(user.getId());
...@@ -655,6 +656,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -655,6 +656,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
byId.setBuyHandleStatus(CommonConstants.ONE_INT); byId.setBuyHandleStatus(CommonConstants.ONE_INT);
byId.setPolicyStart(LocalDateUtil.parseLocalDate(param.getPolicyStart())); byId.setPolicyStart(LocalDateUtil.parseLocalDate(param.getPolicyStart()));
byId.setPolicyEnd(LocalDateUtil.parseLocalDate(param.getPolicyEnd())); byId.setPolicyEnd(LocalDateUtil.parseLocalDate(param.getPolicyEnd()));
//如果不是补单的,需要更新创建时间
if (byId.getSignFlag() == CommonConstants.ZERO_INT){
byId.setCreateTime(LocalDateTime.now());
}
byId.setUpdateBy(user.getId()); byId.setUpdateBy(user.getId());
byId.setUpdateTime(LocalDateTime.now()); byId.setUpdateTime(LocalDateTime.now());
this.updateById(byId); this.updateById(byId);
...@@ -691,6 +696,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -691,6 +696,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
//被替换者无效 //被替换者无效
insuranceDetail.setIsEffect(CommonConstants.ONE_INT); insuranceDetail.setIsEffect(CommonConstants.ONE_INT);
insuranceDetail.setUpdateTime(LocalDateTime.now());
this.updateById(insuranceDetail); this.updateById(insuranceDetail);
//替换记录成功 //替换记录成功
one.setReplaceStatus(CommonConstants.ONE_INT); one.setReplaceStatus(CommonConstants.ONE_INT);
...@@ -702,6 +708,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -702,6 +708,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
byId.setEmpName(param.getEmpName()); byId.setEmpName(param.getEmpName());
byId.setEmpIdcardNo(param.getEmpIdcardNo()); byId.setEmpIdcardNo(param.getEmpIdcardNo());
byId.setPost(param.getPost()); byId.setPost(param.getPost());
if (byId.getSignFlag() == CommonConstants.ZERO_INT){
byId.setCreateTime(LocalDateTime.now());
}
byId.setUpdateBy(user.getId()); byId.setUpdateBy(user.getId());
byId.setUpdateTime(LocalDateTime.now()); byId.setUpdateTime(LocalDateTime.now());
this.updateById(byId); this.updateById(byId);
...@@ -856,6 +865,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -856,6 +865,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
// 记录状态置为「退回」 // 记录状态置为「退回」
detail.setBuyHandleStatus(CommonConstants.FOUR_INT); detail.setBuyHandleStatus(CommonConstants.FOUR_INT);
//投保成功后再次投保退回,需要将保单生效日期、是否有效、是否过期置为空
if (detail.getSignFlag() == CommonConstants.ONE_INT){
detail.setPolicyEffect(null);
detail.setIsEffect(null);
detail.setIsOverdue(null);
}
detail.setUpdateBy(user.getId()); detail.setUpdateBy(user.getId());
detail.setUpdateTime(LocalDateTime.now()); detail.setUpdateTime(LocalDateTime.now());
successList.add(detail); successList.add(detail);
......
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