文件记录分类明细-删除-文件上传

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java

@@ -1,6 +1,8 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord;
 
 import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+import com.zt.plat.module.qms.common.service.BusinessFileService;
+import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementRespVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordPageReqVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordRespVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordSaveReqVO;
@@ -41,7 +43,7 @@ import com.zt.plat.module.qms.resource.record.service.recordrecord.RecordRecordS
 @RequestMapping("/qms/resource/record-record")
 @Validated
 @DeptDataPermissionIgnore(enable = "true")
-@FileUploadController(source = "qms.recordrecord")
+@FileUploadController(source = "qms.recordrecord", codeKey = "data.fileUploadBusinessCode")
 public class RecordRecordController extends AbstractFileUploadController implements BusinessControllerMarker{
 
     static {
@@ -53,6 +55,8 @@ public class RecordRecordController extends AbstractFileUploadController impleme
 
     @Resource
     private RecordRecordService recordRecordService;
+    @Resource
+    private BusinessFileService businessFileService;
 
 //    @GetMapping("/getRecordListByCategoryId")
 //    @Operation(summary = "根据文件分类ID获取分类明细记录")
@@ -73,9 +77,9 @@ public class RecordRecordController extends AbstractFileUploadController impleme
     @PutMapping("/update")
     @Operation(summary = "更新文件、模板、记录")
     //@PreAuthorize("@ss.hasPermission('qms:record-record:update')")
-    public CommonResult<Boolean> updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) {
+    public CommonResult<RecordRecordSaveReqVO> updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) {
         recordRecordService.updateRecordRecord(updateReqVO);
-        return success(true);
+        return success(BeanUtils.toBean(updateReqVO, RecordRecordSaveReqVO.class));
     }
 
     @DeleteMapping("/delete")
@@ -102,7 +106,9 @@ public class RecordRecordController extends AbstractFileUploadController impleme
     //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
     public CommonResult<RecordRecordRespVO> getRecordRecord(@RequestParam("id") Long id) {
         RecordRecordDO recordRecord = recordRecordService.getRecordRecord(id);
-        return success(BeanUtils.toBean(recordRecord, RecordRecordRespVO.class));
+        RecordRecordRespVO vo = BeanUtils.toBean(recordRecord, RecordRecordRespVO.class);
+        vo.setBusinessFileRet(businessFileService.getBusinessFileList(id));
+        return success(vo);
     }
 
     @GetMapping("/page")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/vo/RecordRecordRespVO.java

@@ -1,5 +1,7 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.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.*;
@@ -122,4 +124,12 @@ public class RecordRecordRespVO {
     @ExcelProperty("文件分类名称")
     private String categoryName;
 
+    @Schema(description = "附件上传code")
+    @ExcelProperty("附件上传code")
+    private String fileUploadBusinessCode = "qms_resource_version_manage";
+
+    //    ===================扩展字段=========================
+    @Schema(description = "附件对象")
+    private CommonResult<List<BusinessFileWithUrlRespDTO>> businessFileRet;
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/vo/RecordRecordSaveReqVO.java

@@ -1,16 +1,13 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.zt.plat.module.qms.core.aspect.annotation.Dict;
+import com.zt.plat.module.qms.resource.clientManage.controller.vo.UploadFileVo;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.util.*;
-
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 文件、模板、记录新增/修改 Request VO")
 @Data
@@ -96,4 +93,10 @@ public class RecordRecordSaveReqVO {
     //    =================临时字段==================>
     @Schema(description = "是否新版本")
     private String newVersion;
+
+    @Schema(description = "上传文件列表")
+    private List<UploadFileVo> files;
+
+    @Schema(description = "删除的文件id")
+    private List<Long> deleteFileIdList;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dao/recordrecord/RecordRecordMapper.java

@@ -37,6 +37,7 @@ public interface RecordRecordMapper extends BaseMapperX<RecordRecordDO> {
                 .eqIfPresent(RecordRecordDO::getSourceUrl, reqVO.getSourceUrl())
                 .eqIfPresent(RecordRecordDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .eqIfPresent(RecordRecordDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(RecordRecordDO::getMainId, reqVO.getMainId())
                 .betweenIfPresent(RecordRecordDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(RecordRecordDO::getId));
     }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java

@@ -72,7 +72,10 @@ public class RecordCategoryServiceImpl implements RecordCategoryService {
     public void updateRecordCategory(RecordCategorySaveReqVO updateReqVO) {
         // 校验存在
         validateRecordCategoryExists(updateReqVO.getId());
-        
+
+        Long parentId1 = updateReqVO.getParentId();
+        if (parentId1 == null || parentId1 == 0L) throw exception(RECORD_CATEGORY_NOT_EXISTS);
+
         // 获取更新前的旧数据
         RecordCategoryDO oldObj = recordCategoryMapper.selectById(updateReqVO.getId());
         String oldIdPath = oldObj.getIdPath();