From 34a716e48e49743083953113bfc2e8011d52444f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 九月 2025 19:08:05 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 277 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 230 insertions(+), 47 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 60503db..edd6442 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,224 +1,407 @@
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
- *
+ *
* @author ruoyi
* @date 2022-01-24
*/
@Data
@ApiModel("璐圭敤鐢宠涓�")
-public class ServiceFund extends BaseEntity
-{
+public class ServiceFund extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 鐢宠浜虹紪鍙� */
+ /**
+ * 鐢宠浜虹紪鍙�
+ */
@ApiModelProperty("鐢宠浜虹紪鍙�")
@Excel(name = "鐢宠浜虹紪鍙�")
private String userno;
- /** 鐢宠浜哄鍚� */
+ /**
+ * 鐢宠浜哄鍚�
+ */
@ApiModelProperty("鐢宠浜哄鍚�")
@Excel(name = "鐢宠浜哄鍚�")
private String username;
- /** 宸ヤ綔鍗曚綅 */
+ /**
+ * 宸ヤ綔鍗曚綅
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅")
@Excel(name = "宸ヤ綔鍗曚綅")
private String unitname;
- /** 宸ヤ綔鍗曚綅缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅缂栧彿")
private String unitno;
- /** 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
private String unituserno;
- /** 瀹跺睘鑱旂郴鐢佃瘽 */
+ /**
+ * 瀹跺睘鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("瀹跺睘鑱旂郴鐢佃瘽")
@Excel(name = "瀹跺睘鑱旂郴鐢佃瘽")
private String phone;
- /** 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
private String annexbankcard;
- /** 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
private String annexregistform;
- /** 鐢宠閲戦 */
+ /**
+ * 鐢宠閲戦
+ */
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
private Double amountrequested;
- /** 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType */
+ /**
+ * 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType
+ */
@ApiModelProperty("璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
@Excel(name = "璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
private String applytype;
- /** 棰勬敮璐圭敤 */
+ /**
+ * 棰勬敮璐圭敤
+ */
@ApiModelProperty("棰勬敮璐圭敤")
@Excel(name = "棰勬敮璐圭敤")
private Double prepaidamount;
- /** 鍙戠エ寮犳暟 */
+ /**
+ * 鍙戠エ寮犳暟
+ */
@ApiModelProperty("鍙戠エ寮犳暟")
@Excel(name = "鍙戠エ寮犳暟")
private Long invoicecount;
- /** 闄勪欢鏁� */
+ /**
+ * 闄勪欢鏁�
+ */
@ApiModelProperty("闄勪欢鏁�")
@Excel(name = "闄勪欢鏁�")
private Long attachcount;
- /** 閮ㄩ棬涓荤宸ュ彿 */
+ /**
+ * 閮ㄩ棬涓荤宸ュ彿
+ */
@ApiModelProperty("閮ㄩ棬涓荤宸ュ彿")
@Excel(name = "閮ㄩ棬涓荤宸ュ彿")
private String managerno;
- /** 閮ㄩ棬涓荤鍚嶅瓧 */
+ /**
+ * 閮ㄩ棬涓荤鍚嶅瓧
+ */
@ApiModelProperty("閮ㄩ棬涓荤鍚嶅瓧")
@Excel(name = "閮ㄩ棬涓荤鍚嶅瓧")
private String managername;
- /** 閮ㄩ棬缂栧彿 */
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
@ApiModelProperty("閮ㄩ棬缂栧彿")
@Excel(name = "閮ㄩ棬缂栧彿")
private String deptmentno;
- /** 閮ㄩ棬鍚嶇О */
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
@ApiModelProperty("閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptmentname;
- /** 涓績绛惧瓧 */
+ /**
+ * 涓績绛惧瓧
+ */
@ApiModelProperty("涓績绛惧瓧")
@Excel(name = "涓績绛惧瓧")
private String opochecker;
- /** 璐㈠姟鍓櫌闀跨瀛� */
+ /**
+ * 闄㈤暱绛惧瓧
+ */
+ @ApiModelProperty("闄㈤暱绛惧瓧")
+ @Excel(name = "闄㈤暱绛惧瓧")
+ private String president;
+
+ /**
+ * 璐㈠姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
@Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
private String finvicepresident;
- /** 涓氬姟鍓櫌闀跨瀛� */
+ /**
+ * 涓氬姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
@Excel(name = "涓氬姟鍓櫌闀跨瀛�")
private String busvicepresident;
- /** 鍔炲叕瀹や富浠荤瀛� */
+ /**
+ * 鍔炲叕瀹や富浠荤瀛�
+ */
@ApiModelProperty("鍔炲叕瀹や富浠荤瀛�")
@Excel(name = "鍔炲叕瀹や富浠荤瀛�")
private String officedirector;
- /** 璐㈠姟瀹や富浠荤瀛� */
+ /**
+ * 璐㈠姟瀹や富浠荤瀛�
+ */
@ApiModelProperty("璐㈠姟瀹や富浠荤瀛�")
@Excel(name = "璐㈠姟瀹や富浠荤瀛�")
private String financedirector;
- /** 璐㈠姟瀹℃牳 */
+ /**
+ * 璐㈠姟瀹℃牳
+ */
@ApiModelProperty("璐㈠姟瀹℃牳")
@Excel(name = "璐㈠姟瀹℃牳")
private String financechecher;
- /** 璁板綍鐘舵�� */
+ /**
+ * 璁板綍鐘舵��
+ */
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private Integer recordstatus;
- /** 涓婁紶鏍囧織 */
+ /**
+ * 涓婁紶鏍囧織
+ */
@ApiModelProperty("涓婁紶鏍囧織")
@Excel(name = "涓婁紶鏍囧織")
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("璐圭敤鎬婚噾棰�")
private Double totalcost;
- /** 鑾峰彇涓撳鎬昏垂鐢� */
+ /**
+ * 鑾峰彇涓撳鎬昏垂鐢�
+ */
@ApiModelProperty("鑾峰彇涓撳鎬昏垂鐢�")
private Double procurementcost;
- /** 涓撳璐圭敤鎬婚噾棰� */
+ /**
+ * 涓撳璐圭敤鎬婚噾棰�
+ */
@ApiModelProperty("涓撳璐圭敤鎬婚噾棰�")
private Double expertcost;
- /** 浼︾悊瀹℃煡璐圭敤鎬婚噾棰� */
+ /**
+ * 浼︾悊瀹℃煡璐圭敤鎬婚噾棰�
+ */
@ApiModelProperty("浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
private Double ethicscost;
- /** 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰� */
+ /**
+ * 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�
+ */
@ApiModelProperty("鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
private Double medicalcost;
- /** 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰� */
+ /**
+ * 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�
+ */
@ApiModelProperty("鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
private Double familycost;
- /** 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰� */
+ /**
+ * 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�
+ */
@ApiModelProperty("鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
private Double aftercarecost;
@ApiModelProperty("鎹愮尞鑰呭鍚�")
private String donorname;
- /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+ /**
+ * 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑
+ */
@ApiModelProperty("褰撳墠瀹℃牳绾у埆")
- private int flowlevel;
+ private Long flowlevel;
- /** 绋庡墠閲戦 */
+ /**
+ * 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 100锛氬尰闄㈣储鍔� 199:鍖婚櫌椹冲洖
+ */
+ @ApiModelProperty("閫�鍥炲鏍哥骇鍒�")
+ private Integer backflowlevel;
+
+ /**
+ * 绋庡墠閲戦
+ */
@ApiModelProperty("绋庡墠閲戦")
@Excel(name = "绋庡墠閲戦")
private Double pretaxcost;
- /** 绋庡悗閲戦 */
+ /**
+ * 绋庡悗閲戦
+ */
@ApiModelProperty("绋庡悗閲戦")
@Excel(name = "绋庡悗閲戦")
private Double taxedcost;
- /** 浜嬬敱澶囨敞 */
+ /**
+ * 浜嬬敱澶囨敞
+ */
@ApiModelProperty("浜嬬敱澶囨敞")
@Excel(name = "浜嬬敱澶囨敞")
private String remark;
+ @ApiModelProperty("浠樻鏂瑰紡")
+ private String zffs;
+
+ @ApiModelProperty("浠樻鏃ユ湡")
+ private String riqi;
+
+ /**
+ * 缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗ｄ笂鏄剧ず)
+ */
+ @ApiModelProperty("缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗ｄ笂鏄剧ず)")
+ @Excel(name = "缂栧彿")
+ private String bh;
+
+ /**
+ * 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
+ */
+ @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟瀹℃煡锛�2銆佸鏍搁�氳繃绛夊緟鏉愭枡锛�3銆佸凡鏀跺埌鏉愭枡")
+ @Excel(name = "棰勫鐘舵�侊細1銆佸緟瀹℃煡锛�2銆佸鏍搁�氳繃绛夊緟鏉愭枡锛�3銆佸凡鏀跺埌鏉愭枡")
+ 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;
+
+ /**
+ * 绋庨噾
+ */
+ @ApiModelProperty("绋庨噾")
+ @Excel(name = "绋庨噾")
+ private Double taxcost;
+
+ @ApiModelProperty("鍗忓弸瑕佹眰鍐嶆鍙戣捣鏃讹紝甯︿笂杩欎釜鍊�")
+ private String summaryId;
+
+ /**
+ * 鍙戞斁鐘舵��
+ */
+ @ApiModelProperty("鍙戞斁鐘舵��")
+ @Excel(name = "鍙戞斁鐘舵��")
+ private String isdistribute;
+
}
--
Gitblit v1.9.3