From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 93 insertions(+), 10 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..1040455 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
@@ -300,10 +299,37 @@
private Double pretaxcost;
/**
- * 绋庡悗閲戦
+ * 澧炲�肩◣鍚堣
*/
- @ApiModelProperty("绋庡悗閲戦")
- @Excel(name = "绋庡悗閲戦")
+ @ApiModelProperty("澧炲�肩◣鍚堣")
+ @Excel(name = "澧炲�肩◣")
+ private Double vatCost;
+
+ /**
+ * 鍩庡缓绋庡悎璁�
+ */
+ @ApiModelProperty("鍩庡缓绋庡悎璁�")
+ @Excel(name = "鍩庡缓绋�")
+ private Double cityTaxCost;
+
+ /**
+ * 鍔冲姟绋庡墠鍚堣
+ */
+ @ApiModelProperty("鍔冲姟绋庡墠鍚堣")
+ @Excel(name = "鍔冲姟绋庡墠")
+ private Double laborPretaxCost;
+
+ /**
+ * 绋庡彛寰勭増鏈細v1=鍘嗗彶鍙ｅ緞锛堟棤澧炲�肩◣/鍩庡缓绋庯級锛寁2=鏂板鍙ｅ緞
+ */
+ @ApiModelProperty("绋庡彛寰勭増鏈�")
+ private String taxVersion;
+
+ /**
+ * 鍔冲姟绋庡悗锛堝師鈥滅◣鍚庨噾棰濃�濓級
+ */
+ @ApiModelProperty("鍔冲姟绋庡悗")
+ @Excel(name = "鍔冲姟绋庡悗")
private Double taxedcost;
/**
@@ -334,18 +360,75 @@
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瀛ｅ害銆�3骞村害
*/
@ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
@Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�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;
+
+ @ApiModelProperty("鍗忓弸瑕佹眰鍐嶆鍙戣捣鏃讹紝甯︿笂杩欎釜鍊�")
+ private String summaryId;
+
+ /**
+ * 鍙戞斁鐘舵��
+ */
+ @ApiModelProperty("鍙戞斁鐘舵��")
+ @Excel(name = "鍙戞斁鐘舵��")
+ private String isdistribute;
}
--
Gitblit v1.9.3