From 416558785276159b8730b2826e71995fc16b59a7 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 29 十月 2026 11:47:44 +0800
Subject: [PATCH] refactor(safety): 人员与车间字段全面改为主数据关联
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
index 08e53d1..3119ae0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
@@ -62,6 +62,7 @@
@PreAuthorize("@ss.hasPermission('safety:permit:query')")
public CommonResult<SafetyWorkPermitRespVO> get(@RequestParam("id") Long id) {
var permit = permitService.getPermit(id);
+ permitService.fillPermitRefs(java.util.List.of(permit));
var resp = BeanUtils.toBean(permit, SafetyWorkPermitRespVO.class);
SafetyWorkPermitService.fillPermitDisplay(permit, resp);
return success(resp);
@@ -72,6 +73,7 @@
@PreAuthorize("@ss.hasPermission('safety:permit:query')")
public CommonResult<PageResult<SafetyWorkPermitRespVO>> page(@Valid SafetyWorkPermitPageReqVO reqVO) {
var page = permitService.getPermitPage(reqVO);
+ permitService.fillPermitRefs(page.getList());
var result = BeanUtils.toBean(page, SafetyWorkPermitRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyWorkPermitService.fillPermitDisplay(page.getList().get(i), result.getList().get(i));
@@ -121,8 +123,9 @@
@Parameter(name = "permitId", description = "浣滀笟绁ㄧ紪鍙�", required = true)
@PreAuthorize("@ss.hasPermission('safety:permit:query')")
public CommonResult<List<SafetyWorkPermitMonitorRespVO>> monitorList(@RequestParam("permitId") Long permitId) {
- return success(BeanUtils.toBean(permitService.getMonitorList(permitId),
- SafetyWorkPermitMonitorRespVO.class));
+ var monitors = permitService.getMonitorList(permitId);
+ permitService.fillMonitorGuardians(monitors);
+ return success(BeanUtils.toBean(monitors, SafetyWorkPermitMonitorRespVO.class));
}
@PostMapping("/monitor/create")
--
Gitblit v1.9.3