From 343d897f00966d40f7eaa1cdfd257f63abd2996a Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 12 十一月 2024 11:33:27 +0800
Subject: [PATCH] dev_rent 表 job_record表 新增检查类型字段
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java | 25 +++++++++++++++++++++----
1 files changed, 21 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 fa98d89..8f52ba8 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,7 +6,6 @@
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;
@@ -35,11 +34,29 @@
.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> " +
+ "</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}")
- List<DevRentDO> selectByPatIdAndState(@Param("patId") String patId, @Param("state") Integer state);
-
+ @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