From 62681d14e34466f4ed4eafaa2cef197c53e6fd82 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 26 二月 2025 14:07:05 +0800
Subject: [PATCH] 修改打印样式 修改报工界面查询条件 修改磨边获取出片线路条件 大理片非钢化出片添加宽度与数量限制
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index b42a3c0..47c2999 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -60,6 +60,9 @@
@Override
public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) {
LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
+ if (endTime != null && !endTime.isEmpty()) {
+ endTime = endTime + " 23:59:59";
+ }
damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime);
damageSelectWrapper.ne(Damage::getStatus, 7);
if (type != 0) {
@@ -70,10 +73,6 @@
}
if (!"0".equals(workingProcedure)) {
damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
- }
- List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
- for (Damage damage : damageList) {
- damage.setStatus(3);
}
return baseMapper.selectList(damageSelectWrapper);
}
--
Gitblit v1.8.0