From de91c1d1642b4616675e03310614f14f24f8aa24 Mon Sep 17 00:00:00 2001 From: FCL Date: Fri, 13 Mar 2026 15:27:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=B4=E6=8A=A4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/DeviceMaintainController.java | 11 +++++++++-- .../device/controller/vo/DeviceMaintainRespVO.java | 5 ++++- .../device/controller/vo/DeviceMaintainVO.java | 5 ++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java index 01d59372..bd0922c7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java @@ -1,6 +1,7 @@ package com.zt.plat.module.qms.resource.device.controller.admin; import com.alibaba.fastjson.JSONObject; +import com.zt.plat.module.qms.common.service.BusinessFileService; import com.zt.plat.module.qms.resource.device.controller.vo.*; import com.zt.plat.module.qms.resource.device.service.DeviceInfomationService; import org.springframework.util.ObjectUtils; @@ -59,6 +60,7 @@ public class DeviceMaintainController extends AbstractFileUploadController imple @Resource private DeviceMaintainService deviceMaintainService; @Resource private DeviceInfomationService deviceInfomationService; + @Resource private BusinessFileService businessFileService; @PostMapping("/saveMaintainVo") @Operation(summary = "创建或获取维护数据") @@ -95,7 +97,10 @@ public class DeviceMaintainController extends AbstractFileUploadController imple @Operation(summary = "查询维护记录详情") @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getMaintainDetail(@RequestParam("id") Long id) { - return deviceMaintainService.getMaintainDetail(id); + CommonResult ret = deviceMaintainService.getMaintainDetail(id); + DeviceMaintainVO vo = ret.getData(); + vo.setBusinessFileRet(businessFileService.getBusinessFileList(id)); + return CommonResult.success(vo); } @GetMapping("/queryPageListWithCount") @@ -158,7 +163,9 @@ public class DeviceMaintainController extends AbstractFileUploadController imple @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getDeviceMaintain(@RequestParam("id") Long id) { DeviceMaintainDO deviceMaintain = deviceMaintainService.getDeviceMaintain(id); - return success(BeanUtils.toBean(deviceMaintain, DeviceMaintainRespVO.class)); + DeviceMaintainRespVO vo = BeanUtils.toBean(deviceMaintain, DeviceMaintainRespVO.class); + vo.setBusinessFileRet(businessFileService.getBusinessFileList(id)); + return success(vo); } @GetMapping("/page") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainRespVO.java index a69221ac..94369f61 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainRespVO.java @@ -1,5 +1,7 @@ package com.zt.plat.module.qms.resource.device.controller.vo; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -82,7 +84,8 @@ public class DeviceMaintainRespVO { //=====================================扩展字段=============================================== - + @Schema(description = "附件对象") + private CommonResult> businessFileRet; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainVO.java index da5745f4..f4e420b5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainVO.java @@ -1,5 +1,7 @@ package com.zt.plat.module.qms.resource.device.controller.vo; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceMaintainDO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceMaintainItemDO; import io.swagger.v3.oas.annotations.media.Schema; @@ -64,5 +66,6 @@ public class DeviceMaintainVO extends DeviceMaintainRespVO { private String maintainContent; //============其他字段============ - + @Schema(description = "附件对象") + private CommonResult> businessFileRet; }