From 3c9fc40e620ce844c28416a9e195a786034d164f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 21 十月 2025 10:16:19 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java | 1 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
index 3f3b286..2ffae90 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
@@ -120,6 +120,7 @@
tErpMaintenanceReminder.setClinicSupplierId(reminder.getClinicSupplierId());
tErpMaintenanceReminder.setMaintenanceType(reminder.getMaintenanceType());
tErpMaintenanceReminder.setWarehousingBatchId(warehousingBatchId);
+ tErpMaintenanceReminder.setMaintenancePersonId(user.getUserId().intValue());
erpMaintenanceReminderService.save(tErpMaintenanceReminder);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
index 00bf92e..4517683 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
@@ -411,6 +411,14 @@
tErpGoodsUnits.stream().filter(t -> t.getId().equals(tErpGoods.getPackingUnitId())).findFirst().ifPresent(t -> tErpGoods.setPackingUnitName(t.getUnitName()));
}
}
+
+ List<String> typeIds = records.stream().map(TErpGoods::getTypeId).collect(Collectors.toList());
+ if(!typeIds.isEmpty()){
+ List<TErpGoodsType> tErpGoodsTypes = erpGoodsTypeMapper.selectBatchIds(typeIds);
+ for (TErpGoods tErpGoods : records) {
+ tErpGoodsTypes.stream().filter(t -> t.getId().equals(tErpGoods.getTypeId())).findFirst().ifPresent(t -> tErpGoods.setTypeName(t.getTypeName()));
+ }
+ }
page.setRecords( records);
return page;
}
--
Gitblit v1.7.1