Commit 2b13e0c8 authored by fangxinjiang's avatar fangxinjiang

版本切换-fxj

parent 9af2ba87
......@@ -200,4 +200,10 @@ public class InsuranceExportListOneVO implements Serializable {
@ExcelIgnore
@Schema(description = "默认结算信息id")
private String defaultSettleId;
/**
* 购买周期 (格式:4个月/117天)
*/
@Schema(description = "购买周期")
private String purchaseCycle;
}
......@@ -1437,7 +1437,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//购买月数
record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
//购买天数
record.setBuyDay(LocalDateUtil.betweenDay(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
if (Common.isNotNull(record.getPurchaseCycle())){
if (record.getPurchaseCycle().indexOf("天") != -1 && record.getPurchaseCycle().indexOf("个月") != -1){
try {
record.setBuyDay(Long.valueOf(record.getPurchaseCycle().substring(record.getPurchaseCycle().indexOf("个月")+3,record.getPurchaseCycle().indexOf("天"))));
}catch (Exception e){
record.setBuyDay(LocalDateUtil.betweenDay(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
}
}
}else {
record.setBuyDay(LocalDateUtil.betweenDay(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
}
//如果是批增需要重新处理购买周期,按生效日期和保单结束时间计算
if (CommonConstants.THREE_INT == record.getBuyType()){
if (Objects.isNull(record.getPolicyEffect())){
......
......@@ -571,7 +571,7 @@
a.SETTLE_TYPE as settleType,
a.CREATE_NAME as createName,
a.POLICY_NO as policyNo,
a.REMARK as remark,a.UNIT_NAME as unitName,a.DEFAULT_SETTLE_ID as defaultSettleId
a.REMARK as remark,a.UNIT_NAME as unitName,a.DEFAULT_SETTLE_ID as defaultSettleId,a.PURCHASE_CYCLE as purchaseCycle
from t_insurance_detail a
where a.DELETE_FLAG = 0 and a.id in
<foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
......
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