From 5f639f0da5d86733038f13a5f3475c229a24a37d Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期一, 25 十二月 2023 17:28:18 +0800 Subject: [PATCH] zjh 本地 2023/12/12 -1 --- ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 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 427c8de..71ab52f 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 @@ -45,6 +45,7 @@ */ @ExcelExport(value = "濮撳悕",sort =0) @ExcelImport(value = "濮撳悕", required = true) + @Excel(name = "濮撳悕",sort = 0) @ApiModelProperty("濮撳悕") private String name; @@ -53,6 +54,7 @@ */ @ExcelExport(value = "鎬у埆",kv = "0-鐢�;1-濂�;2-鏈煡",sort =1) @ExcelImport(value = "鎬у埆", kv = "0-鐢�;1-濂�;2-鏈煡", required = true) + @Excel(name = "鎬у埆",sort = 1,dictType = "sys_user_sex",readConverterExp = "0-鐢�;1-濂�;2-鏈煡") @ApiModelProperty("鎬у埆") private Integer sex; @@ -61,6 +63,7 @@ */ @ExcelExport(value = "骞撮緞",sort =7) @ExcelImport(value = "骞撮緞", required = true) + @Excel(name = "骞撮緞",sort = 7) @ApiModelProperty("骞撮緞") private String age; @@ -69,6 +72,7 @@ */ @ExcelExport(value = "韬唤璇佸彿",sort =3) @ExcelImport(value = "韬唤璇佸彿", required = true, maxLength = 18, unique = true) + @Excel(name = "韬唤璇佸彿",sort = 3,cellType = Excel.ColumnType.STRING) @ApiModelProperty("韬唤璇佸彿") private String idCard; @@ -78,6 +82,7 @@ @JsonFormat(pattern = "yyyy-MM-dd") @ExcelExport(value = "鍑虹敓鏃ユ湡",sort =6) @ExcelImport("鍑虹敓鏃ユ湡") + @Excel(name = "鍑虹敓鏃ユ湡",sort = 6,dateFormat = "yyyy/MM/dd") @ApiModelProperty("鍑虹敓鏃ユ湡") private Date birthday; @@ -86,6 +91,7 @@ */ @ExcelExport(value = "鑱旂郴鐢佃瘽",sort =4) @ExcelImport(value = "鑱旂郴鐢佃瘽", maxLength = 11, required = true) + @Excel(name = "鑱旂郴鐢佃瘽",sort = 4,cellType = Excel.ColumnType.STRING) @ApiModelProperty("鑱旂郴鐢佃瘽") private String phoe; @@ -94,6 +100,7 @@ */ @ExcelExport(value = "閭",sort =5) @ExcelImport("鑱旂郴閭") + @Excel(name = "閭",sort = 5,cellType = Excel.ColumnType.STRING) @ApiModelProperty("鑱旂郴閭") private String email; @@ -102,6 +109,7 @@ */ @ExcelExport(value = "鎴峰彛鍦板潃",sort =13) @ExcelImport("鎴峰彛鍦板潃") + @Excel(name = "鎴峰彛鍦板潃",sort = 13,cellType = Excel.ColumnType.STRING) @ApiModelProperty("鎴峰彛鍦板潃") private String address; @@ -110,6 +118,7 @@ */ @ExcelExport(value = "鐜板湴鍧�",sort =14) @ExcelImport("鐜板湴鍧�") + @Excel(name = "鐜板湴鍧�",sort = 14,cellType = Excel.ColumnType.STRING) @ApiModelProperty("鐜板湴鍧�") private String cusaddr; @@ -118,6 +127,7 @@ */ @ExcelExport(value = "濠氬Щ鐘跺喌",kv = "1-鏈;2-宸插;4-绂诲;3-涓у伓",sort =8) @ExcelImport(value = "濠氬Щ鐘跺喌", kv = "1-鏈;2-宸插;4-绂诲;3-涓у伓",required = true) + @Excel(name = "濠氬Щ鐘跺喌",sort = 8,dictType = "dict_user_marry",readConverterExp = "1-鏈;2-宸插;4-绂诲;3-涓у伓") @ApiModelProperty("濠氬Щ") private Integer marriage; @@ -132,6 +142,10 @@ "18-鍌f棌;19-榛庢棌;20-鍌堝倛鏃�;21-浣ゆ棌;22-鐣叉棌;23-楂樺北鏃�;24-鎷夌鏃�;25-姘存棌;26-涓滀埂鏃�;27-绾宠タ鏃�;28-鏅鏃�;29-鏌皵鍏嬪瓬鏃�;30-鍦熸棌;31-杈炬枴灏旀棌;32-浠浆鏃�;33-缇屾棌;34-甯冩湕鏃�;34-鎾掓媺鏃�;35-姣涘崡鏃�" + "37-浠′浆鏃�;38-閿′集鏃�;39-闃挎槍鏃�;40-鏅背鏃�;41-濉斿悏鍏嬫棌;42-鎬掓棌;43-涔屽瓬鍒厠鏃�;44-淇勭綏鏂棌;45-閯傛俯鍏嬫棌;46-寰锋槀鏃�;47-淇濆畨鏃�;48-瑁曞浐鏃�;49-浜棌;50-濉斿灏旀棌;51-鐙緳鏃�;52-閯備鸡鏄ユ棌;53-璧摬鏃�;" + "54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�;99-鏈鏄�") + @Excel(name = "姘戞棌",sort = 2,dictType = "dict_user_national",readConverterExp="1-姹夋棌;2-钂欏彜鏃�;3-鍥炴棌;4-钘忔棌;5-缁村惥灏旀棌;6-鑻楁棌;7-褰濇棌;8-澹棌;9-甯冧緷鏃�;10-鏈濋矞鏃�;11-婊℃棌;12-渚楁棌;13-鐟舵棌;14-鐧芥棌;15-鍦熷鏃�;16-鍝堝凹鏃�;17-鍝堣惃鍏嬫棌;\" +\n" + + " \"18-鍌f棌;19-榛庢棌;20-鍌堝倛鏃�;21-浣ゆ棌;22-鐣叉棌;23-楂樺北鏃�;24-鎷夌鏃�;25-姘存棌;26-涓滀埂鏃�;27-绾宠タ鏃�;28-鏅鏃�;29-鏌皵鍏嬪瓬鏃�;30-鍦熸棌;31-杈炬枴灏旀棌;32-浠浆鏃�;33-缇屾棌;34-甯冩湕鏃�;34-鎾掓媺鏃�;35-姣涘崡鏃廫" +\n" + + " \"37-浠′浆鏃�;38-閿′集鏃�;39-闃挎槍鏃�;40-鏅背鏃�;41-濉斿悏鍏嬫棌;42-鎬掓棌;43-涔屽瓬鍒厠鏃�;44-淇勭綏鏂棌;45-閯傛俯鍏嬫棌;46-寰锋槀鏃�;47-淇濆畨鏃�;48-瑁曞浐鏃�;49-浜棌;50-濉斿灏旀棌;51-鐙緳鏃�;52-閯備鸡鏄ユ棌;53-璧摬鏃�;\" +\n" + + " \"54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�;99-鏈鏄�") @ApiModelProperty("姘戞棌") private Integer nation; @@ -171,6 +185,7 @@ */ @ExcelExport(value = "鍗曚綅鍚嶇О",sort =-4) @ExcelImport("鍗曚綅鍚嶇О") + @Excel(name = "鍗曚綅鍚嶇О",sort = -4,cellType = Excel.ColumnType.STRING) @ApiModelProperty("鍗曚綅鍚嶇О") private String company; @@ -182,6 +197,7 @@ */ @ExcelExport(value = "宸ュ彿",sort =-3) @ExcelImport("宸ュ彿") + @Excel(name = "宸ュ彿",sort = 3,cellType = Excel.ColumnType.STRING) @ApiModelProperty("宸ュ彿") private String jobNo; @@ -190,6 +206,7 @@ */ @ExcelExport(value = "閮ㄩ棬",sort =-2) @ExcelImport("閮ㄩ棬") + @Excel(name = "閮ㄩ棬",sort = 2,cellType = Excel.ColumnType.STRING) @ApiModelProperty("閮ㄩ棬") private String department; @@ -204,6 +221,7 @@ */ @ExcelExport(value = "鑱屼綅",sort =-1) @ExcelImport("鑱屼綅") + @Excel(name = "鑱屼綅",sort = -1,cellType = Excel.ColumnType.STRING) @ApiModelProperty("鑱屼綅") private String position; -- Gitblit v1.8.0