eight
2024-11-27 77dc903c40eeae398177e463b213b43225b7f747
calling column : -1  不在大屏显示
已修改2个文件
19 ■■■■■ 文件已修改
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)
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()));