From 97d9b0723841a0e9da10a3ecb64351efb5d7a8c2 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 29 十一月 2024 13:27:13 +0800
Subject: [PATCH] 界面 条码显示控制
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/SimpleCheckTypeRespVO.java | 4 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java | 4 ++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java | 3 +++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java | 3 +++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java | 4 ++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java | 4 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java | 1 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java | 5 +++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java | 4 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java | 4 ++--
10 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java
index cddf3e8..ce3652b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java
@@ -34,8 +34,8 @@
@Schema(description = "鍙彿鍒�")
private Integer callingColumn;
- @Schema(description = "鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
- private Integer displayBarcode;
+ @Schema(description = "鏍规嵁鎮ｈ�呮潵婧愬喅瀹氾紝鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
+ private Integer[] displayBarcode;
@Schema(description = "鏄惁闇�瑕佺‘璐�")
private Integer expenseRecognition;
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 0a854e6..98054bc 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
@@ -43,9 +43,9 @@
@ExcelProperty("鍙彿鍒�")
private Integer callingColumn;
- @Schema(description = "鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
+ @Schema(description = "鏍规嵁鎮ｈ�呮潵婧愬喅瀹氾紝鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
@ExcelProperty("鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
- private Integer displayBarcode;
+ private Integer[] displayBarcode;
@Schema(description = "鏄惁闇�瑕佺‘璐�")
@ExcelProperty("鏄惁闇�瑕佺‘璐�")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java
index eb3ad0c..7e09fd1 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java
@@ -26,8 +26,8 @@
@Schema(description = "鍙彿鍒�")
private Integer callingColumn;
- @Schema(description = "鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
- private Integer displayBarcode;
+ @Schema(description = "鏍规嵁鎮ｈ�呮潵婧愬喅瀹氾紝鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
+ private Integer[] displayBarcode;
@Schema(description = "鏄惁闇�瑕佺‘璐�")
private Integer expenseRecognition;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/SimpleCheckTypeRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/SimpleCheckTypeRespVO.java
index 2abb863..8850ab4 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/SimpleCheckTypeRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/SimpleCheckTypeRespVO.java
@@ -17,8 +17,8 @@
@Schema(description = "妫�鏌ョ被鍨嬪��")
private Integer value;
- @Schema(description = "鏄剧ず鏉＄爜")
- private Integer displayBarcode;
+ @Schema(description = "鏍规嵁鎮ｈ�呮潵婧愬喅瀹氾紝鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
+ private Integer[] displayBarcode;
@Schema(description = "棰勭害娉ㄦ剰浜嬮」")
private String notes;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java
index d852469..55da54a 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java
@@ -19,6 +19,9 @@
@ToString(callSuper = true)
public class QueuePageReqVO extends PageParam {
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ private String applyNo;
+
@Schema(description = "灏辫瘖娴佹按鍙�", example = "2024435")
private String episodeId;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java
index ea51da1..88ce74a 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java
@@ -19,6 +19,10 @@
@ExcelProperty("id")
private Integer id;
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ @ExcelProperty("棰勭害鐢宠鍙�")
+ private String applyNo;
+
@Schema(description = "灏辫瘖娴佹按鍙�", example = "2024435")
@ExcelProperty("灏辫瘖娴佹按鍙�")
private String episodeId;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java
index d45497a..ba5d055 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java
@@ -21,6 +21,9 @@
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21320")
private Integer id;
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ private String applyNo;
+
@Schema(description = "灏辫瘖娴佹按鍙�", example = "2024435")
private String episodeId;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java
index 994ff9a..09e5457 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java
@@ -50,9 +50,10 @@
*/
private Integer callingColumn;
/**
- * 鏄惁鏄剧ず鎮ｈ�呮潯鐮�
+ * 鏍规嵁鎮ｈ�呮潵婧愬喅瀹氾紝鏄惁鏄剧ず鎮ｈ�呮潯鐮�
*/
- private Integer displayBarcode;
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private Integer[] displayBarcode;
/**
* 鏄惁闇�瑕佺‘璐�
*/
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java
index 0d5636b..778e5e7 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java
@@ -31,6 +31,10 @@
@TableId
private Integer id;
/**
+ * 棰勭害鐢宠鍙�
+ */
+ private String applyNo;
+ /**
* 灏辫瘖娴佹按鍙�
*/
private String episodeId;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
index 6cf9eee..58b4dc6 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
@@ -51,6 +51,7 @@
@Select("SELECT * FROM lihu.check_type;")
@Results({
+ @Result(property = "displayBarcode", column = "display_barcode", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
@Result(property = "affinityCheckTypes", column = "affinity_check_types", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
})
List<CheckTypeDO> simpleCheckTypeList();
--
Gitblit v1.9.3