From b9cc263b8d1d31608a4c16cd157cc84b51e3d29d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 02 八月 2024 18:11:24 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 253 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 207 insertions(+), 46 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
index 0910510..99ce37a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -2,6 +2,10 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,211 +17,298 @@
/**
* 璐圭敤鐢宠鏄庣粏瀵硅薄 service_funddetail
- *
+ *
* @author ruoyi
* @date 2022-01-25
*/
@Data
@ApiModel("璐圭敤鐢宠鏄庣粏")
-public class ServiceFunddetail extends BaseEntity
-{
+public class ServiceFunddetail extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 涓婚敭ID */
+ /**
+ * 涓婚敭ID
+ */
@ApiModelProperty("涓婚敭ID")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 璧勯噾鐢宠涓昏〃ID */
+ /**
+ * 璧勯噾鐢宠涓昏〃ID
+ */
@ApiModelProperty("璧勯噾鐢宠涓昏〃ID")
@Excel(name = "璧勯噾鐢宠涓昏〃ID")
private Long fundid;
- /** 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹� */
+ /**
+ * 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�
+ */
@ApiModelProperty("鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
@Excel(name = "鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
private String beneficiaryname;
- /** 鏀剁泭浜虹紪鍙� */
+ /**
+ * 鏀剁泭浜虹紪鍙�
+ */
@ApiModelProperty("鏀剁泭浜虹紪鍙�")
@Excel(name = "鏀剁泭浜虹紪鍙�")
private String beneficiaryno;
- /** 宸ヤ綔鍗曚綅 */
+ /**
+ * 宸ヤ綔鍗曚綅
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅")
@Excel(name = "宸ヤ綔鍗曚綅")
private String unitname;
- /** 宸ヤ綔鍗曚綅缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅缂栧彿")
private String unitno;
- /** 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
private String unituserno;
- /** 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle */
+ /**
+ * 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle
+ */
@ApiModelProperty("鑱岀О")
@Excel(name = "鑱岀О")
private String title;
- /** 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType */
+ /**
+ * 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType
+ */
@ApiModelProperty("璇佷欢绫诲瀷")
@Excel(name = "璇佷欢绫诲瀷")
private Long idcardtype;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = "璇佷欢鍙风爜")
private String idcardno;
- /** 鎬у埆 鏍规嵁瀛楀吀sys_user_sex */
+ /**
+ * 鎬у埆 鏍规嵁瀛楀吀sys_user_sex
+ */
@ApiModelProperty("鎬у埆")
@Excel(name = "鎬у埆")
private String sex;
- /** 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation */
+ /**
+ * 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation
+ */
@ApiModelProperty("涓庢崘璧犺�呭叧绯�")
@Excel(name = "涓庢崘璧犺�呭叧绯�")
private String familyrelations;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@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 annexregistform;
- /** 璧勯噾绫诲埆 */
+ /**
+ * 璧勯噾绫诲埆
+ */
@ApiModelProperty("璧勯噾绫诲埆")
@Excel(name = "璧勯噾绫诲埆")
private String applytype;
- /** 璧勯噾绫诲埆鍚嶇О */
+ /**
+ * 璧勯噾绫诲埆鍚嶇О
+ */
@ApiModelProperty("璧勯噾绫诲埆鍚嶇О")
@Excel(name = "璧勯噾绫诲埆鍚嶇О")
private String applytypename;
- /** 椤圭洰ID */
+ /**
+ * 椤圭洰ID
+ */
@ApiModelProperty("椤圭洰ID")
@Excel(name = "椤圭洰ID")
private Long itemid;
- /** 椤圭洰鍚嶇О */
+ /**
+ * 椤圭洰鍚嶇О
+ */
@ApiModelProperty("椤圭洰鍚嶇О")
@Excel(name = "椤圭洰鍚嶇О")
private String itemname;
- /** 椤圭洰绫诲埆 */
+ /**
+ * 椤圭洰绫诲埆
+ */
@ApiModelProperty("椤圭洰绫诲埆")
@Excel(name = "椤圭洰绫诲埆")
private String itemtype;
- /** 鐢宠閲戦 */
- @ApiModelProperty("鐢宠閲戦")
+ /**
+ * 鐢宠閲戦
+ */
+ @ApiModelProperty("鐢宠閲戦(绋庡墠閲戦)")
@Excel(name = "鐢宠閲戦")
private Double amount;
- /** 棰勬敮閲戦 */
+ /**
+ * 棰勬敮閲戦
+ */
@ApiModelProperty("棰勬敮閲戦")
@Excel(name = "棰勬敮閲戦")
private Double prepaidamount;
- /** 鎵ｇ◣閲戦 */
+ /**
+ * 鎵ｇ◣閲戦
+ */
@ApiModelProperty("鎵ｇ◣閲戦")
@Excel(name = "鎵ｇ◣閲戦")
private Double taxamount;
- /** 鍙戠エ寮犳暟 */
+ /**
+ * 鍙戠エ寮犳暟
+ */
@ApiModelProperty("鍙戠エ寮犳暟")
@Excel(name = "鍙戠エ寮犳暟")
private Long invoicecount;
- /** 绋庡悗閲戦 */
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "涓婁紶鏃堕棿")
+ private BigDecimal reimbursementamount;
+ /**
+ * 绋庡悗閲戦
+ */
@ApiModelProperty("绋庡悗閲戦")
@Excel(name = "绋庡悗閲戦")
private Double taxedamount;
- /** 闄勪欢寮犳暟 */
+ /**
+ * 闄勪欢寮犳暟
+ */
@ApiModelProperty("闄勪欢寮犳暟")
@Excel(name = "闄勪欢寮犳暟")
private Long attachcount;
- /** 璁板綍鐘舵�� */
+ /**
+ * 璁板綍鐘舵��
+ */
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private String 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 quantity;
- /** 浠锋牸 */
+ /**
+ * 浠锋牸
+ */
@ApiModelProperty("浠锋牸")
private Double price;
- /** 鎹愮尞浜轰俊鎭痠d */
+ /**
+ * 鎹愮尞浜轰俊鎭痠d
+ */
@ApiModelProperty("鎹愮尞浜轰俊鎭痠d")
private Long infoid;
- /** 鎹愮尞浜虹紪鍙� */
+ /**
+ * 鎹愮尞浜虹紪鍙�
+ */
@ApiModelProperty("鎹愮尞浜虹紪鍙�")
private String donorno;
- /** 鎹愮尞浜哄鍚� */
+ /**
+ * 鎹愮尞浜哄鍚�
+ */
@ApiModelProperty("鎹愮尞浜哄鍚�")
private String donorname;
- /** 鏈嶅姟鑼冨洿 */
+ /**
+ * 鏈嶅姟鑼冨洿
+ */
@ApiModelProperty("鏈嶅姟鑼冨洿")
private String servicesscope;
- /** 鏈嶅姟鑼冨洿鍚嶇О */
+ /**
+ * 鏈嶅姟鑼冨洿鍚嶇О
+ */
@ApiModelProperty("鏈嶅姟鑼冨洿鍚嶇О")
private String servicesscopename;
- /** 鏈嶅姟瀵硅薄 */
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
@ApiModelProperty("鏈嶅姟瀵硅薄")
private String servicetype;
- /** 鏈嶅姟瀵硅薄鍚嶇О */
+ /**
+ * 鏈嶅姟瀵硅薄鍚嶇О
+ */
@ApiModelProperty("鏈嶅姟瀵硅薄鍚嶇О")
private String servicetypename;
@@ -225,11 +316,81 @@
private Integer orderno;
- /** 浜嬬敱澶囨敞 */
+ /**
+ * 浜嬬敱澶囨敞
+ */
@ApiModelProperty("浜嬬敱澶囨敞")
@Excel(name = "浜嬬敱澶囨敞")
private String remark;
+ /**
+ * 浜嬬敱澶囨敞
+ */
+ @ApiModelProperty("绉戠洰绫诲瀷锛氭垚鏈敹鍏�")
+ private String subjecttype;
+
+ /**
+ * 浜嬬敱澶囨敞
+ */
+ @ApiModelProperty("绉戠洰绫诲瀷鍚嶇О")
+ private String subjecttypename;
+
+ /**
+ * 闄勪欢鏂囦欢鍦板潃
+ */
+ @ApiModelProperty("闄勪欢鏂囦欢鍦板潃")
+ @TableField(value = "annexfiles", updateStrategy = FieldStrategy.IGNORED)
+ private String annexfiles;
+
+ /**
+ * 闄勪欢鏂囦欢鍦板潃
+ */
+ /**
+ * 鍙戠エ闄勪欢
+ */
+ @TableField(value = "invoicefiles", updateStrategy = FieldStrategy.IGNORED)
+ @ApiModelProperty("鍙戠エ闄勪欢")
+ @Excel(name = "鍙戠エ闄勪欢")
+ private String invoicefiles;
+
+
+ /**
+ * 璁＄畻绋庤垂鏃堕棿
+ */
+ @ApiModelProperty("璁＄畻绋庤垂鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date taxTime;
+
+ /**
+ * 缁╂晥鏃ユ湡
+ */
+ @ApiModelProperty("缁╂晥鏃ユ湡")
+ private String jxrq;
+
+
+ /**
+ * 椤圭洰鍚嶇О璇存槑
+ */
+ @ApiModelProperty("椤圭洰鍚嶇О璇存槑")
+ private String itemdescribe;
+
+ /**
+ * 閮ㄩ棬id
+ */
+ @ApiModelProperty("閮ㄩ棬id")
+ private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ private String deptName;
+
+ /**
+ * 搴忓彿
+ */
+ @ApiModelProperty("搴忓彿")
+ private Long xh;
}
--
Gitblit v1.9.3