From 35f70b350f298bbac8de18adf613990122004c4e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 12 六月 2026 11:23:13 +0800
Subject: [PATCH] 修改工资计算逻辑
---
src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
index e01d9d3..a5da266 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -142,10 +142,19 @@
public void exportStockOutRecord(HttpServletResponse response, StockOutRecordDto stockOutRecordDto) {
List<StockOutRecordExportData> list = stockOutRecordMapper.listStockOutRecordExportData(stockOutRecordDto);
for (StockOutRecordExportData stockInRecordExportData : list) {
- if (stockInRecordExportData.getType().equals("0")) {
- stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockOutQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
- }else {
- stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
+ if (StringUtils.isEmpty(stockInRecordExportData.getRecordType())) {
+ continue;
+ }
+ StockOutQualifiedRecordTypeEnum outRecordTypeEnum =
+ EnumUtil.fromCode(StockOutQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType()));
+ if (outRecordTypeEnum != null) {
+ stockInRecordExportData.setRecordType(outRecordTypeEnum.getValue());
+ continue;
+ }
+ StockInQualifiedRecordTypeEnum inRecordTypeEnum =
+ EnumUtil.fromCode(StockInQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType()));
+ if (inRecordTypeEnum != null) {
+ stockInRecordExportData.setRecordType(inRecordTypeEnum.getValue());
}
}
ExcelUtil<StockOutRecordExportData> util = new ExcelUtil<>(StockOutRecordExportData.class);
--
Gitblit v1.9.3