From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java
index 2b9269d..f905fce 100644
--- a/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java
@@ -5,11 +5,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.dto.smoker.InTimeCountDto;
import com.ycl.entity.smoke.OdsCustomer;
import com.ycl.entity.smoke.OdsInTime;
import com.ycl.mapper.smoke.OdsInTimeMapper;
import com.ycl.service.smoke.IOdsInTimeService;
import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
/**
* <p>
@@ -27,11 +32,40 @@
Page<OdsInTime> page = new Page<>(pageNum, pageSize);
QueryWrapper<OdsInTime> wrapper = new QueryWrapper<>();
LambdaQueryWrapper<OdsInTime> lambda = wrapper.lambda();
- if (StrUtil.isNotEmpty(keyword)) {
- lambda.like(OdsInTime::getName, keyword);
+ if (StrUtil.isNotEmpty(owner)) {
+ lambda.like(OdsInTime::getOwner, owner);
+ }
+ if (StrUtil.isNotEmpty(onlineStatus)) {
+ lambda.eq(OdsInTime::getOnlineStatus, onlineStatus);
+ }
+ if (StrUtil.isNotEmpty(startTime)) {
+ try {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date startdate = format.parse(startTime);
+ Long startTimestamp = startdate.getTime() / 1000;
+
+ Date enddate = format.parse(endTime);
+ Long endTimestamp = enddate.getTime() / 1000;
+
+ lambda.between(OdsInTime::getLastAt, startTimestamp, endTimestamp);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ if (StrUtil.isNotEmpty(type)) {
+ lambda.eq(OdsInTime::getTyp, type);
+ }
+ if (StrUtil.isNotEmpty(status)) {
+ lambda.eq(OdsInTime::getStatus, status);
}
+ wrapper.orderByDesc("id");
return this.page(page, wrapper);
}
+
+ @Override
+ public InTimeCountDto getInTimeCount() {
+ return baseMapper.getInTimeCount();
+ }
}
--
Gitblit v1.8.0