From 17e08759071de47a7513d1cc1408c62d79713cd9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 28 十月 2026 17:47:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java | 94 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
index d776cbf..2392cc7 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
@@ -1,13 +1,16 @@
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.baomidou.mybatisplus.annotation.TableLogic;
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 org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -30,6 +33,12 @@
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
+
+ @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑ID")
+ private Long paymentid;
+
+ @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑paymentno")
+ private String paymentno;
/**
* 鍏宠仈service_donorcharge琛ㄧ殑ID
@@ -118,6 +127,13 @@
private Date amounttime;
/**
+ * 鎺ユ敹鏃ユ湡
+ */
+ @ApiModelProperty("鎺ユ敹鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date receiveTime;
+
+ /**
* 鏀惰垂褰曞叆浜�
*/
@ApiModelProperty("鏀惰垂褰曞叆浜�")
@@ -131,6 +147,7 @@
@Excel(name = "鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
private Long chargestate;
+
/**
* 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑
*/
@@ -138,5 +155,82 @@
@Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
private String organchargedesc;
+ /**
+ * 浜嬩欢缂栧彿
+ */
+ @ApiModelProperty("浜嬩欢缂栧彿")
+ @Excel(name = "浜嬩欢缂栧彿")
+ private String caseno;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 绁ㄦ嵁闄勪欢
+ */
+ @ApiModelProperty("绁ㄦ嵁闄勪欢")
+ @Excel(name = "绁ㄦ嵁闄勪欢")
+ private String annexFiles;
+
+ /**
+ * 妗堜緥鏃堕棿锛堝叧鑱� service_donatebaseinfo.donatetime锛�
+ */
+ @ApiModelProperty("妗堜緥鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date donatetime;
+
+ /**
+ * 妗堜緥鏃堕棿鏌ヨ寮�濮�
+ */
+ @ApiModelProperty("妗堜緥鏃堕棿鏌ヨ寮�濮�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date starttime;
+
+ /**
+ * 妗堜緥鏃堕棿鏌ヨ缁撴潫
+ */
+ @ApiModelProperty("妗堜緥鏃堕棿鏌ヨ缁撴潫")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date endtime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @TableField(exist = false)
+ private Boolean paymentidIsNotNull = true;
+
+ /**
+ * 鐘舵�侊紙0姝ｅ父 1鍒犻櫎锛�
+ */
+ @ApiModelProperty("鐘舵�侊紙0姝ｅ父 1鍒犻櫎锛�")
+ private Integer delFlag;
+
+ /**
+ * 鍣ㄥ畼鐘舵��
+ */
+ @ApiModelProperty("鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
+ @Excel(name = "鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
+ private String organState;
+
+ /**
+ * 鍣ㄥ畼鐘舵��
+ */
+ @ApiModelProperty("鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+ @Excel(name = "鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+ private String organChargeState;
+
+ @ApiModelProperty("鏌ヨ鎵�鏈�")
+ @TableField(exist = false)
+ private Boolean selectAll = false;
}
--
Gitblit v1.9.3