From 77dc903c40eeae398177e463b213b43225b7f747 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 27 十一月 2024 13:45:55 +0800
Subject: [PATCH] calling column ： -1 不在大屏显示
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 3 ++-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
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 7fa2b7d..6cf9eee 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
@@ -33,6 +33,22 @@
.orderByDesc(CheckTypeDO::getId));
}
+ default PageResult<CheckTypeDO> selectPageForCallingScreen(CheckTypePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<CheckTypeDO>()
+ .likeIfPresent(CheckTypeDO::getName, reqVO.getName())
+ .eqIfPresent(CheckTypeDO::getValue, reqVO.getValue())
+ .eqIfPresent(CheckTypeDO::getReadyNum, reqVO.getReadyNum())
+ .betweenIfPresent(CheckTypeDO::getCreateTime, reqVO.getCreateTime())
+ .eqIfPresent(CheckTypeDO::getNeedDevReady, reqVO.getNeedDevReady())
+ .neIfPresent(CheckTypeDO::getCallingColumn, reqVO.getCallingColumn())
+ .eqIfPresent(CheckTypeDO::getDisplayBarcode, reqVO.getDisplayBarcode())
+ .eqIfPresent(CheckTypeDO::getExpenseRecognition, reqVO.getExpenseRecognition())
+ .eqIfPresent(CheckTypeDO::getTimeslotBookNum, reqVO.getTimeslotBookNum())
+ .eqIfPresent(CheckTypeDO::getTimeslotReservedNum, reqVO.getTimeslotReservedNum())
+ .eqIfPresent(CheckTypeDO::getAffinityCheckTypes, reqVO.getAffinityCheckTypes())
+ .orderByDesc(CheckTypeDO::getId));
+ }
+
@Select("SELECT * FROM lihu.check_type;")
@Results({
@Result(property = "affinityCheckTypes", column = "affinity_check_types", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
index 173abf3..6b7d3d5 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
@@ -54,7 +54,8 @@
public Map<Integer, List<String>> getDisplayColInfo() {
CheckTypePageReqVO checkTypePageReqVO = new CheckTypePageReqVO();
checkTypePageReqVO.setPageSize(-1);
- PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPage(checkTypePageReqVO);
+ checkTypePageReqVO.setCallingColumn(-1); // 鍒楀彿 -1 鐨勪笉鏄剧ず
+ PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPageForCallingScreen(checkTypePageReqVO);
Map<Integer, List<CheckTypeDO>> mapDisplayColName = pageResult.getList().stream().collect(Collectors.groupingBy(CheckTypeDO::getCallingColumn));
mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
--
Gitblit v1.9.3