From 687a49f9be36259f768bbd5344e940935782c200 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 三月 2025 10:36:08 +0800
Subject: [PATCH] 提交完工事添加破损数据非空判断，修改玻璃类型为膜系
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
index 52f4d28..190b25c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.config.Const;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
@@ -37,7 +38,23 @@
RawGlassStorageDetailsService rawGlassStorageDetailsService;
@Override
- public List<RawGlassStorageTask> queryRawGlassHistoryTask(RawGlassTaskRequest request) {
+ public Page<RawGlassStorageTask> queryRawGlassHistoryTask(RawGlassTaskRequest request) {
+ if (request.getBeginDate() == null) {
+ //璁剧疆榛樿鏃堕棿 startDate锛氬紑濮嬫椂闂� endDate锛氱粨鏉熸椂闂�
+ request.setBeginDate(DateUtil.getBeginDate());
+ request.setEndDate(DateUtil.getEndDate());
+ }
+ Page<RawGlassStorageTask> page = new Page<>(request.getPageNo(), request.getPageSize());
+ return page(page, new LambdaQueryWrapper<RawGlassStorageTask>()
+ .between(RawGlassStorageTask::getCreateTime, request.getBeginDate(), request.getEndDate())
+ .in(CollectionUtil.isNotEmpty(request.getTaskState()), RawGlassStorageTask::getTaskState, request.getTaskState())
+ .in(CollectionUtil.isNotEmpty(request.getTaskType()), RawGlassStorageTask::getTaskType, request.getTaskType())
+ .orderByDesc(RawGlassStorageTask::getCreateTime));
+ }
+
+ @Override
+ public List<RawGlassStorageTask> listRawGlassTask() {
+ RawGlassTaskRequest request = redisUtil.getCacheObject("rawGlassTaskRequest");
if (null == request) {
request = new RawGlassTaskRequest();
}
@@ -51,12 +68,6 @@
.in(CollectionUtil.isNotEmpty(request.getTaskState()), RawGlassStorageTask::getTaskState, request.getTaskState())
.in(CollectionUtil.isNotEmpty(request.getTaskType()), RawGlassStorageTask::getTaskType, request.getTaskType())
.orderByDesc(RawGlassStorageTask::getCreateTime));
- }
-
- @Override
- public List<RawGlassStorageTask> listRawGlassTask() {
- RawGlassTaskRequest request = redisUtil.getCacheObject("rawGlassTaskRequest");
- return queryRawGlassHistoryTask(request);
}
--
Gitblit v1.8.0