From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 12 十二月 2024 19:47:57 +0800 Subject: [PATCH] 工位选择界面 诊室按照room id排序 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java index dbfda2f..16e4f45 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java @@ -6,6 +6,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; +import cn.lihu.jh.framework.excel.core.annotations.DictFormat; +import cn.lihu.jh.framework.excel.core.convert.DictConvert; @Schema(description = "绠$悊鍚庡彴 - 妫�鏌ョ被鍨� Response VO") @Data @@ -33,11 +35,39 @@ private LocalDateTime createTime; @Schema(description = "闇�瑕佽澶囬鐢�") - @ExcelProperty("闇�瑕佽澶囬鐢�") + @ExcelProperty(value = "闇�瑕佽澶囬鐢�", converter = DictConvert.class) + @DictFormat("infra_boolean_string") // TODO 浠g爜浼樺寲锛氬缓璁缃埌瀵瑰簲鐨� DictTypeConstants 鏋氫妇绫讳腑 private Integer needDevReady; @Schema(description = "鍙彿鍒�") @ExcelProperty("鍙彿鍒�") private Integer callingColumn; -} \ No newline at end of file + @Schema(description = "鏍规嵁鎮h�呮潵婧愬喅瀹氾紝鏄惁鏄剧ず鎮h�呮潯鐮�") + @ExcelProperty("鏄惁鏄剧ず鎮h�呮潯鐮�") + private Integer[] displayBarcode; + + @Schema(description = "鏄惁闇�瑕佺‘璐�") + @ExcelProperty("鏄惁闇�瑕佺‘璐�") + private Integer expenseRecognition; + + @Schema(description = "鏃舵棰勭害瑙勫畾浜烘暟") + @ExcelProperty("鏃舵棰勭害瑙勫畾浜烘暟") + private Integer timeslotBookNum; + + @Schema(description = "姣忔椂娈甸鐣欎汉鏁�") + @ExcelProperty("姣忔椂娈甸鐣欎汉鏁�") + private Integer timeslotReservedNum; + + @Schema(description = "浜插拰鐨勬鏌ョ被鍨�") + @ExcelProperty("浜插拰鐨勬鏌ョ被鍨�") + private Integer[] affinityCheckTypes; + + @Schema(description = "棰勭害娉ㄦ剰浜嬮」") + @ExcelProperty("棰勭害娉ㄦ剰浜嬮」") + private String notes; + + @Schema(description = "棰勭害搴忓彿鏄剧ず鍓嶇紑") + @ExcelProperty("棰勭害搴忓彿鏄剧ず鍓嶇紑") + private String seqPrefix; +} -- Gitblit v1.9.3