From e842ed74b3167075e4f8f0cf76b38ddc53a8fb54 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 22:18:48 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java | 128 +++++++++++++++++++++++++++++++++++-------
1 files changed, 107 insertions(+), 21 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 7b19381..db78a53 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,105 +1,191 @@
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.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 java.math.BigDecimal;
+import java.util.Date;
+
/**
* 鎹愮尞鍣ㄥ畼瀵硅薄 service_donorchargeorgan
- *
+ *
* @author ruoyi
* @date 2023-12-25
*/
@Data
@ApiModel("鎹愮尞鍣ㄥ畼")
-public class ServiceDonorchargeorgan extends BaseEntity
-{
+public class ServiceDonorchargeorgan 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 */
+ @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑ID")
+ private Long paymentid;
+
+ @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑paymentno")
+ private String paymentno;
+
+ /**
+ * 鍏宠仈service_donorcharge琛ㄧ殑ID
+ */
+ @ApiModelProperty("鍏宠仈service_donorcharge琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donorcharge琛ㄧ殑ID")
+ private Long donorchargeid;
+
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞浜哄悕瀛� */
+ /**
+ * 鎹愮尞浜哄悕瀛�
+ */
@ApiModelProperty("鎹愮尞浜哄悕瀛�")
@Excel(name = "鎹愮尞浜哄悕瀛�")
private String donorname;
- /** 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
@Excel(name = "鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
private String hospitalname;
- /** 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
@Excel(name = "鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
private String hospitalno;
- /** 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ */
+ /**
+ * 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ
+ */
@ApiModelProperty("鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
@Excel(name = "鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
private String organno;
- /** 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ */
+ /**
+ * 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ
+ */
@ApiModelProperty("鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
@Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
private String organname;
- /** 鍣ㄥ畼搴旀敹璐圭敤 */
+ /**
+ * 鍣ㄥ畼搴旀敹璐圭敤
+ */
@ApiModelProperty("鍣ㄥ畼搴旀敹璐圭敤")
@Excel(name = "鍣ㄥ畼搴旀敹璐圭敤")
private BigDecimal organcharge;
- /** 璐圭敤褰曞叆鏃堕棿 */
+ /**
+ * 璐圭敤褰曞叆鏃堕棿
+ */
@ApiModelProperty("璐圭敤褰曞叆鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date organtime;
- /** 璐圭敤褰曞叆浜� */
+ /**
+ * 璐圭敤褰曞叆浜�
+ */
@ApiModelProperty("璐圭敤褰曞叆浜�")
@Excel(name = "璐圭敤褰曞叆浜�")
private String chargeoperator;
- /** 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤 */
+ /**
+ * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤
+ */
@ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
@Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
private BigDecimal amount;
- /** 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿 */
+ /**
+ * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿
+ */
@ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date amounttime;
- /** 鏀惰垂褰曞叆浜� */
+ /**
+ * 鎺ユ敹鏃ユ湡
+ */
+ @ApiModelProperty("鎺ユ敹鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date receiveTime;
+
+ /**
+ * 鏀惰垂褰曞叆浜�
+ */
@ApiModelProperty("鏀惰垂褰曞叆浜�")
@Excel(name = "鏀惰垂褰曞叆浜�")
private String amountoperator;
- /** 鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮� */
+ /**
+ * 鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�
+ */
@ApiModelProperty("鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
@Excel(name = "鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
private Long chargestate;
- /** 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑 */
+ /**
+ * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑
+ */
@ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
@Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
private String organchargedesc;
+ /**
+ * 浜嬩欢缂栧彿
+ */
+ @ApiModelProperty("浜嬩欢缂栧彿")
+ @Excel(name = "浜嬩欢缂栧彿")
+ private String caseno;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 绁ㄦ嵁闄勪欢
+ */
+ @ApiModelProperty("绁ㄦ嵁闄勪欢")
+ @Excel(name = "绁ㄦ嵁闄勪欢")
+ private String annexFiles;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @TableField(exist = false)
+ private Boolean paymentidIsNotNull = true;
+
+ /**
+ * 鐘舵�侊紙0姝ｅ父 1鍒犻櫎锛�
+ */
+ @ApiModelProperty("鐘舵�侊紙0姝ｅ父 1鍒犻櫎锛�")
+ private Integer delFlag;
+
}
--
Gitblit v1.9.3