From 0fa6e83433215c7416f953536bb78bc188034c9a Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 27 九月 2024 11:10:28 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java | 11 ++++++-----
jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml | 3 ++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
index 1c439bb..17b5515 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
@@ -80,11 +80,12 @@
PageResult<JobRecordDO> pageResult = jobRecordMapper.selectPage(pageReqVO);
List<JobRecordDO> jobRecordDOList = pageResult.getList();
- List<Long> rentIdList = jobRecordDOList.stream().map(item -> item.getRentId()).toList();
- List<Integer> paidInfoList = devRentMapper.getPaidInfo( rentIdList );
-
- for (int i = 0; i < jobRecordDOList.size(); i++) {
- jobRecordDOList.get(i).setPaid(paidInfoList.get(i));
+ if ( !jobRecordDOList.isEmpty() ) {
+ List<Long> rentIdList = jobRecordDOList.stream().map(item -> item.getRentId()).toList();
+ List<Integer> paidInfoList = devRentMapper.getPaidInfo(rentIdList);
+ for (int i = 0; i < jobRecordDOList.size(); i++) {
+ jobRecordDOList.get(i).setPaid(paidInfoList.get(i));
+ }
}
return pageResult;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml b/jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml
index 96b122b..c0a35b5 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml
@@ -24,8 +24,9 @@
<if test="patId != null and patId != ''">
and pat_id = #{patId}
</if>
+ and TO_DAYS(create_time) = TO_DAYS(NOW())
</where>
limit 1
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3