From 3e17b898ed5c4a62fbad777f39c3f89953345ff2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 29 七月 2026 16:38:42 +0800
Subject: [PATCH] 修改工资计算
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 63069a7..b6230aa 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -811,13 +811,14 @@
&& productionProductMain.getAuditStatus() != null
&& productionProductMain.getAuditStatus() == 1
&& productionProductMain.getReportType() != null
- && productionProductMain.getReportType() == 0;
+ && (productionProductMain.getReportType() == 0 || productionProductMain.getReportType() == 1);
}
private boolean isExcludedFromWage(ProductionProductMain productionProductMain) {
return productionProductMain != null
&& productionProductMain.getReportType() != null
- && productionProductMain.getReportType() != 0;
+ && productionProductMain.getReportType() != 0
+ && productionProductMain.getReportType() != 1;
}
@Override
--
Gitblit v1.9.3