From b2bed3491b1e7f66cc167974291aa25a40e5b7b4 Mon Sep 17 00:00:00 2001 From: FCL Date: Tue, 31 Mar 2026 16:34:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=9F=E9=97=B4=E6=A0=B8=E6=9F=A5?= =?UTF-8?q?=E3=80=81=E6=A3=80=E5=AE=9A=E6=A0=A1=E5=87=86=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/DeviceCalibrationController.java | 7 ++++++- .../controller/admin/DevicePeriodCheckController.java | 10 ++++++++-- .../device/controller/vo/DeviceCalibrationRespVO.java | 7 +++++++ .../controller/vo/DeviceCalibrationSaveReqVO.java | 4 ++++ .../device/controller/vo/DeviceCalibrationVO.java | 6 ++++++ .../device/controller/vo/DevicePeriodCheckRespVO.java | 7 +++++++ .../controller/vo/DevicePeriodCheckSaveReqVO.java | 4 ++++ .../device/controller/vo/DevicePeriodCheckVO.java | 7 +++++++ .../device/service/DeviceCalibrationServiceImpl.java | 4 ++++ .../device/service/DevicePeriodCheckServiceImpl.java | 4 ++++ 10 files changed, 57 insertions(+), 3 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java index 5d10a0e1..b82de67a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java @@ -3,6 +3,7 @@ package com.zt.plat.module.qms.resource.device.controller.admin; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zt.plat.module.qms.common.service.BusinessFileService; import com.zt.plat.module.qms.enums.QmsCommonConstant; import com.zt.plat.module.qms.resource.device.controller.vo.*; import com.zt.plat.module.qms.resource.device.service.DeviceCalibrationPlanService; @@ -59,6 +60,7 @@ public class DeviceCalibrationController extends AbstractFileUploadController im @Resource private DeviceCalibrationService deviceCalibrationService; @Resource private DeviceProductService deviceProductService; + @Resource private BusinessFileService businessFileService; @PostMapping("/create") @Operation(summary = "创建设备-检定校准") @@ -102,7 +104,9 @@ public class DeviceCalibrationController extends AbstractFileUploadController im @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getDeviceCalibration(@RequestParam("id") Long id) { DeviceCalibrationDO deviceCalibration = deviceCalibrationService.getDeviceCalibration(id); - return success(BeanUtils.toBean(deviceCalibration, DeviceCalibrationRespVO.class)); + DeviceCalibrationRespVO vo = BeanUtils.toBean(deviceCalibration, DeviceCalibrationRespVO.class); + vo.setBusinessFileRet(businessFileService.getBusinessFileList(id)); + return success(vo); } @GetMapping("/getVO") @@ -110,6 +114,7 @@ public class DeviceCalibrationController extends AbstractFileUploadController im @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getVO(@RequestParam("id") Long id) { DeviceCalibrationVO vo = deviceCalibrationService.getDeviceCalibrationVO(id); + vo.setBusinessFileRet(businessFileService.getBusinessFileList(id)); return success(vo); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java index f315d264..7f2b9c23 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java @@ -3,6 +3,7 @@ package com.zt.plat.module.qms.resource.device.controller.admin; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zt.plat.module.qms.common.service.BusinessFileService; import com.zt.plat.module.qms.enums.QmsCommonConstant; import com.zt.plat.module.qms.resource.device.common.DeviceConstant; import com.zt.plat.module.qms.resource.device.controller.vo.*; @@ -61,6 +62,7 @@ public class DevicePeriodCheckController extends AbstractFileUploadController im @Resource private DevicePeriodCheckService devicePeriodCheckService; @Resource private DeviceProductService deviceProductService; @Resource private MaterialProductService materialProductService; + @Resource private BusinessFileService businessFileService; @PostMapping("/create") @Operation(summary = "创建设备-期间核查") @@ -109,8 +111,10 @@ public class DevicePeriodCheckController extends AbstractFileUploadController im @Operation(summary = "获得设备-期间核查") @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getDevicePeriodCheck(@RequestParam("id") Long id) { - DevicePeriodCheckDO devicePeriodCheck = devicePeriodCheckService.getDevicePeriodCheck(id); - return success(BeanUtils.toBean(devicePeriodCheck, DevicePeriodCheckRespVO.class)); + DevicePeriodCheckDO entity = devicePeriodCheckService.getDevicePeriodCheck(id); + DevicePeriodCheckRespVO vo = BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class); + vo.setBusinessFileRet(businessFileService.getBusinessFileList(id)); + return success(vo); } @GetMapping("/getVoDevice") @@ -118,6 +122,7 @@ public class DevicePeriodCheckController extends AbstractFileUploadController im @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getVoDevice(@RequestParam("id") Long id) { DevicePeriodCheckVO vo = devicePeriodCheckService.getVoDevice(id); + vo.setBusinessFileRet(businessFileService.getBusinessFileList(id)); return success(vo); } @@ -126,6 +131,7 @@ public class DevicePeriodCheckController extends AbstractFileUploadController im @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getVoMaterial(@RequestParam("id") Long id) { DevicePeriodCheckVO vo = devicePeriodCheckService.getVoMaterial(id); + vo.setBusinessFileRet(businessFileService.getBusinessFileList(id)); return success(vo); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationRespVO.java index bfd22036..4f15a089 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationRespVO.java @@ -1,5 +1,8 @@ package com.zt.plat.module.qms.resource.device.controller.vo; +import com.alibaba.fastjson.JSONObject; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO; import com.zt.plat.module.qms.core.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -109,4 +112,8 @@ public class DeviceCalibrationRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + //============扩展字段============ + + @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/DeviceCalibrationSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationSaveReqVO.java index ce630493..0cbb286b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationSaveReqVO.java @@ -80,4 +80,8 @@ public class DeviceCalibrationSaveReqVO { @Schema(description = "备注") private String remark; + //=================扩展字段==================> + @Schema(description = "删除的文件id") + private List deleteFileIdList; + } \ 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/DeviceCalibrationVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationVO.java index a866fabc..51891e92 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationVO.java @@ -1,10 +1,13 @@ package com.zt.plat.module.qms.resource.device.controller.vo; import com.alibaba.fastjson.JSONObject; +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.Data; import java.time.LocalDateTime; +import java.util.List; /* * 检定校准响应对象 @@ -55,4 +58,7 @@ public class DeviceCalibrationVO extends DeviceCalibrationRespVO{ //============其他字段============ private JSONObject signatureData; + + @Schema(description = "附件对象") + private CommonResult> businessFileRet; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckRespVO.java index 6bd44eeb..da934533 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckRespVO.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.core.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -118,4 +120,9 @@ public class DevicePeriodCheckRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + //============扩展字段============ + + @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/DevicePeriodCheckSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckSaveReqVO.java index 37b5d93a..4b120a03 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckSaveReqVO.java @@ -86,4 +86,8 @@ public class DevicePeriodCheckSaveReqVO { @Schema(description = "备注") private String remark; + //=================扩展字段==================> + @Schema(description = "删除的文件id") + private List deleteFileIdList; + } \ 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/DevicePeriodCheckVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckVO.java index c2f52e5e..3dcbf611 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckVO.java @@ -1,9 +1,13 @@ package com.zt.plat.module.qms.resource.device.controller.vo; import com.alibaba.fastjson.JSONObject; +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.Data; import java.time.LocalDateTime; +import java.util.List; /* * 期间核查响应对象 @@ -58,4 +62,7 @@ public class DevicePeriodCheckVO extends DevicePeriodCheckRespVO{ //============其他字段============ private JSONObject signatureData; + @Schema(description = "附件对象") + private CommonResult> businessFileRet; + } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java index 0e2ad751..b611709a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java @@ -20,6 +20,7 @@ import com.zt.plat.module.qms.common.data.service.DataKeyCheckService; import com.zt.plat.module.qms.common.data.service.DataOpinionService; import com.zt.plat.module.qms.common.data.service.DataTemplateService; import com.zt.plat.module.qms.common.dic.service.DictionaryBusinessService; +import com.zt.plat.module.qms.common.service.BusinessFileService; import com.zt.plat.module.qms.enums.QmsBpmConstant; import com.zt.plat.module.qms.enums.QmsCommonConstant; import com.zt.plat.module.qms.resource.device.common.DeviceConstant; @@ -68,6 +69,7 @@ public class DeviceCalibrationServiceImpl implements DeviceCalibrationService, B @Resource private DataKeyCheckService dataKeyCheckService; @Resource private DataOpinionService dataOpinionService; @Resource private DataTemplateService dataTemplateService; + @Resource private BusinessFileService businessFileService; private final String wfDicKey = "DeviceCalibrationWfKey"; private final String formDicKey = "DeviceCalibrationFormKey"; @@ -241,12 +243,14 @@ public class DeviceCalibrationServiceImpl implements DeviceCalibrationService, B } @Override + @Transactional public DeviceCalibrationDO updateDeviceCalibration(DeviceCalibrationSaveReqVO updateReqVO) { // 校验存在 validateDeviceCalibrationExists(updateReqVO.getId()); // 更新 DeviceCalibrationDO updateObj = BeanUtils.toBean(updateReqVO, DeviceCalibrationDO.class); deviceCalibrationMapper.updateById(updateObj); + businessFileService.deleteBusinessFileList(updateReqVO.getDeleteFileIdList()); return updateObj; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java index 174695b3..2972b745 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java @@ -20,6 +20,7 @@ import com.zt.plat.module.qms.common.data.service.DataKeyCheckService; import com.zt.plat.module.qms.common.data.service.DataOpinionService; import com.zt.plat.module.qms.common.data.service.DataTemplateService; import com.zt.plat.module.qms.common.dic.service.DictionaryBusinessService; +import com.zt.plat.module.qms.common.service.BusinessFileService; import com.zt.plat.module.qms.enums.QmsBpmConstant; import com.zt.plat.module.qms.enums.QmsCommonConstant; import com.zt.plat.module.qms.resource.device.common.DeviceConstant; @@ -66,6 +67,7 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B @Resource private DataKeyCheckService dataKeyCheckService; @Resource private DataOpinionService dataOpinionService; @Resource private DataTemplateService dataTemplateService; + @Resource private BusinessFileService businessFileService; private final String wfDicKey = "DevicePeriodCheckWfKey"; private final String formDicKey = "DevicePeriodCheckFormfKey"; @@ -335,12 +337,14 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B } @Override + @Transactional(rollbackFor = Exception.class) public DevicePeriodCheckDO updateDevicePeriodCheck(DevicePeriodCheckSaveReqVO updateReqVO) { // 校验存在 validateDevicePeriodCheckExists(updateReqVO.getId()); // 更新 DevicePeriodCheckDO updateObj = BeanUtils.toBean(updateReqVO, DevicePeriodCheckDO.class); devicePeriodCheckMapper.updateById(updateObj); + businessFileService.deleteBusinessFileList(updateReqVO.getDeleteFileIdList()); return updateObj; }