From 2c19fa65dc87ea8f3d81f84154f4eeabff7f8d00 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期四, 05 六月 2025 12:36:47 +0800 Subject: [PATCH] zjh20250605 --- ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 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 71ab52f..2aace84 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 @@ -99,7 +100,7 @@ * 閭 */ @ExcelExport(value = "閭",sort =5) - @ExcelImport("鑱旂郴閭") + @ExcelImport("閭") @Excel(name = "閭",sort = 5,cellType = Excel.ColumnType.STRING) @ApiModelProperty("鑱旂郴閭") private String email; @@ -189,6 +190,17 @@ @ApiModelProperty("鍗曚綅鍚嶇О") private String company; + /** + * 濂楅鍒嗙被 + */ + @ExcelExport(value = "濂楅鍒嗙被",sort =99) + @ExcelImport("濂楅鍒嗙被") + @Excel(name = "濂楅鍒嗙被",sort = 99,cellType = Excel.ColumnType.STRING) + @ApiModelProperty("濂楅鍒嗙被") + @TableField(exist = false) + private String dwxm; + + @ApiModelProperty("鍗曚綅id") private String companyId; @@ -204,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; /** @@ -321,6 +333,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; @@ -330,6 +354,9 @@ @ApiModelProperty("绱㈠紩鍗″彿") private String indexCard; + @ApiModelProperty("鏈夋晥澶╂暟") + private Integer yxts; + @Override -- Gitblit v1.8.0