From d40cde3bca854c21c869cb35d25ece4aa7dac265 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 10 四月 2025 16:43:34 +0800
Subject: [PATCH] 检查记录 排除 未检查的记录
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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..dc3b776 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,17 +1,13 @@
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 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
@@ -23,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())
@@ -36,14 +33,35 @@
.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>")
+ @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 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 " +
@@ -54,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