From c20c99f256e2f47bd45f0b48fb6b1bcc83960f1e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 21 三月 2024 14:22:13 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 23 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
index 7cc1686..7f6011f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
@@ -1,6 +1,7 @@
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.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@@ -8,8 +9,12 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
/**
* 鎹愮尞鍣ㄥ畼绠＄悊瀵硅薄 service_donateorgan
@@ -78,6 +83,14 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍣ㄥ畼鑾峰彇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date organgettime;
+
+ /**
+ * 棰勮鑾峰彇鏃堕棿
+ */
+ @ApiModelProperty("棰勮鑾峰彇鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "棰勮鑾峰彇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date estimatedtime;
/**
* 鍖荤敓濮撳悕
@@ -188,47 +201,49 @@
@ApiModelProperty("鐢宠浜虹紪鍙�")
- private String applicantUserID;
+ private String applicantuserid;
@ApiModelProperty("鐢宠浜哄鍚�")
- private String applicantUserName;
+ private String applicantusername;
@ApiModelProperty("鐢宠鏃堕棿")
- private Date applicantTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date applicanttime;
@ApiModelProperty("瀹℃牳浜虹紪鍙�")
- private String checkUserID;
+ private String checkuserid;
@ApiModelProperty("瀹℃牳浜哄鍚�")
- private String checkUserName;
+ private String checkusername;
@ApiModelProperty("瀹℃牳鏃堕棿")
- private Date checkTime;
+ private Date checktime;
@ApiModelProperty("瀹℃牳鎰忚")
- private String checkSuggestion;
+ private String checksuggestion;
@ApiModelProperty("0:鎻愪氦鍒嗛厤锛�1锛氬鏍搁�氳繃锛�2锛氬鏍告嫆缁�")
- private Integer allocationStatus;
+ private Integer allocationstatus;
@ApiModelProperty("绉绘浜哄鍚�")
private String name;
@ApiModelProperty("绉绘浜烘�у埆 鏍规嵁瀛楀吀sys_user_sex")
- private Integer sexOMMENT;
+ private Integer sex;
@ApiModelProperty("绉绘浜鸿瘉浠剁被鍨� 鏍规嵁瀛楀吀sys_IDType")
- private Integer idCardType;
+ private Integer idcardtype;
@ApiModelProperty("绉绘浜鸿瘉浠跺彿鐮�")
- private String idCardNo;
+ private String idcardno;
@ApiModelProperty("绉绘浜哄勾榫�")
private Integer age;
@ApiModelProperty("绉绘浜哄勾榫勫崟浣� 鏍规嵁瀛楀吀sys_AgeUnit")
- private String ageUnit;
+ private String ageunit;
@ApiModelProperty("绉绘浜哄嚭鐢熸棩鏈�")
private String birthday;
@@ -237,37 +252,92 @@
private String phone;
@ApiModelProperty("绉绘浜虹幇浣忓湴鍧�")
- private String residenceAddress;
+ private String residenceaddress;
@ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佷唬鐮�")
- private String residenceProvince;
+ private String residenceprovince;
@ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佸悕绉�")
- private String residenceProvinceName;
+ private String residenceprovincename;
@ApiModelProperty("绉绘浜哄競缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
- private String residenceCity;
+ private String residencecity;
@ApiModelProperty("绉绘浜哄競鍚嶇О")
- private String residenceCityName;
+ private String residencecityname;
@ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�")
- private String residenceTown;
+ private String residencetown;
@ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鍚嶇О")
- private String residenceTownName;
+ private String residencetownname;
@ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
- private String residenceCommunity;
+ private String residencecommunity;
@ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級鍚嶇О")
- private String residenceCommunityName;
+ private String residencecommunityname;
@ApiModelProperty("绉绘浜烘墍灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
- private String residenceCountyCode;
+ private String residencecountycode;
@ApiModelProperty("绉绘浜烘墍灞炲尯鍩熷悕绉�")
- private String residenceCountyName;
+ private String residencecountyname;
+
+ @ApiModelProperty("鍣ㄥ畼璐圭敤")
+ private Double organcharge;
+
+ @ApiModelProperty("鍣ㄥ畼璐圭敤")
+ private String organchargeoperator;
+
+ @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date organchargedate;
+
+ @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
+ private Double organamount;
+
+ @ApiModelProperty("鍣ㄥ畼璐圭敤鏀跺彇鐘舵��: 0: 鏈敹鍙栵紝1: 宸叉敹鍙�")
+ private Integer chargestate;
+
+ @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
+ private String organchargedesc;
+
+ @ApiModelProperty("鏈幏鍙栧師鍥�")
+ private String notgetreason;
+
+ @ApiModelProperty("瀹樼Щ鎭掔姸鎬� : 0: 鏈Щ: 1: 宸茬Щ妞�")
+ private Integer transplantstate;
+
+
+ /**
+ * 绯荤粺缂栧彿
+ */
+ @ApiModelProperty("绯荤粺缂栧彿")
+ @Excel(name = "绯荤粺缂栧彿")
+ private String caseno;
+
+
+
+ @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;
+
+
+ @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;
+
+ @TableField(exist = false)
+ private String city;
+
+ /**
+ * 鎶ュ憡鑰呯紪鍙�
+ */
+ @TableField(exist = false)
+ private String reporterno;
}
--
Gitblit v1.9.3