From 08d830533739a4e0755e2dee3b259ed760973db0 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 30 十月 2023 12:17:35 +0800
Subject: [PATCH] 12873456
---
zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java | 9 +++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java | 3 +++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java b/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
index 82ed391..bafe54e 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
@@ -1,5 +1,6 @@
package com.ruoyi.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -45,6 +46,14 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date happenDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date happenStartTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date happenEndTime;
+
/**
* 琛岀▼鍦扮偣
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java
index 3bf0e77..bc7e65a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.domain.TravelCount;
import com.ruoyi.domain.TravelDetail;
+import com.ruoyi.domain.ZfCollection;
import com.ruoyi.mapper.TravelDetailMapper;
import com.ruoyi.service.TravelDetailService;
import org.springframework.stereotype.Service;
@@ -32,6 +34,7 @@
lqw.like(travelDetail.getTravelMode()!=null,TravelDetail::getTravelMode,travelDetail.getTravelMode());
lqw.like(travelDetail.getFlight()!=null,TravelDetail::getFlight,travelDetail.getFlight());
lqw.like(travelDetail.getDocument()!=null,TravelDetail::getDocument,travelDetail.getDocument());
+ lqw.between(travelDetail.getHappenStartTime() != null && travelDetail.getHappenEndTime() != null, TravelDetail::getHappenDate, travelDetail.getHappenStartTime(), travelDetail.getHappenEndTime());
}
lqw.orderBy(true,true,TravelDetail::getHappenDate);
--
Gitblit v1.9.1