From c20c99f256e2f47bd45f0b48fb6b1bcc83960f1e Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 21 三月 2024 14:22:13 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 61 +++++++++++++++++++++++++++--- 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java index e7a2428..56b3105 100644 --- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java +++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java @@ -1,16 +1,15 @@ package com.ruoyi.project.domain; -import java.math.BigDecimal; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.Date; /** * 璐圭敤鐢宠涓诲璞� service_fund @@ -334,18 +333,66 @@ private Integer checkstatus; /** + * 鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋� + */ + @ApiModelProperty("鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�") + private Integer istax; + + + /** + * 璁$畻绋庤垂鏃堕棿 + */ + @ApiModelProperty("璁$畻绋庤垂鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date fundtaxtime; + + /** + * 涓婃姤鏃堕棿 + */ + @ApiModelProperty("涓婃姤鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "涓婃姤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date applyTime; + + @ApiModelProperty("鏁版嵁鏄惁杩涘叆shared琛� 0锛氬彂璧� 1锛氬緟涓婁紶 2锛氬凡涓婁紶") + private Integer uploadStates; + + /** + * 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐� + */ + @ApiModelProperty("鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�") + private String notes; + + + /** + * 缁╂晥鏃ユ湡 + */ + @ApiModelProperty("缁╂晥鏃ユ湡") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "缁╂晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date jxrq; + + /** * 缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害 */ @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害") @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害") private Integer performancetype; + /** + * 涓撳璐圭敤绠楃◣鐢宠涓昏〃ID,褰撳�间负-1鏃讹紝琛ㄧずfundTaxId涓簄ull + */ + @ApiModelProperty("涓撳璐圭敤绠楃◣鐢宠涓昏〃ID") + @Excel(name = "涓撳璐圭敤绠楃◣鐢宠涓昏〃ID") + private Long fundTaxId = null; /** - * 鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋� + * 绋庨噾 */ - @ApiModelProperty("鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�") - private Integer istax; + @ApiModelProperty("绋庨噾") + @Excel(name = "绋庨噾") + private Double taxcost; + } -- Gitblit v1.9.3