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/ServiceReimbursement.java |  230 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 190 insertions(+), 40 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
index f22a0cb..6eca98e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
@@ -1,175 +1,241 @@
 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_reimbursement
- * 
+ *
  * @author ruoyi
  * @date 2022-01-24
  */
 @Data
 @ApiModel("鎶ラ攢鐢宠")
-public class ServiceReimbursement extends BaseEntity
-{
+public class ServiceReimbursement 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;
 
-    /** 鎶ラ攢浜虹紪鍙� */
+    /**
+     * 鎶ラ攢浜虹紪鍙�
+     */
     @ApiModelProperty("鎶ラ攢浜虹紪鍙�")
     @Excel(name = "鎶ラ攢浜虹紪鍙�")
     private String userno;
 
-    /** 鎶ラ攢浜哄鍚� */
+    /**
+     * 鎶ラ攢浜哄鍚�
+     */
     @ApiModelProperty("鎶ラ攢浜哄鍚�")
     @Excel(name = "鎶ラ攢浜哄鍚�")
     private String username;
 
-    /** 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType */
+    /**
+     * 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType
+     */
     @ApiModelProperty("璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
     @Excel(name = "璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
     private String idcardtype;
 
-    /** 璇佷欢鍙风爜 */
+    /**
+     * 璇佷欢鍙风爜
+     */
     @ApiModelProperty("璇佷欢鍙风爜")
     @Excel(name = "璇佷欢鍙风爜")
     private String idcardno;
 
-    /** 鑱旂郴鐢佃瘽 */
+    /**
+     * 鑱旂郴鐢佃瘽
+     */
     @ApiModelProperty("鑱旂郴鐢佃瘽")
     @Excel(name = "鑱旂郴鐢佃瘽")
     private String phone;
 
-    /** 寮�鎴烽摱琛� */
+    /**
+     * 寮�鎴烽摱琛�
+     */
     @ApiModelProperty("寮�鎴烽摱琛�")
     @Excel(name = "寮�鎴烽摱琛�")
     private String depositbank;
 
-    /** 鍗″彿 */
+    /**
+     * 鍗″彿
+     */
     @ApiModelProperty("鍗″彿")
     @Excel(name = "鍗″彿")
     private String bankcardno;
 
-    /** 鍒嗚鍚嶇О */
+    /**
+     * 鍒嗚鍚嶇О
+     */
     @ApiModelProperty("鍒嗚鍚嶇О")
     @Excel(name = "鍒嗚鍚嶇О")
     private String branchbankname;
 
-    /** 閾惰鍗$収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+    /**
+     * 閾惰鍗$収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+     */
     @ApiModelProperty("閾惰鍗$収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
     @Excel(name = "閾惰鍗$収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
     private String annexbankcard;
 
-    /** 闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑 */
+    /**
+     * 闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑
+     */
     @ApiModelProperty("闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑")
     @Excel(name = "闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑")
     private String annexfiles;
 
-    /** 鐢宠閲戦 */
+    /**
+     * 鐢宠閲戦
+     */
     @ApiModelProperty("鐢宠閲戦")
     @Excel(name = "鐢宠閲戦")
     private Double amountrequested;
 
-    /** 棰勬敮璐圭敤 */
+    /**
+     * 棰勬敮璐圭敤
+     */
     @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;
 
-    /** 鍏宠仈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 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")
@@ -191,21 +257,105 @@
     @ApiModelProperty("鎬婚噾棰濈殑澶у啓")
     private String bigstrmoney;
 
+    /**
+     * 闄勪欢鍦板潃锛宎dd by yangjb 20221124
+     */
+    @ApiModelProperty("闄勪欢鍦板潃")
+    private String fileurl;
 
     private String remark;
 
-    /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+    /**
+     * 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑
+     */
     @ApiModelProperty("褰撳墠瀹℃牳绾у埆")
-    private int flowlevel;
+    private Long flowlevel;
 
+    /**
+     * 100锛氫笂浼犲尰闄�  199锛氬尰闄㈤┏鍥�
+     */
+    @ApiModelProperty("閫�鍥炴椂鐨勫鏍哥骇鍒�")
+    private Long backflowlevel;
 
-    /** 璐圭敤褰掑睘锛�0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞� */
+    /**
+     * 璐圭敤褰掑睘锛�0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞�
+     */
     @ApiModelProperty("璐圭敤褰掑睘")
     private String costtype;
 
-    /** 璐圭敤褰掑睘鎻忚堪 */
+    /**
+     * 璐圭敤褰掑睘鎻忚堪
+     */
     @ApiModelProperty("璐圭敤褰掑睘鎻忚堪")
     private String costtypename;
 
+    @ApiModelProperty("鎹愮尞瀹跺睘閾惰")
+    private String donorbank;
+
+    @ApiModelProperty("鎹愮尞瀹跺睘閾惰鍗″彿")
+    private String donorbankcard;
+
+    @ApiModelProperty("鎹愮尞瀹跺睘璐圭敤璇存槑")
+    private String donorremark;
+
+    @ApiModelProperty("鎹愮尞瀹跺睘璐圭敤閲戦")
+    private Double donoramount;
+
+    @ApiModelProperty("鎹愮尞瀹跺睘浜烘暟")
+    private Integer donorrelatives;
+
+
+    @ApiModelProperty("鐢宠鏃堕棿")
+    private Date createTime;
+
+
+    @ApiModelProperty("鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 1浠h〃鍒犻櫎锛�")
+    private Integer delFlag;
+
+
+    @ApiModelProperty("浠樻鏂瑰紡")
+    private String zffs;
+
+    @ApiModelProperty("浠樻鏃ユ湡")
+    private String riqi;
+
+
+    /**
+     * 缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗d笂鏄剧ず)
+     */
+    @ApiModelProperty("缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗d笂鏄剧ず)")
+    @Excel(name = "缂栧彿")
+    private String bh;
+
+    /**
+     * 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�
+     */
+    @ApiModelProperty("鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�")
+    private String notes;
+
+    /**
+     * 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
+     */
+    @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+    @Excel(name = "棰勫鐘舵�侊細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("涓婃姤鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+//
+//    @ApiModelProperty("缁撴潫鏃堕棿")
+//    private Date endtime;
+
+    @ApiModelProperty("鏁版嵁鏄惁杩涘叆shared琛�   0锛氬惁     1锛氭槸")
+    private Integer uploadStates;
+
 }
 

--
Gitblit v1.9.3