From cc25bc0eec2d50da39d62f9896ed4d5e66805366 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 11 七月 2025 18:04:05 +0800
Subject: [PATCH] zjh20250711
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 124 +++++++++++++++++++++++++++++++++++++----
1 files changed, 112 insertions(+), 12 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
index 257fd50..d7281d0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -20,6 +20,7 @@
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.poi.ss.usermodel.IndexedColors;
/**
* 浣撴棰勭害瀵硅薄 tj_reservation
@@ -190,12 +191,12 @@
private String company;
/**
- * 鍗曚綅鍚嶅瓧
+ * 濂楅鍒嗙被
*/
- @ExcelExport(value = "鍗曚綅椤圭洰",sort =99)
- @ExcelImport("鍗曚綅椤圭洰")
- @Excel(name = "鍗曚綅椤圭洰",sort = 99,cellType = Excel.ColumnType.STRING)
- @ApiModelProperty("鍗曚綅椤圭洰")
+ @ExcelExport(value = "濂楅鍒嗙被",sort =99)
+ @ExcelImport("濂楅鍒嗙被")
+ @Excel(name = "濂楅鍒嗙被",sort = 99,cellType = Excel.ColumnType.STRING)
+ @ApiModelProperty("濂楅鍒嗙被")
@TableField(exist = false)
private String dwxm;
@@ -215,10 +216,10 @@
/**
* 閮ㄩ棬
*/
- @ExcelExport(value = "閮ㄩ棬",sort =-2)
- @ExcelImport("閮ㄩ棬")
- @Excel(name = "閮ㄩ棬",sort = 2,cellType = Excel.ColumnType.STRING)
- @ApiModelProperty("閮ㄩ棬")
+ @ExcelExport(value = "鍗曚綅閮ㄩ棬",sort =-2)
+ @ExcelImport("鍗曚綅閮ㄩ棬")
+ @Excel(name = "鍗曚綅閮ㄩ棬",sort = 2,cellType = Excel.ColumnType.STRING,color = IndexedColors.RED)
+ @ApiModelProperty("鍗曚綅閮ㄩ棬")
private String department;
/**
@@ -280,6 +281,12 @@
@TableField(exist = false)
private String packId;
+ @TableField(exist = false)
+ private String dwDeptName;
+
+ @TableField(exist = false)
+ private String groupingName;
+
//鍗曢」ids
@TableField(exist = false)
private List<Long> proIdList;
@@ -310,9 +317,6 @@
*/
private String groupingId;
- @ApiModelProperty(value = "鍒嗙粍鍚�")
- @TableField(exist = false)
- private String groupingName;
@ApiModelProperty(value = "搴旀敹浠锋牸")
@TableField(exist = false)
@@ -332,6 +336,18 @@
@TableField(exist = false)
private Integer tjStatus;
+
+ @ApiModelProperty("棰勭害鏃堕棿寮�濮�")
+ @TableField(exist = false)
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private Date yykssj;
+
+
+ @ApiModelProperty("棰勭害鏃堕棿缁撴潫")
+ @TableField(exist = false)
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private Date yyjssj;
+
@ApiModelProperty("搴ф満")
private String dwPhone;
@@ -344,6 +360,90 @@
@ApiModelProperty("鏈夋晥澶╂暟")
private Integer yxts;
+ /**
+ * 鎺ュ宸ラ緞骞�
+ */
+ @ExcelImport("鎺ュ宸ラ緞骞�")
+ @ApiModelProperty("鎺ュ宸ラ緞骞�")
+ private String zhiyeJhgln;
+
+ /**
+ * 鎺ュ宸ラ緞鏈�
+ */
+ @ExcelImport("鎺ュ宸ラ緞鏈�")
+ @ApiModelProperty("鎺ュ宸ラ緞鏈�")
+ private String zhiyeJhgly;
+
+ /**
+ * 寮�濮嬫帴瀹虫棩鏈�
+ */
+ @ExcelImport("寮�濮嬫帴瀹虫棩鏈�")
+ @ApiModelProperty("寮�濮嬫帴瀹虫棩鏈�")
+ private String zhiyeKsjhrq;
+
+ /**
+ * 宸ュ彿
+ */
+ @ExcelImport("宸ュ彿")
+ @ApiModelProperty("宸ュ彿")
+ private String zhiyeGh;
+
+ /**
+ * 杞﹂棿
+ */
+ @ApiModelProperty("杞﹂棿")
+ private String zhiyeCj;
+
+ /**
+ * 鑱屼笟缁撹
+ */
+ @ApiModelProperty("鑱屼笟缁撹")
+ private String zhiyeJl;
+
+ /**
+ * 鑱屼笟缁撴灉
+ */
+ @ApiModelProperty("鑱屼笟缁撴灉")
+ private String zhiyeJg;
+
+ @ExcelImport("宸ョ")
+ @ApiModelProperty("宸ョ")
+ private String zhiyeGz;
+
+ @ExcelImport("鎬诲伐榫勫勾")
+ @ApiModelProperty("鎬诲伐榫勫勾")
+ private String zhiyeZgln;
+
+ @ExcelImport("鎬诲伐榫勬湀")
+ @ApiModelProperty("鎬诲伐榫勬湀")
+ private String zhiyeZgly;
+
+ @ExcelImport("鎺ュ鍥犵礌")
+ @ApiModelProperty("鎺ュ鍥犵礌")
+ private String zhiyeJhys;
+
+ @ExcelImport("鍏ヨ亴鏃堕棿")
+ @ApiModelProperty("鍏ヨ亴鏃堕棿")
+ private String zhiyeRzsj;
+
+ @ExcelImport("鎵�澶勫崟浣�")
+ @ApiModelProperty("鎵�澶勫崟浣�")
+ private String zhiyeScdw;
+
+ @ExcelImport("鑱屼笟鍙插紑濮嬫棩鏈�")
+ @ApiModelProperty("鑱屼笟鍙插紑濮嬫棩鏈�")
+ private String zhiyeZysksrq;
+
+ @ExcelImport("鑱屼笟鍙茬粨鏉熸棩鏈�")
+ @ApiModelProperty("鑱屼笟鍙茬粨鏉熸棩鏈�")
+ private String zhiyeZysjsrq;
+
+ @ExcelImport("鑱屼笟鍙叉墍鍦ㄥ崟浣�")
+ @ApiModelProperty("鑱屼笟鍙叉墍鍦ㄥ崟浣�")
+ private String zhiyeZysszdw;
+
+
+
@Override
--
Gitblit v1.8.0