文件记录分类-添加管理员-自定义配置

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

@@ -26,7 +26,10 @@ public class RecordApplyPageReqVO extends PageParam {
     private String applyUserName;
 
     @Schema(description = "部门id")
-    private Long departmentCode;
+    private Long departmentId;
+
+    @Schema(description = "部门名称", example = "研发部")
+    private String departmentName;
 
     @Schema(description = "评审范围")
     private String reviewRange;

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

@@ -34,7 +34,11 @@ public class RecordApplyRespVO {
 
     @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("部门id")
-    private Long departmentCode;
+    private Long departmentId;
+
+    @Schema(description = "部门名称", example = "研发部")
+    @ExcelProperty("部门名称")
+    private String departmentName;
 
     @Schema(description = "评审范围")
     @ExcelProperty("评审范围")

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -32,7 +33,11 @@ public class RecordApplySaveReqVO {
 
     @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "部门id不能为空")
-    private Long departmentCode;
+    private Long departmentId;
+
+    @Schema(description = "部门名称", example = "研发部")
+    @ExcelProperty("部门名称")
+    private String departmentName;
 
     @Schema(description = "评审范围")
     private String reviewRange;

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

@@ -6,6 +6,7 @@ import com.zt.plat.module.qms.resource.record.controller.admin.recordcategory.vo
 import com.zt.plat.module.qms.resource.record.controller.admin.recordcategory.vo.RecordCategorySaveReqVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -62,8 +63,8 @@ public class RecordCategoryController extends AbstractFileUploadController imple
     @Operation(summary = "创建文件记录分类")
     //@PreAuthorize("@ss.hasPermission('qms:record-category:create')")
     public CommonResult<RecordCategoryRespVO> createRecordCategory(@Valid @RequestBody RecordCategorySaveReqVO createReqVO) {
-        createReqVO.setParentId(0L);
+        if (ObjectUtils.isEmpty(createReqVO.getParentId()))createReqVO.setParentId(0L);
-        createReqVO.setSortNo(1);
+        if (ObjectUtils.isEmpty(createReqVO.getSortNo()))createReqVO.setSortNo(1);
         return success(recordCategoryService.createRecordCategory(createReqVO));
     }
 

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

@@ -3,9 +3,12 @@ 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.recordpermission.vo.RecordPermissionPageReqVO;
+import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionRespVO;
 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;
+import com.zt.plat.module.qms.resource.record.dal.dataobject.recordpermission.RecordPermissionDO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -133,6 +136,16 @@ public class RecordRecordController extends AbstractFileUploadController impleme
         return success(BeanUtils.toBean(pageResult, RecordRecordRespVO.class));
     }
 
+    @GetMapping("/getMatchedPermissionList")
+    @Operation(summary = "获得记录权限列表")
+    //@PreAuthorize("@ss.hasPermission('qms:record-permission:query')")
+    public CommonResult<List<RecordPermissionRespVO>> getMatchedPermissionList(@Valid RecordPermissionPageReqVO pageReqVO) {
+        Long sourceId = pageReqVO.getSourceId();
+        if (sourceId == null) return success(null);
+        List<RecordPermissionDO> matchedPermissionList = recordRecordService.getMatchedPermissionList(sourceId);
+        return success(BeanUtils.toBean(matchedPermissionList, RecordPermissionRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出文件、模板、记录 Excel")
     //@PreAuthorize("@ss.hasPermission('qms:record-record:export')")

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,6 +20,15 @@ public class RecordRecordPageReqVO extends PageParam {
     @Schema(description = "文件编号")
     private String code;
 
+    @Schema(description = "业务类型")
+    private String businessType;
+
+    @Schema(description = "部门IDS")
+    private String departmentIds;
+
+    @Schema(description = "用户IDS")
+    private String userIds;
+
     @Schema(description = "表单key")
     private String formKey;
 
@@ -54,6 +64,10 @@ public class RecordRecordPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] expirationDate;
 
+    @Schema(description = "生效日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] effectiveDate;
+
     @Schema(description = "过期标识,0-有效，1-过期", example = "1")
     private Integer expirationStatus;
 

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,6 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 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;
@@ -14,6 +15,8 @@ import java.time.LocalDateTime;
 
 import com.alibaba.excel.annotation.*;
 
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Schema(description = "管理后台 - 文件、模板、记录 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -31,6 +34,18 @@ public class RecordRecordRespVO {
     @ExcelProperty("文件编号")
     private String code;
 
+    @Schema(description = "业务类型")
+    @ExcelProperty("业务类型")
+    private String businessType;
+
+    @Schema(description = "部门IDS")
+    @ExcelProperty("部门IDS")
+    private String departmentIds;
+
+    @Schema(description = "用户IDS")
+    @ExcelProperty("用户IDS")
+    private String userIds;
+
     @Schema(description = "表单key")
     @ExcelProperty("表单key")
     private String formKey;
@@ -78,6 +93,10 @@ public class RecordRecordRespVO {
     @ExcelProperty("过期日期")
     private LocalDateTime expirationDate;
 
+    @Schema(description = "生效日期")
+    @ExcelProperty("生效日期")
+    private LocalDateTime effectiveDate;
+
     @Schema(description = "过期标识,0-有效，1-过期", example = "1")
     @ExcelProperty("过期标识,0-有效，1-过期")
     @Dict(dicCode = "yes_or_no")
@@ -132,4 +151,11 @@ public class RecordRecordRespVO {
     @Schema(description = "附件对象")
     private CommonResult<List<BusinessFileWithUrlRespDTO>> businessFileRet;
 
+    /**
+     * 所属分类的自定义配置（由 RecordCategoryDO.customConfig 解析而来）
+     */
+    @Schema(description = "所属分类的自定义配置")
+    private Object customConfig;
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.zt.plat.module.qms.resource.clientManage.controller.vo.UploadFileVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
@@ -24,6 +25,15 @@ public class RecordRecordSaveReqVO {
     @NotEmpty(message = "文件编号不能为空")
     private String code;
 
+    @Schema(description = "业务类型")
+    private String businessType;
+
+    @Schema(description = "部门IDS")
+    private String departmentIds;
+
+    @Schema(description = "用户IDS")
+    private String userIds;
+
     @Schema(description = "表单key")
     private String formKey;
 
@@ -60,6 +70,9 @@ public class RecordRecordSaveReqVO {
     @Schema(description = "过期日期")
     private LocalDateTime expirationDate;
 
+    @Schema(description = "生效日期")
+    private LocalDateTime effectiveDate;
+
     @Schema(description = "过期标识,0-有效，1-过期", example = "1")
     private Integer expirationStatus;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java

@@ -56,8 +56,13 @@ public class RecordApplyDO extends BusinessBaseDO {
     /**
     * 部门id
     */
-    @TableField("DEPT_CD")
+    @TableField("APL_DEPT_ID")
-    private Long departmentCode;
+    private Long applyDepartmentCode;
+    /**
+     * 部门名称
+     */
+    @TableField("APL_DEPT_NAME")
+    private Long applyDepartmentName;
     /**
     * 评审范围
     */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordcategory/RecordCategoryDO.java

@@ -70,7 +70,7 @@ public class RecordCategoryDO extends BusinessBaseDO {
     * 自定义配置
     */
     @TableField("CST_CFG")
-    private Integer customConfig;
+    private String customConfig;
     /**
     * 数据来源,手工录入、手工归档、自动采集
     */