Commit f85b53b1 authored by fangxinjiang's avatar fangxinjiang

商险投保列表查询、导出、待缴费查询-fxj

parent f4462039
...@@ -169,4 +169,10 @@ public class InsuranceListParam extends BaseEntity { ...@@ -169,4 +169,10 @@ public class InsuranceListParam extends BaseEntity {
@Schema(description = "预估保费--截止") @Schema(description = "预估保费--截止")
private BigDecimal estimatePremiumEnd; private BigDecimal estimatePremiumEnd;
/**
* 派单人
*/
@Schema(description = "派单人")
private String createName;
} }
...@@ -62,7 +62,7 @@ public class InsuranceListVO implements Serializable { ...@@ -62,7 +62,7 @@ public class InsuranceListVO implements Serializable {
/** /**
* 项目编码 * 项目编码
*/ */
@JsonIgnore @Schema(description = "项目编码")
private String deptNo; private String deptNo;
/** /**
......
...@@ -569,6 +569,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -569,6 +569,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.multiply(null== detail.getRate()?BigDecimal.ZERO: detail.getRate()) .multiply(null== detail.getRate()?BigDecimal.ZERO: detail.getRate())
.add(new BigDecimal("5.00"))); .add(new BigDecimal("5.00")));
} }
//v1.7.21 如果预估报废大于购买标准,则预估保费=购买标准
if (detail.getEstimatePremium() != null && detail.getBuyStandard() != null) {
try {
String buyStandardStr = detail.getBuyStandard().trim();
if (!buyStandardStr.isEmpty()) {
BigDecimal buyStandard = new BigDecimal(buyStandardStr);
if (detail.getEstimatePremium().compareTo(buyStandard) > 0) {
detail.setEstimatePremium(buyStandard);
}
} else {
log.warn("购买标准为空字符串,跳过设置预估保费");
}
} catch (NumberFormatException e) {
log.error("设置预估保费时发生异常,购买标准格式无效:{}, 预估保费:{}",
detail.getBuyStandard(), detail.getEstimatePremium(), e);
}
}
//购买周期 //购买周期
detail.setPurchaseCycle(purchaseCycle+"个月/"+day+"天"); detail.setPurchaseCycle(purchaseCycle+"个月/"+day+"天");
......
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