From 01a81beea99c0298a3b6178c7796f4c27b30c6c7 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 14:27:50 +0800
Subject: [PATCH] pat detail.  新增 appontment_id

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
index db431d6..4c4c1fc 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
@@ -6,10 +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.devrent.DevRentDO;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
 import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 /**
  * 瑁呮満鎷嗘満 Mapper
@@ -21,6 +19,7 @@
 
     default PageResult<DevRentDO> selectPage(DevRentPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<DevRentDO>()
+                .gtIfPresent(DevRentDO::getState, reqVO.getState())
                 .eqIfPresent(DevRentDO::getDevId, reqVO.getDevId())
                 .eqIfPresent(DevRentDO::getPatId, reqVO.getPatId())
                 .likeIfPresent(DevRentDO::getPatName, reqVO.getPatName())
@@ -49,13 +48,16 @@
             "  <if test=\"patId != null and patId != ''\"> " +
             "    and pat_id = #{patId} " +
             "  </if> " +
-            "  <if test=\"checkType != null and checkType != ''\"> " +
+            "  <if test=\"checkType != null \"> " +
             "    and check_type = #{checkType} " +
             "  </if> " +
             "</where> " +
             "order by create_time desc " +
             "limit 1 " +
             "</script>")
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
     DevRentDO getRentByState(DevRentSearchReqVO reqVO );
 
     @Select("select * from lihu.dev_rent where state=#{state} and pat_id=#{patId} and check_type=#{checkType} and to_days(create_time)=to_days(now())")
@@ -70,4 +72,6 @@
             "</script>")
     List<Integer> getPaidInfo(@Param("rentIdList")List<Long> rentIdList);
 
+    @Update("update lihu.dev_rent set paid = #{paid} where id = #{rentId};")
+    Integer setPaid(@Param("rentId") Long rentId, @Param("paid") Integer paid);
 }

--
Gitblit v1.9.3