From d8c1b8408ca24f3e02427c7885da8c87c90f16a0 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 12 十一月 2024 19:43:48 +0800
Subject: [PATCH] update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 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 22b0908..db431d6 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
@@ -1,13 +1,11 @@
 package cn.lihu.jh.module.ecg.dal.mysql.devrent;
 
-import java.time.LocalDate;
 import java.util.*;
 
 import cn.lihu.jh.framework.common.pojo.PageResult;
 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 cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
 import org.apache.ibatis.annotations.Param;
@@ -36,14 +34,32 @@
                 .orderByDesc(DevRentDO::getId));
     }
 
+    @Select("<script> " +
+            "SELECT * FROM lihu.dev_rent " +
+            "<where> " +
+            "  <if test='stateList != null'> " +
+            "    and state in ( " +
+            "      <foreach collection='stateList' separator=',' item='state'> " +
+            "        #{state} " +
+            "      </foreach> ) " +
+            "  </if> " +
+            "  <if test=\"devId != null and devId != ''\"> " +
+            "    and dev_id = #{devId} " +
+            "  </if> " +
+            "  <if test=\"patId != null and patId != ''\"> " +
+            "    and pat_id = #{patId} " +
+            "  </if> " +
+            "  <if test=\"checkType != null and checkType != ''\"> " +
+            "    and check_type = #{checkType} " +
+            "  </if> " +
+            "</where> " +
+            "order by create_time desc " +
+            "limit 1 " +
+            "</script>")
     DevRentDO getRentByState(DevRentSearchReqVO reqVO );
 
-    @Select("select * from lihu.dev_rent where state=#{state} and pat_id=#{patId} and to_days(create_time)=to_days(now())")
-    List<DevRentDO> selectByPatIdAndState(@Param("patId") String patId, @Param("state") Integer state);
-
-    /* 鐢ㄤ簬鏌ユ壘 璁惧鐨勪娇鐢ㄦ偅鑰�*/
-    @Select("select * from lihu.dev_rent where state=#{state} and dev_id=#{devId} and to_days(#{stateDate})=to_days(update_time) limit 1")
-    DevRentDO selectByDevIdAndState(@Param("devId") String devId, @Param("state") Integer state, @Param("stateDate") LocalDate stateDate);
+    @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())")
+    List<DevRentDO> selectByPatAndChecktypeAndState(@Param("patId") String patId, @Param("checkType") Integer checkType, @Param("state") Integer state);
 
     @Select("<script>" +
             "SELECT paid FROM lihu.dev_rent " +

--
Gitblit v1.9.3