Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!79

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

@@ -75,6 +75,18 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "购买标准")
     private String buyStandard;
 
+	/**
+	 * 费率
+	 */
+	@Schema(description = "费率")
+	private BigDecimal rate;
+
+	/**
+	 * 计费方式
+	 */
+	@Schema(description = "计费方式(0：按天，1：按月)")
+	private Integer billingType;
+
 	/**
 	 * 医疗额度
 	 */

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author licancan
@@ -134,6 +135,18 @@ public class InsuranceAddParam  implements Serializable {
 	@JsonIgnore
 	private Long insuranceTypeId;
 
+	/**
+	 * 费率
+	 */
+	@JsonIgnore
+	private BigDecimal rate;
+
+	/**
+	 * 计费方式
+	 */
+	@JsonIgnore
+	private Integer billingType;
+
 	/**
 	 * 商险购买地省code
 	 */

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

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -130,6 +131,18 @@ public class InsuranceBatchParam implements Serializable {
 	@JsonIgnore
 	private Long insuranceTypeId;
 
+	/**
+	 * 费率
+	 */
+	@JsonIgnore
+	private BigDecimal rate;
+
+	/**
+	 * 计费方式
+	 */
+	@JsonIgnore
+	private Integer billingType;
+
 	/**
 	 * 商险购买地省code
 	 */

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

@@ -14,6 +14,8 @@
             <result property="insuranceTypeName" column="INSURANCE_TYPE_NAME" jdbcType="VARCHAR"/>
             <result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="BIGINT"/>
             <result property="buyStandard" column="BUY_STANDARD" jdbcType="VARCHAR"/>
+            <result property="rate" column="RATE" jdbcType="DECIMAL"/>
+            <result property="billingType" column="BILLING_TYPE" jdbcType="TINYINT"/>
             <result property="medicalQuota" column="MEDICAL_QUOTA" jdbcType="VARCHAR"/>
             <result property="dieDisableQuota" column="DIE_DISABLE_QUOTA" jdbcType="VARCHAR"/>
             <result property="policyNo" column="POLICY_NO" jdbcType="VARCHAR"/>
@@ -54,7 +56,7 @@
     <sql id="Base_Column_List">
         ID,EMP_NAME,
         EMP_IDCARD_NO,DEPT_NO,POST,INSURANCE_COMPANY_NAME,INSURANCE_TYPE_NAME,
-        INSURANCE_TYPE_ID,BUY_STANDARD,MEDICAL_QUOTA,DIE_DISABLE_QUOTA,POLICY_NO,
+        INSURANCE_TYPE_ID,BUY_STANDARD,RATE,BILLING_TYPE,MEDICAL_QUOTA,DIE_DISABLE_QUOTA,POLICY_NO,
         POLICY_START,POLICY_END,POLICY_EFFECT,
         BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
         BUY_TYPE,INSURANCE_PROVINCE,INSURANCE_PROVINCE_NAME,INSURANCE_CITY,INSURANCE_CITY_NAME,