From 6ae75c73e98f11e50725fe44949ae690b3a4c4a9 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 11 十二月 2024 13:01:24 +0800
Subject: [PATCH] 根据检查类型决定是否确费

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 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 fe3afa2..3a3b54f 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
@@ -6,9 +6,8 @@
 import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX;
 import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
 import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*;
-import org.apache.ibatis.annotations.Select;
 
 /**
  * 妫�鏌ョ被鍨� Mapper
@@ -34,9 +33,33 @@
                 .orderByDesc(CheckTypeDO::getId));
     }
 
-    @Select("<script> " +
-              "SELECT * FROM lihu.check_type;" +
-            "</script>")
+    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 = "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();
 
-}
\ No newline at end of file
+    @Select("SELECT * FROM lihu.check_type where value = #{checkTypeCode} limit 1;")
+    @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)
+    })
+    CheckTypeDO getCheckTypeByValue(@Param("checkTypeCode") Integer checkTypeCode);
+}

--
Gitblit v1.9.3