From fbf5402f03820ebc702871fc4c4933c024ff3087 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 七月 2024 18:08:26 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java | 103 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 82 insertions(+), 21 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
index 2f097ea..88e2599 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -18,106 +19,166 @@
*/
@Data
@ApiModel("VIEW")
-public class VDonationworkflow extends BaseEntity
-{
+public class VDonationworkflow {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
private Long id;
- /** 濮撳悕 */
+ /**
+ * 濮撳悕
+ */
@ApiModelProperty("濮撳悕")
@Excel(name = "濮撳悕")
private String name;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = "璇佷欢鍙风爜")
private String idcardno;
- /** 宸ヤ綔娴� */
+ /**
+ * 宸ヤ綔娴�
+ */
@ApiModelProperty("宸ヤ綔娴�")
@Excel(name = "宸ヤ綔娴�")
private Long workflow;
- /** 缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0 */
+ /**
+ * 缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0
+ */
@ApiModelProperty("缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0")
@Excel(name = "缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0")
private Long terminationcase;
- /** 閮ㄩ棬/缁勭紪鍙� */
+ /**
+ * 閮ㄩ棬/缁勭紪鍙�
+ */
@ApiModelProperty("閮ㄩ棬/缁勭紪鍙�")
@Excel(name = "閮ㄩ棬/缁勭紪鍙�")
private Long deptid;
- /** 閮ㄩ棬/缁勫悕绉� */
+ /**
+ * 閮ㄩ棬/缁勫悕绉�
+ */
@ApiModelProperty("閮ㄩ棬/缁勫悕绉�")
@Excel(name = "閮ㄩ棬/缁勫悕绉�")
private String deptname;
- /** 鎶ュ憡鑰呯紪鍙� */
+ /**
+ * 鎶ュ憡鑰呯紪鍙�
+ */
@ApiModelProperty("鎶ュ憡鑰呯紪鍙�")
@Excel(name = "鎶ュ憡鑰呯紪鍙�")
private String reporterno;
- /** 鎶ュ憡鑰呭鍚� */
+ /**
+ * 鎶ュ憡鑰呭鍚�
+ */
@ApiModelProperty("鎶ュ憡鑰呭鍚�")
@Excel(name = "鎶ュ憡鑰呭鍚�")
private String reportername;
- /** 妗堜緥鏃堕棿 */
+ /**
+ * 妗堜緥鍖哄煙
+ */
+ @ApiModelProperty("妗堜緥鍖哄煙")
+ @Excel(name = "妗堜緥鍖哄煙")
+ private String regionalLevel;
+
+ /**
+ * 妗堜緥鏃堕棿
+ */
@ApiModelProperty("妗堜緥鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "妗堜緥鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date donatetime;
- /** 鎶ュ憡鏃堕棿 */
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @ApiModelProperty("寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date starttime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty("缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date endtime;
+
+ /**
+ * 鎶ュ憡鏃堕棿
+ */
@ApiModelProperty("鎶ュ憡鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date reporttime;
- /** 鐪佺骇璇勪及缁勬牳蹇冩垚鍛樼粨璁� 瑙佸瓧鍏竤ys_CoreAssessConclusion */
+ /**
+ * 鐪佺骇璇勪及缁勬牳蹇冩垚鍛樼粨璁� 瑙佸瓧鍏竤ys_CoreAssessConclusion
+ */
@ApiModelProperty("鐪佺骇璇勪及缁勬牳蹇冩垚鍛樼粨璁� 瑙佸瓧鍏竤ys_CoreAssessConclusion")
@Excel(name = "鐪佺骇璇勪及缁勬牳蹇冩垚鍛樼粨璁� 瑙佸瓧鍏竤ys_CoreAssessConclusion")
private String coreteamassessconclusion;
- /** 鐪佺骇璇勪及缁勬牳蹇冩垚鍛樿瘎浼版椂闂� */
+ /**
+ * 鐪佺骇璇勪及缁勬牳蹇冩垚鍛樿瘎浼版椂闂�
+ */
@ApiModelProperty("鐪佺骇璇勪及缁勬牳蹇冩垚鍛樿瘎浼版椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐪佺骇璇勪及缁勬牳蹇冩垚鍛樿瘎浼版椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date coreteamassesstime;
- /** 绛剧讲鏃ユ湡 */
+ /**
+ * 绛剧讲鏃ユ湡
+ */
@ApiModelProperty("绛剧讲鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "绛剧讲鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signdate;
- /** 涓撳缁撹 瑙佸瓧鍏镐鸡鐞嗙粨璁� */
+ /**
+ * 涓撳缁撹 瑙佸瓧鍏镐鸡鐞嗙粨璁�
+ */
@ApiModelProperty("涓撳缁撹 瑙佸瓧鍏镐鸡鐞嗙粨璁�")
@Excel(name = "涓撳缁撹 瑙佸瓧鍏镐鸡鐞嗙粨璁�")
private Long expertconclusion;
- /** 缁撹鏃堕棿 */
+ /**
+ * 缁撹鏃堕棿
+ */
@ApiModelProperty("缁撹鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "缁撹鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date conclusiontime;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
@Excel(name = "缁撹鏃堕棿")
private Long organcount;
- /** 鎵嬫湳寮�濮嬫椂闂� */
+ /**
+ * 鎵嬫湳寮�濮嬫椂闂�
+ */
@ApiModelProperty("鎵嬫湳寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎵嬫湳寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operationbegtime;
- /** 瀹屾垚鏃堕棿 */
+ /**
+ * 瀹屾垚鏃堕棿
+ */
@ApiModelProperty("瀹屾垚鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "瀹屾垚鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3