From 9efd8376cb0c444ce6f229b2544e68efa352f674 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 30 十月 2026 09:40:06 +0800
Subject: [PATCH] fix(mes): 工艺路线产品补齐报工入仓库/库区/库位，修复编辑不回显
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
index a259a17..9664231 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
@@ -62,6 +62,7 @@
@PreAuthorize("@ss.hasPermission('safety:training:query')")
public CommonResult<SafetyTrainingRespVO> get(@RequestParam("id") Long id) {
var training = trainingService.getTraining(id);
+ trainingService.fillTrainers(java.util.List.of(training));
var resp = BeanUtils.toBean(training, SafetyTrainingRespVO.class);
SafetyTrainingService.fillTrainingDisplay(training, resp);
return success(resp);
@@ -72,6 +73,7 @@
@PreAuthorize("@ss.hasPermission('safety:training:query')")
public CommonResult<PageResult<SafetyTrainingRespVO>> page(@Valid SafetyTrainingPageReqVO reqVO) {
var page = trainingService.getTrainingPage(reqVO);
+ trainingService.fillTrainers(page.getList());
var result = BeanUtils.toBean(page, SafetyTrainingRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyTrainingService.fillTrainingDisplay(page.getList().get(i), result.getList().get(i));
@@ -111,6 +113,7 @@
@PreAuthorize("@ss.hasPermission('safety:drill:query')")
public CommonResult<SafetyDrillRespVO> getDrill(@RequestParam("id") Long id) {
var drill = trainingService.getDrill(id);
+ trainingService.fillOrganizers(java.util.List.of(drill));
var resp = BeanUtils.toBean(drill, SafetyDrillRespVO.class);
SafetyTrainingService.fillDrillDisplay(drill, resp);
return success(resp);
@@ -121,6 +124,7 @@
@PreAuthorize("@ss.hasPermission('safety:drill:query')")
public CommonResult<PageResult<SafetyDrillRespVO>> drillPage(@Valid SafetyDrillPageReqVO reqVO) {
var page = trainingService.getDrillPage(reqVO);
+ trainingService.fillOrganizers(page.getList());
var result = BeanUtils.toBean(page, SafetyDrillRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyTrainingService.fillDrillDisplay(page.getList().get(i), result.getList().get(i));
@@ -160,6 +164,7 @@
@PreAuthorize("@ss.hasPermission('safety:accident:query')")
public CommonResult<SafetyAccidentRespVO> getAccident(@RequestParam("id") Long id) {
var accident = trainingService.getAccident(id);
+ trainingService.fillAccidentRefs(java.util.List.of(accident));
var resp = BeanUtils.toBean(accident, SafetyAccidentRespVO.class);
SafetyTrainingService.fillAccidentDisplay(accident, resp);
return success(resp);
@@ -171,6 +176,7 @@
public CommonResult<PageResult<SafetyAccidentRespVO>> accidentPage(
@Valid SafetyAccidentPageReqVO reqVO) {
var page = trainingService.getAccidentPage(reqVO);
+ trainingService.fillAccidentRefs(page.getList());
var result = BeanUtils.toBean(page, SafetyAccidentRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyTrainingService.fillAccidentDisplay(page.getList().get(i), result.getList().get(i));
--
Gitblit v1.9.3