Merge branch 'feature-licancan' into 'develop'

商险结算表实体类修改

See merge request fangxinjiang/yifu!25

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

@@ -192,7 +192,7 @@ public class TInsuranceDetail extends BaseEntity {
     private String insuranceHandleCityName;
 
     /**
-     * 结算类型 (0、预估 1、实缴)
+     * 结算类型 (0、与薪资合并结算 1、单独结算)
      */
 	@Schema(description = "结算类型 (0、预估 1、实缴)")
     private Integer settleType;

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

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 商险结算表
  * @TableName t_insurance_settle
  */
+@Data
+@TableName("t_insurance_settle")
+@Schema(description = "商险结算表")
 public class TInsuranceSettle implements Serializable {
     /**
      * 主键
      */
+	@Schema(description = "主键")
+	@TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
      * 商险明细id
      */
+	@Schema(description = "商险明细id")
     private String insDetailId;
 
     /**
      * 结算状态
      */
+	@Schema(description = "结算状态")
     private String settleHandleStatus;
 
     /**
-     * 结算类型 (1、单独结算 2、与薪资合并结算)
+     * 结算类型 (0、与薪资合并结算 1、单独结算)
      */
+	@Schema(description = "结算类型 (0、与薪资合并结算 1、单独结算)")
     private Integer settleType;
 
     /**
      * 实际保费
      */
+	@Schema(description = "实际保费")
     private BigDecimal actualPremium;
 
     /**
      * 预估保费
      */
+	@Schema(description = "预估保费")
     private BigDecimal estimatePremium;
 
     /**
      * 创建时间
      */
-    private Date createTime;
+	@Schema(description = "创建时间")
+    private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
-    private Date updateTime;
+	@Schema(description = "更新时间")
+    private LocalDateTime updateTime;
 
     /**
      * 实际费用推送标识 1是 0否
      */
+	@Schema(description = "实际费用推送标识 1是 0否")
     private Integer isActualPush;
 
     /**
      * 预估费用推送标识 1是 0否
      */
+	@Schema(description = "预估费用推送标识 1是 0否")
     private Integer isEstimatePush;
 
     /**
      * 实际保费推送时间
      */
-    private Date actualPushTime;
+	@Schema(description = "实际保费推送时间")
+    private LocalDateTime actualPushTime;
 
     /**
      * 预估保费推送时间
      */
-    private Date estimatePushTime;
+	@Schema(description = "预估保费推送时间")
+    private LocalDateTime estimatePushTime;
 
     /**
      * 结算完成时间
      */
-    private Date settleDoneTime;
+	@Schema(description = "结算完成时间")
+    private LocalDateTime settleDoneTime;
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * 主键
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * 商险明细id
-     */
-    public String getInsDetailId() {
-        return insDetailId;
-    }
-
-    /**
-     * 商险明细id
-     */
-    public void setInsDetailId(String insDetailId) {
-        this.insDetailId = insDetailId;
-    }
-
-    /**
-     * 结算状态
-     */
-    public String getSettleHandleStatus() {
-        return settleHandleStatus;
-    }
-
-    /**
-     * 结算状态
-     */
-    public void setSettleHandleStatus(String settleHandleStatus) {
-        this.settleHandleStatus = settleHandleStatus;
-    }
-
-    /**
-     * 结算类型 (1、单独结算 2、与薪资合并结算)
-     */
-    public Integer getSettleType() {
-        return settleType;
-    }
-
-    /**
-     * 结算类型 (1、单独结算 2、与薪资合并结算)
-     */
-    public void setSettleType(Integer settleType) {
-        this.settleType = settleType;
-    }
-
-    /**
-     * 实际保费
-     */
-    public BigDecimal getActualPremium() {
-        return actualPremium;
-    }
-
-    /**
-     * 实际保费
-     */
-    public void setActualPremium(BigDecimal actualPremium) {
-        this.actualPremium = actualPremium;
-    }
-
-    /**
-     * 预估保费
-     */
-    public BigDecimal getEstimatePremium() {
-        return estimatePremium;
-    }
-
-    /**
-     * 预估保费
-     */
-    public void setEstimatePremium(BigDecimal estimatePremium) {
-        this.estimatePremium = estimatePremium;
-    }
-
-    /**
-     * 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 更新时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 更新时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * 实际费用推送标识 1是 0否
-     */
-    public Integer getIsActualPush() {
-        return isActualPush;
-    }
-
-    /**
-     * 实际费用推送标识 1是 0否
-     */
-    public void setIsActualPush(Integer isActualPush) {
-        this.isActualPush = isActualPush;
-    }
-
-    /**
-     * 预估费用推送标识 1是 0否
-     */
-    public Integer getIsEstimatePush() {
-        return isEstimatePush;
-    }
-
-    /**
-     * 预估费用推送标识 1是 0否
-     */
-    public void setIsEstimatePush(Integer isEstimatePush) {
-        this.isEstimatePush = isEstimatePush;
-    }
-
-    /**
-     * 实际保费推送时间
-     */
-    public Date getActualPushTime() {
-        return actualPushTime;
-    }
-
-    /**
-     * 实际保费推送时间
-     */
-    public void setActualPushTime(Date actualPushTime) {
-        this.actualPushTime = actualPushTime;
-    }
-
-    /**
-     * 预估保费推送时间
-     */
-    public Date getEstimatePushTime() {
-        return estimatePushTime;
-    }
-
-    /**
-     * 预估保费推送时间
-     */
-    public void setEstimatePushTime(Date estimatePushTime) {
-        this.estimatePushTime = estimatePushTime;
-    }
-
-    /**
-     * 结算完成时间
-     */
-    public Date getSettleDoneTime() {
-        return settleDoneTime;
-    }
-
-    /**
-     * 结算完成时间
-     */
-    public void setSettleDoneTime(Date settleDoneTime) {
-        this.settleDoneTime = settleDoneTime;
-    }
 }
\ No newline at end of file