Commit 95588c6d authored by 李灿灿's avatar 李灿灿

报错调试

parent af2f9239
...@@ -210,12 +210,6 @@ public class TInsuranceDetail extends BaseEntity { ...@@ -210,12 +210,6 @@ public class TInsuranceDetail extends BaseEntity {
@Schema(description = "预估保费") @Schema(description = "预估保费")
private BigDecimal estimatePremium; private BigDecimal estimatePremium;
/**
* 差额(实缴-预估)
*/
@Schema(description = "差额(实缴-预估)")
private BigDecimal settleBalance;
/** /**
* 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员 * 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
*/ */
......
package com.yifu.cloud.plus.v1.yifu.insurances.vo; package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -118,39 +119,47 @@ public class InsuranceAddParam implements Serializable { ...@@ -118,39 +119,47 @@ public class InsuranceAddParam implements Serializable {
/** /**
* 结算类型 (1、单独结算 2、合并结算-和工资一起结算) * 结算类型 (1、单独结算 2、合并结算-和工资一起结算)
*/ */
@JsonIgnore
private Integer settleType; private Integer settleType;
/** /**
* 医疗额度 * 医疗额度
*/ */
@JsonIgnore
private String medicalQuota; private String medicalQuota;
/** /**
* 身故或残疾额度 * 身故或残疾额度
*/ */
@JsonIgnore
private String dieDisableQuota; private String dieDisableQuota;
/** /**
* 险种主键 * 险种主键
*/ */
@JsonIgnore
private Long insuranceTypeId; private Long insuranceTypeId;
/** /**
* 商险购买地省code * 商险购买地省code
*/ */
@JsonIgnore
private Integer insuranceProvince; private Integer insuranceProvince;
/** /**
* 商险购买地市code * 商险购买地市code
*/ */
@JsonIgnore
private Integer insuranceCity; private Integer insuranceCity;
/** /**
* 商险办理省code * 商险办理省code
*/ */
@JsonIgnore
private Integer insuranceHandleProvince; private Integer insuranceHandleProvince;
/** /**
* 商险办理城市code * 商险办理城市code
*/ */
@JsonIgnore
private Integer insuranceHandleCity; private Integer insuranceHandleCity;
} }
package com.yifu.cloud.plus.v1.yifu.insurances.vo; package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -114,49 +115,59 @@ public class InsuranceBatchParam implements Serializable { ...@@ -114,49 +115,59 @@ public class InsuranceBatchParam implements Serializable {
/** /**
* 结算类型 (1、单独结算 2、合并结算-和工资一起结算) * 结算类型 (1、单独结算 2、合并结算-和工资一起结算)
*/ */
@JsonIgnore
private Integer settleType; private Integer settleType;
/** /**
* 医疗额度 * 医疗额度
*/ */
@JsonIgnore
private String medicalQuota; private String medicalQuota;
/** /**
* 身故或残疾额度 * 身故或残疾额度
*/ */
@JsonIgnore
private String dieDisableQuota; private String dieDisableQuota;
/** /**
* 险种主键 * 险种主键
*/ */
@JsonIgnore
private Long insuranceTypeId; private Long insuranceTypeId;
/** /**
* 商险购买地省code * 商险购买地省code
*/ */
@JsonIgnore
private Integer insuranceProvince; private Integer insuranceProvince;
/** /**
* 商险购买地市code * 商险购买地市code
*/ */
@JsonIgnore
private Integer insuranceCity; private Integer insuranceCity;
/** /**
* 商险办理省code * 商险办理省code
*/ */
@JsonIgnore
private Integer insuranceHandleProvince; private Integer insuranceHandleProvince;
/** /**
* 商险办理城市code * 商险办理城市code
*/ */
@JsonIgnore
private Integer insuranceHandleCity; private Integer insuranceHandleCity;
/** /**
* 保单开始时间 * 保单开始时间
*/ */
@JsonIgnore
private LocalDate policyStart; private LocalDate policyStart;
/** /**
* 保单结束时间 * 保单结束时间
*/ */
@JsonIgnore
private LocalDate policyEnd; private LocalDate policyEnd;
} }
package com.yifu.cloud.plus.v1.yifu.insurances.vo; package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -142,14 +143,17 @@ public class InsuranceEditParam implements Serializable { ...@@ -142,14 +143,17 @@ public class InsuranceEditParam implements Serializable {
/** /**
* 医疗额度 * 医疗额度
*/ */
@JsonIgnore
private String medicalQuota; private String medicalQuota;
/** /**
* 身故或残疾额度 * 身故或残疾额度
*/ */
@JsonIgnore
private String dieDisableQuota; private String dieDisableQuota;
/** /**
* 险种主键 * 险种主键
*/ */
@JsonIgnore
private Long insuranceTypeId; private Long insuranceTypeId;
} }
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
<result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/> <result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/>
<result property="actualPremium" column="ACTUAL_PREMIUM" jdbcType="DECIMAL"/> <result property="actualPremium" column="ACTUAL_PREMIUM" jdbcType="DECIMAL"/>
<result property="estimatePremium" column="ESTIMATE_PREMIUM" jdbcType="DECIMAL"/> <result property="estimatePremium" column="ESTIMATE_PREMIUM" jdbcType="DECIMAL"/>
<result property="settleBalance" column="SETTLE_BALANCE" jdbcType="DECIMAL"/>
<result property="buyHandleStatus" column="BUY_HANDLE_STATUS" jdbcType="TINYINT"/> <result property="buyHandleStatus" column="BUY_HANDLE_STATUS" jdbcType="TINYINT"/>
<result property="defaultSettleId" column="DEFAULT_SETTLE_ID" jdbcType="VARCHAR"/> <result property="defaultSettleId" column="DEFAULT_SETTLE_ID" jdbcType="VARCHAR"/>
<result property="reduceHandleStatus" column="REDUCE_HANDLE_STATUS" jdbcType="TINYINT"/> <result property="reduceHandleStatus" column="REDUCE_HANDLE_STATUS" jdbcType="TINYINT"/>
...@@ -60,7 +59,7 @@ ...@@ -60,7 +59,7 @@
BATCH_DATE,SETTLE_MONTH,INVOICE_NO, BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
BUY_TYPE,INSURANCE_PROVINCE,INSURANCE_PROVINCE_NAME,INSURANCE_CITY,INSURANCE_CITY_NAME, BUY_TYPE,INSURANCE_PROVINCE,INSURANCE_PROVINCE_NAME,INSURANCE_CITY,INSURANCE_CITY_NAME,
INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME,SETTLE_TYPE, INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME,SETTLE_TYPE,
ACTUAL_PREMIUM,ESTIMATE_PREMIUM,SETTLE_BALANCE, ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS, BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
IS_USE,IS_EFFECT,IS_OVERDUE,REMARK, IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
CREATE_BY,CREATE_NAME,CREATE_TIME, CREATE_BY,CREATE_NAME,CREATE_TIME,
......
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