From a894bc6373154d5cfd28b7f46df3c4cfa01a7b9b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 24 四月 2024 11:46:33 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java |  263 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 203 insertions(+), 60 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
index b49c4f8..4fdcd2f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
@@ -1,7 +1,8 @@
-//package com.ruoyi.system.domain;
 package com.ruoyi.project.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 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;
@@ -15,243 +16,385 @@
 
 /**
  * 璐圭敤鐢宠涓诲璞� service_fund_shared
- * 
+ *
  * @author ruoyi
- * @date 2023-01-10
+ * @date 2023-03-27
  */
 @Data
 @ApiModel("璐圭敤鐢宠涓�")
-public class ServiceFundShared extends BaseEntity
-{
+public class ServiceFundShared 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 donorname;
 
-    /** 鐢宠浜虹紪鍙� */
+    /**
+     * 鐢宠浜虹紪鍙�
+     */
     @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 BigDecimal pretaxcost;
+    private Double pretaxcost;
 
-    /** 绋庡悗閲戦鍚堣 */
+    /**
+     * 绋庡悗閲戦鍚堣
+     */
     @ApiModelProperty("绋庡悗閲戦鍚堣")
     @Excel(name = "绋庡悗閲戦鍚堣")
-    private BigDecimal taxedcost;
+    private Double taxedcost;
 
-    /** 璐圭敤鎬婚噾棰� */
+    /**
+     * 璐圭敤鎬婚噾棰�
+     */
     @ApiModelProperty("璐圭敤鎬婚噾棰�")
     @Excel(name = "璐圭敤鎬婚噾棰�")
-    private BigDecimal totalcost;
+    private Double totalcost;
 
-    /** 鑾峰彇涓撳鎬昏垂鐢� */
+    /**
+     * 鑾峰彇涓撳鎬昏垂鐢�
+     */
     @ApiModelProperty("鑾峰彇涓撳鎬昏垂鐢�")
     //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
     //@TableId(type = IdType.AUTO)
-    private BigDecimal procurementcost;
+    private Double procurementcost;
 
-    /** 涓撳璐圭敤鎬婚噾棰� */
+    /**
+     * 涓撳璐圭敤鎬婚噾棰�
+     */
     @ApiModelProperty("涓撳璐圭敤鎬婚噾棰�")
     @Excel(name = "涓撳璐圭敤鎬婚噾棰�")
-    private BigDecimal expertcost;
+    private Double expertcost;
 
-    /** 浼︾悊瀹℃煡璐圭敤鎬婚噾棰� */
+    /**
+     * 浼︾悊瀹℃煡璐圭敤鎬婚噾棰�
+     */
     @ApiModelProperty("浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
     @Excel(name = "浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
-    private BigDecimal ethicscost;
+    private Double ethicscost;
 
-    /** 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰� */
+    /**
+     * 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�
+     */
     @ApiModelProperty("鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
     @Excel(name = "鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
-    private BigDecimal medicalcost;
+    private Double medicalcost;
 
-    /** 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰� */
+    /**
+     * 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�
+     */
     @ApiModelProperty("鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
     @Excel(name = "鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
-    private BigDecimal familycost;
+    private Double familycost;
 
-    /** 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰� */
+    /**
+     * 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�
+     */
     @ApiModelProperty("鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
     @Excel(name = "鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
-    private BigDecimal aftercarecost;
+    private Double aftercarecost;
 
-    /** 鐢宠閲戦 */
+    /**
+     * 鐢宠閲戦
+     */
     @ApiModelProperty("鐢宠閲戦")
     @Excel(name = "鐢宠閲戦")
-    private BigDecimal amountrequested;
+    private Double amountrequested;
 
-    /** 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType */
+    /**
+     * 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType
+     */
     @ApiModelProperty("璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
     @Excel(name = "璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
     private String applytype;
 
-    /** 棰勬敮璐圭敤 */
+    /**
+     * 棰勬敮璐圭敤
+     */
     @ApiModelProperty("棰勬敮璐圭敤")
     @Excel(name = "棰勬敮璐圭敤")
     private BigDecimal 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 finvicepresident;
 
-    /** 涓氬姟鍓櫌闀跨瀛� */
+    /**
+     * 闄㈤暱绛惧瓧
+     */
+    @ApiModelProperty("闄㈤暱绛惧瓧")
+    @Excel(name = "闄㈤暱绛惧瓧")
+    private String president;
+
+
+    /**
+     * 涓氬姟鍓櫌闀跨瀛�
+     */
     @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 String isdistribute;
 
-    /** 璁板綍鐘舵�� */
+    /**
+     * 璁板綍鐘舵��
+     */
     @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;
 
-    /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+    /**
+     * 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑
+     */
     @ApiModelProperty("褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
     @Excel(name = "褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
     private Long flowlevel;
 
-    /** 瀵规帴绯荤粺琛ㄥ崟id */
+    /**
+     * 瀵规帴绯荤粺琛ㄥ崟id
+     */
     @ApiModelProperty("瀵规帴绯荤粺琛ㄥ崟id")
     @Excel(name = "瀵规帴绯荤粺琛ㄥ崟id")
     private String oaid;
 
-    /** 瀵规帴绯荤粺琛ㄥ崟鐘舵�� */
+    /**
+     * 瀵规帴绯荤粺琛ㄥ崟鐘舵��
+     */
     @ApiModelProperty("瀵规帴绯荤粺琛ㄥ崟鐘舵��")
     @Excel(name = "瀵规帴绯荤粺琛ㄥ崟鐘舵��")
     private String oabdzt;
 
-    /** 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉� */
+    /**
+     * 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�
+     */
     @ApiModelProperty("璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
     @Excel(name = "璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
     private String filename;
 
-    /** 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉� */
+    /**
+     * 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�
+     */
     @ApiModelProperty("璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
     @Excel(name = "璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
     private String fileid;
 
+    @ApiModelProperty("serverfund鐨処D")
+    @Excel(name = "璁板綍鐘舵��")
+    private long serfunid;
+
+    @ApiModelProperty("浠樻鏂瑰紡")
+    private String zffs;
+
+    @ApiModelProperty("浠樻鏃ユ湡")
+    private String riqi;
+
+
+    @ApiModelProperty("璐㈠姟椹冲洖淇℃伅锛氬鍚�+' '+鏃堕棿+' '+鎰忚")
+    @Excel(name = "璐㈠姟椹冲洖淇℃伅锛氬鍚�+' '+鏃堕棿+' '+鎰忚")
+    private String cxrjyj;
+
+    /**
+     * 瀹℃壒缁撴灉锛堚�滀腑蹇冪瀛椻�� 涓�1锛岃储鍔″壇闄㈤暱绛惧瓧涓�2锛屼笟鍔″壇闄㈤暱绛惧瓧涓�3锛変互鈥滐紝鈥濆垎寮�锛屽鏋�1锛�2锛�3閮芥湁浜嗭紝璇存槑杩欎釜瀹℃壒瀹屾垚浜�
+     */
+    @ApiModelProperty("瀹℃壒缁撴灉")
+    private int spjg;
+
+    /**
+     * 鎵撳嵃缂栧彿
+     */
+    @ApiModelProperty("缂栧彿")
+    private String bh;
+
+    /**
+     * 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
+     */
+    @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+    private Integer checkstatus;
+
+    /**
+     * 缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害
+     */
+    @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害")
+    @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害")
+    private Integer performancetype;
+
+    /** 涓婃姤鏃堕棿 */
+    @ApiModelProperty("涓婃姤鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
 }
 

--
Gitblit v1.9.3