From e842ed74b3167075e4f8f0cf76b38ddc53a8fb54 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 22:18:48 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java | 164 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 129 insertions(+), 35 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
index 8211f58..9f391b7 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@@ -11,181 +12,274 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 涓撳璐圭敤绠楃◣鐢宠涓诲璞� service_fundtax
- *
+ *
* @author ruoyi
* @date 2024-03-13
*/
@Data
@ApiModel("涓撳璐圭敤绠楃◣鐢宠涓�")
-public class ServiceFundtax extends BaseEntity
-{
+public class ServiceFundtax extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 涓婚敭id */
+ /**
+ * 涓婚敭id
+ */
@ApiModelProperty("涓婚敭id")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鐢宠缂栧彿 */
+ /**
+ * 鐢宠缂栧彿
+ */
@ApiModelProperty("鐢宠缂栧彿")
@Excel(name = "鐢宠缂栧彿")
private String applyno;
- /** 绠楃◣鏃堕棿 */
+ /**
+ * 绠楃◣鏃堕棿
+ */
@ApiModelProperty("绠楃◣鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "绠楃◣鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taxedtime;
- /** 鐢宠浜虹紪鍙� */
+ /**
+ * 鐢宠浜虹紪鍙�
+ */
@ApiModelProperty("鐢宠浜虹紪鍙�")
@Excel(name = "鐢宠浜虹紪鍙�")
private String userno;
- /** 鐢宠浜哄鍚� */
+ /**
+ * 鐢宠浜哄鍚�
+ */
@ApiModelProperty("鐢宠浜哄鍚�")
@Excel(name = "鐢宠浜哄鍚�")
private String username;
- /** 閮ㄩ棬缂栧彿 */
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
@ApiModelProperty("閮ㄩ棬缂栧彿")
@Excel(name = "閮ㄩ棬缂栧彿")
private String deptmentno;
- /** 閮ㄩ棬鍚嶇О */
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
@ApiModelProperty("閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptmentname;
- /** 閮ㄩ棬涓荤宸ュ彿 */
+ /**
+ * 閮ㄩ棬涓荤宸ュ彿
+ */
@ApiModelProperty("閮ㄩ棬涓荤宸ュ彿")
@Excel(name = "閮ㄩ棬涓荤宸ュ彿")
private String managerno;
- /** 閮ㄩ棬涓荤鍚嶅瓧 */
+ /**
+ * 閮ㄩ棬涓荤鍚嶅瓧
+ */
@ApiModelProperty("閮ㄩ棬涓荤鍚嶅瓧")
@Excel(name = "閮ㄩ棬涓荤鍚嶅瓧")
private String managername;
- /** 绋庡墠閲戦鍚堣 */
+ /**
+ * 绋庡墠閲戦鍚堣
+ */
@ApiModelProperty("绋庡墠閲戦鍚堣")
@Excel(name = "绋庡墠閲戦鍚堣")
private BigDecimal pretaxamount;
- /** 绋庡悗閲戦鍚堣 */
+ /**
+ * 绋庡悗閲戦鍚堣
+ */
@ApiModelProperty("绋庡悗閲戦鍚堣")
@Excel(name = "绋庡悗閲戦鍚堣")
private BigDecimal taxedamount;
- /** 璐圭敤鎬婚噾棰� */
+ /**
+ * 璐圭敤鎬婚噾棰�
+ */
@ApiModelProperty("璐圭敤鎬婚噾棰�")
@Excel(name = "璐圭敤鎬婚噾棰�")
private BigDecimal taxamount;
- /** 鍖诲鎴愭湰鍚堣 */
+ /**
+ * 鎵ｇ◣閲戦
+ */
+ @ApiModelProperty("鎵ｇ◣閲戦")
+ @Excel(name = "鎵ｇ◣閲戦")
+ private BigDecimal taxMoney;
+
+ /**
+ * 鍖诲鎴愭湰鍚堣
+ */
@ApiModelProperty("鍖诲鎴愭湰鍚堣")
@Excel(name = "鍖诲鎴愭湰鍚堣")
private BigDecimal medicalcost;
- /** 閬椾綋淇鏀寔鎴愭湰鍚堣 */
+ /**
+ * 閬椾綋淇鏀寔鎴愭湰鍚堣
+ */
@ApiModelProperty("閬椾綋淇鏀寔鎴愭湰鍚堣")
@Excel(name = "閬椾綋淇鏀寔鎴愭湰鍚堣")
private BigDecimal bodymaintaincost;
- /** 鍣ㄥ畼鑾峰彇鎴愭湰鍚堣 */
+ /**
+ * 鍣ㄥ畼鑾峰彇鎴愭湰鍚堣
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鎴愭湰鍚堣")
@Excel(name = "鍣ㄥ畼鑾峰彇鎴愭湰鍚堣")
private BigDecimal organgaincost;
- /** 鍣ㄥ畼鍖诲鏀寔鎴愭湰 */
+ /**
+ * 鍣ㄥ畼鍖诲鏀寔鎴愭湰
+ */
@ApiModelProperty("鍣ㄥ畼鍖诲鏀寔鎴愭湰")
@Excel(name = "鍣ㄥ畼鍖诲鏀寔鎴愭湰")
private BigDecimal organmaintaincost;
- /** 璁板綍鐘舵�� */
+ /**
+ * 璁板綍鐘舵��
+ */
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private Long recordstatus;
- /** 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡 */
+ /**
+ * 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
+ */
@ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
@Excel(name = "棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
private Long checkstatus;
- /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+ /**
+ * 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑
+ */
@ApiModelProperty("褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
@Excel(name = "褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
private Long flowlevel;
- /** 璐㈠姟閫�鍥�199锛涗笂浼犲尰闄�100锛� */
+ /**
+ * 璐㈠姟閫�鍥�199锛涗笂浼犲尰闄�100锛�
+ */
@ApiModelProperty("璐㈠姟閫�鍥�199锛涗笂浼犲尰闄�100锛�")
@Excel(name = "璐㈠姟閫�鍥�199锛涗笂浼犲尰闄�100锛�")
private Long backflowlevel;
- /** 鍙戞斁鐘舵�� */
+ /**
+ * 鍙戞斁鐘舵��
+ */
@ApiModelProperty("鍙戞斁鐘舵��")
@Excel(name = "鍙戞斁鐘舵��")
private String isdistribute;
- /** 浠樻鏃ユ湡 */
+ /**
+ * 浠樻鏃ユ湡
+ */
@ApiModelProperty("浠樻鏃ユ湡")
@Excel(name = "浠樻鏃ユ湡")
private String riqi;
- /** 涓績绛惧瓧 */
+ /**
+ * 涓績绛惧瓧
+ */
@ApiModelProperty("涓績绛惧瓧")
@Excel(name = "涓績绛惧瓧")
private String opochecker;
- /** 璐㈠姟鍓櫌闀跨瀛� */
+ /**
+ * 璐㈠姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
@Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
private String finvicepresident;
- /** 涓氬姟鍓櫌闀跨瀛� */
+ /**
+ * 涓氬姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
@Excel(name = "涓氬姟鍓櫌闀跨瀛�")
private String busvicepresident;
- /** 闄㈤暱瀹℃壒 */
+ /**
+ * 闄㈤暱瀹℃壒
+ */
@ApiModelProperty("闄㈤暱瀹℃壒")
@Excel(name = "闄㈤暱瀹℃壒")
private String president;
- /** 鍔炲叕瀹や富浠荤瀛� */
+ /**
+ * 鍔炲叕瀹や富浠荤瀛�
+ */
@ApiModelProperty("鍔炲叕瀹や富浠荤瀛�")
@Excel(name = "鍔炲叕瀹や富浠荤瀛�")
private String officedirector;
- /** 璐㈠姟瀹や富浠荤瀛� */
+ /**
+ * 璐㈠姟瀹や富浠荤瀛�
+ */
@ApiModelProperty("璐㈠姟瀹や富浠荤瀛�")
@Excel(name = "璐㈠姟瀹や富浠荤瀛�")
private String financedirector;
- /** 璐㈠姟瀹℃牳 */
+ /**
+ * 璐㈠姟瀹℃牳
+ */
@ApiModelProperty("璐㈠姟瀹℃牳")
@Excel(name = "璐㈠姟瀹℃牳")
private String financechecher;
- /** 鏁版嵁鏄惁鍏佽杩涘叆shared琛� 0锛氬惁 1锛氭槸锛�2锛氬凡杩涘叆 */
+ /**
+ * 鏁版嵁鏄惁鍏佽杩涘叆shared琛� 0锛氬惁 1锛氭槸锛�2锛氬凡杩涘叆
+ */
@ApiModelProperty("鏁版嵁鏄惁鍏佽杩涘叆shared琛� 0锛氬惁 1锛氭槸锛�2锛氬凡杩涘叆")
@Excel(name = "鏁版嵁鏄惁鍏佽杩涘叆shared琛� 0锛氬惁 1锛氭槸锛�2锛氬凡杩涘叆")
private String uploadflag;
- /** 涓婁紶鏃堕棿 */
+ /**
+ * 涓婁紶鏃堕棿
+ */
@ApiModelProperty("涓婁紶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date uploadtime;
- /** 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐� */
+ /**
+ * 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�
+ */
@ApiModelProperty("鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�")
@Excel(name = "鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�")
private String updownremark;
+ /**
+ * 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�
+ */
+ @ApiModelProperty("鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�")
+ @Excel(name = "鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�")
+ private Integer istax;
+
+ /**
+ * serviceFunds闆嗗悎
+ */
+ @ApiModelProperty("serviceFunds闆嗗悎")
+ @TableField(exist = false)
+ private List<ServiceFund> serviceFunds;
+
+
+ /**
+ * 浜嬬敱澶囨敞
+ */
+ @ApiModelProperty("浜嬬敱澶囨敞")
+ @Excel(name = "浜嬬敱澶囨敞")
+ private String remark;
+
}
--
Gitblit v1.9.3