From 422a5676c2d96dd37c1be62935a314d70fef79b5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 15 七月 2026 15:28:04 +0800
Subject: [PATCH] 修改不合格管理
---
src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java
index 50fa2d4..2b6cb27 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java
@@ -34,6 +34,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeParseException;
+import java.util.Arrays;
import java.util.List;
@Service
@@ -63,9 +64,6 @@
if (queryDto.getAuditStatus() == null) {
queryDto.setAuditStatus(1);
}
- if (queryDto.getReportType() == null) {
- queryDto.setReportType(0);
- }
return productionProductMainMapper.listProductionDetails(queryDto, page);
}
@@ -75,7 +73,7 @@
ProductionAccountDto queryDto = normalizeDateQuery(dto);
LambdaQueryWrapper<ProductionProductMain> queryWrapper = Wrappers.<ProductionProductMain>lambdaQuery()
.eq(ProductionProductMain::getAuditStatus, 1)
- .eq(ProductionProductMain::getReportType, 0);
+ .in(ProductionProductMain::getReportType, Arrays.asList(0, 1));
if (queryDto.getSchedulingUserId() != null) {
queryWrapper.eq(ProductionProductMain::getUserId, queryDto.getSchedulingUserId());
}
@@ -148,7 +146,9 @@
productionAccountDelete(productionProductMainId);
return Boolean.FALSE;
}
- if (productionProductMain.getReportType() == null || productionProductMain.getReportType() != 0) {
+ if (productionProductMain.getReportType() == null
+ || (!Integer.valueOf(0).equals(productionProductMain.getReportType())
+ && !Integer.valueOf(1).equals(productionProductMain.getReportType()))) {
productionAccountDelete(productionProductMainId);
return Boolean.FALSE;
}
--
Gitblit v1.9.3