Merge remote-tracking branch 'origin/develop' into develop

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -210,12 +210,6 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "预估保费")
     private BigDecimal estimatePremium;
 
-    /**
-     * 差额（实缴-预估）
-     */
-	@Schema(description = "差额（实缴-预估）")
-    private BigDecimal settleBalance;
-
     /**
      * 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
      */
@@ -258,13 +252,6 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "备注")
     private String remark;
 
-	/**
-	 * 减员派单日期
-	 */
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
-	@Schema(description = "减员派单日期")
-	private LocalDate refundCreateTime;
-
     /**
      * 是否删除 0未删除/1删除
      */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.io.Serializable;
@@ -118,39 +119,47 @@ public class InsuranceAddParam  implements Serializable {
 	/**
 	 * 结算类型 (1、单独结算 2、合并结算-和工资一起结算)
 	 */
+	@JsonIgnore
 	private Integer settleType;
 
 	/**
 	 * 医疗额度
 	 */
+	@JsonIgnore
 	private String medicalQuota;
 
 	/**
 	 * 身故或残疾额度
 	 */
+	@JsonIgnore
 	private String dieDisableQuota;
 	/**
 	 * 险种主键
 	 */
+	@JsonIgnore
 	private Long insuranceTypeId;
 
 	/**
 	 * 商险购买地省code
 	 */
+	@JsonIgnore
 	private Integer insuranceProvince;
 
 	/**
 	 * 商险购买地市code
 	 */
+	@JsonIgnore
 	private Integer insuranceCity;
 
 	/**
 	 * 商险办理省code
 	 */
+	@JsonIgnore
 	private Integer insuranceHandleProvince;
 
 	/**
 	 * 商险办理城市code
 	 */
+	@JsonIgnore
 	private Integer insuranceHandleCity;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -114,49 +115,59 @@ public class InsuranceBatchParam implements Serializable {
 	/**
 	 * 结算类型 (1、单独结算 2、合并结算-和工资一起结算)
 	 */
+	@JsonIgnore
 	private Integer settleType;
 
 	/**
 	 * 医疗额度
 	 */
+	@JsonIgnore
 	private String medicalQuota;
 
 	/**
 	 * 身故或残疾额度
 	 */
+	@JsonIgnore
 	private String dieDisableQuota;
 	/**
 	 * 险种主键
 	 */
+	@JsonIgnore
 	private Long insuranceTypeId;
 
 	/**
 	 * 商险购买地省code
 	 */
+	@JsonIgnore
 	private Integer insuranceProvince;
 
 	/**
 	 * 商险购买地市code
 	 */
+	@JsonIgnore
 	private Integer insuranceCity;
 
 	/**
 	 * 商险办理省code
 	 */
+	@JsonIgnore
 	private Integer insuranceHandleProvince;
 
 	/**
 	 * 商险办理城市code
 	 */
+	@JsonIgnore
 	private Integer insuranceHandleCity;
 
 	/**
 	 * 保单开始时间
 	 */
+	@JsonIgnore
 	private LocalDate policyStart;
 
 	/**
 	 * 保单结束时间
 	 */
+	@JsonIgnore
 	private LocalDate policyEnd;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceEditParam.java

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -142,14 +143,17 @@ public class InsuranceEditParam  implements Serializable {
 	/**
 	 * 医疗额度
 	 */
+	@JsonIgnore
 	private String medicalQuota;
 
 	/**
 	 * 身故或残疾额度
 	 */
+	@JsonIgnore
 	private String dieDisableQuota;
 	/**
 	 * 险种主键
 	 */
+	@JsonIgnore
 	private Long insuranceTypeId;
 }

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml

@@ -36,7 +36,6 @@
             <result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/>
             <result property="actualPremium" column="ACTUAL_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="defaultSettleId" column="DEFAULT_SETTLE_ID" jdbcType="VARCHAR"/>
             <result property="reduceHandleStatus" column="REDUCE_HANDLE_STATUS" jdbcType="TINYINT"/>
@@ -60,7 +59,7 @@
         BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
         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,
-        ACTUAL_PREMIUM,ESTIMATE_PREMIUM,SETTLE_BALANCE,
+        ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
         BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
         IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
         CREATE_BY,CREATE_NAME,CREATE_TIME,
@@ -272,6 +271,7 @@
 			detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 			detail.INSURANCE_TYPE_NAME as insuranceTypeName,
 			detail.BUY_STANDARD as buyStandard
+		from t_insurance_detail detail
 		where
 			detail.DELETE_FLAG = 0
 		and