Merge remote-tracking branch 'origin/test' into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/constant/RecordConstants.java

@@ -26,7 +26,7 @@ public class RecordConstants {
      */
     public static class PermissionType {
         /** key */
-        public static final String PERMISSION_KEY = "file_record_permission type";
+        public static final String PERMISSION_KEY = "file_record_permission_type";
         /** 管理员 */
         public static final String ADMIN = "管理员";
         /** 查看 */
@@ -47,19 +47,19 @@ public class RecordConstants {
         /**
          * 分发
          */
-        public static final String DISTRIBUTION = "分发";
+        public static final String DISTRIBUTION = "文件分发";
         /**
          * 查看申请
          */
-        public static final String VIEW_APPLY = "查看申请";
+        public static final String VIEW_APPLY = "文件查看申请";
         /**
          * 作废
          */
-        public static final String INVALID = "作废";
+        public static final String INVALID = "文件作废";
         /**
          * 评审
          */
-        public static final String REVIEW = "评审";
+        public static final String REVIEW = "文件评审";
         /**
          * 文件提交
          * */
@@ -67,36 +67,36 @@ public class RecordConstants {
         /**
          * 文件提交
          * */
-        public static final String RECORD_UPDATE = "文件修改";
+        public static final String RECORD_UPDATE = "文件修改申请";
     }
 
     /**
-     * 流程定义key常量
+     * 流程定义key常量  ${qmsExecutionListener}
      */
     public static class ProcessDefinitionKey{
         /**
          * 分发
          */
-        public static final String DISTRIBUTION__DEFINITION_KEY = "分发";
+        public static final String DISTRIBUTION__DEFINITION_KEY = "QMS_RECORD_DISTRIBUTION";
         /**
          * 查看申请
          */
-        public static final String VIEW_APPLY_DEFINITION_KEY = "查看申请";
+        public static final String VIEW_APPLY_DEFINITION_KEY = "QMS_RECORD_APPLY";
         /**
          * 作废
          */
-        public static final String INVALID_DEFINITION_KEY = "作废";
+        public static final String INVALID_DEFINITION_KEY = "QMS_RECORD_INVALID";
         /**
          * 评审
          */
-        public static final String REVIEW_DEFINITION_KEY = "评审";
+        public static final String REVIEW_DEFINITION_KEY = "QMS_RECORD_REVIEW";
         /**
          * 文件提交
          */
-        public static final String RECORD_SUBMIT_DEFINITION_KEY = "QMS_RECORD_REPAIR";
+        public static final String RECORD_SUBMIT_DEFINITION_KEY = "QMS_RECORD_SUBMIT";
         /**
-         * 文件提交
+         * 文件修改
          * */
-        public static final String RECORD_UPDATE_DEFINITION_KEY = "文件修改";
+        public static final String RECORD_UPDATE_DEFINITION_KEY = "QMS_RECORD_UPDATE";
     }
 }

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -40,6 +41,9 @@ public class RecordApplyPageReqVO extends PageParam {
     @Schema(description = "参加评审人员id")
     private String reviewUserIds;
 
+    @Schema(description = "表单数据")
+    private String formData;
+
     @Schema(description = "申请事由")
     private String applyContent;
 

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

@@ -54,6 +54,10 @@ public class RecordApplyRespVO {
     @ExcelProperty("参加评审人员id")
     private String reviewUserIds;
 
+    @Schema(description = "表单数据")
+    @ExcelProperty("表单数据")
+    private String formData;
+
     @Schema(description = "申请事由")
     @ExcelProperty("申请事由")
     private String applyContent;
@@ -105,7 +109,16 @@ public class RecordApplyRespVO {
     @Schema(description = "是否需要申请")
     private Boolean needApply;
 
-    @Schema(description = "流程类型")
+    @Schema(description = "文件记录ID")
     private Long recordId;
 
+    @Schema(description = "文件记录IDS")
+    private Long[] recordIdS;
+
+    @Schema(description = "用户IDs")
+    private Long[] userIds;
+
+    @Schema(description = "用户IDs")
+    private Long[] deptIds;
+
 }

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

@@ -48,6 +48,9 @@ public class RecordApplySaveReqVO {
     @Schema(description = "参加评审人员id")
     private String reviewUserIds;
 
+    @Schema(description = "表单数据")
+    private String formData;
+
     @Schema(description = "申请事由")
     private String applyContent;
 

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

@@ -1,5 +1,7 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,6 +21,12 @@ public class RecordApplyDetailPageReqVO extends PageParam {
     @Schema(description = "文件id", example = "3188")
     private Long documentId;
 
+    @Schema(description = "授权类型")
+    private String TargetType;
+
+    @Schema(description = "授权Id")
+    private Long targetId;
+
     @Schema(description = "是否长期有效")
     private String permanently;
 

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

@@ -20,10 +20,18 @@ public class RecordApplyDetailRespVO {
     @ExcelProperty("父id")
     private Long applyId;
 
+    @Schema(description = "授权类型")
+    @ExcelProperty("授权类型")
+    private String TargetType;
+
     @Schema(description = "文件id", example = "3188")
     @ExcelProperty("文件id")
     private Long documentId;
 
+    @Schema(description = "授权Id")
+    @ExcelProperty("授权Id")
+    private Long targetId;
+
     @Schema(description = "是否长期有效")
     @ExcelProperty("是否长期有效")
     private String permanently;

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

@@ -17,9 +17,15 @@ public class RecordApplyDetailSaveReqVO {
     @Schema(description = "父id", example = "28812")
     private Long applyId;
 
+    @Schema(description = "授权类型")
+    private String TargetType;
+
     @Schema(description = "文件id", example = "3188")
     private Long documentId;
 
+    @Schema(description = "授权Id")
+    private Long targetId;
+
     @Schema(description = "是否长期有效")
     private String permanently;
 

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

@@ -63,14 +63,6 @@ public class RecordRecordController extends AbstractFileUploadController impleme
     @Resource
     private BusinessFileService businessFileService;
 
-//    @GetMapping("/getRecordListByCategoryId")
-//    @Operation(summary = "根据文件分类ID获取分类明细记录")
-//    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-//    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
-//    public CommonResult<PageResult<RecordRecordRespVO>> getRecordListByCategoryId(@RequestParam("id") Long categoryId) {
-//        PageResult<RecordRecordDO> recordRecordListByCategoryId = recordRecordService.getRecordListByCategoryId(categoryId);
-//        return success(BeanUtils.toBean(recordRecordListByCategoryId, RecordRecordRespVO.class));
-//    }
 
     @PostMapping("/create")
     @Operation(summary = "创建文件、模板、记录->分类明细")
@@ -105,12 +97,6 @@ public class RecordRecordController extends AbstractFileUploadController impleme
         return success(true);
     }
 
-//    @PostMapping("/submitRecordApply")
-//    @Operation(summary = "提交流程申请")
-//    public CommonResult<RecordRecordRespVO> submitRecordApply(@RequestBody RecordRecordSaveReqVO param) {
-//        return recordRecordService.submitRecordApply(param);
-//    }
-
 
     @GetMapping("/get")
     @Operation(summary = "获得文件、模板、记录")

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

@@ -23,11 +23,11 @@ public class RecordRecordPageReqVO extends PageParam {
     @Schema(description = "业务类型")
     private String businessType;
 
-    @Schema(description = "部门IDS")
+//    @Schema(description = "部门IDS")
-    private String departmentIds;
+//    private String departmentIds;
-
+//
-    @Schema(description = "用户IDS")
+//    @Schema(description = "用户IDS")
-    private String userIds;
+//    private String userIds;
 
     @Schema(description = "表单key")
     private String formKey;

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

@@ -38,13 +38,13 @@ public class RecordRecordRespVO {
     @ExcelProperty("业务类型")
     private String businessType;
 
-    @Schema(description = "部门IDS")
+//    @Schema(description = "部门IDS")
-    @ExcelProperty("部门IDS")
+//    @ExcelProperty("部门IDS")
-    private String departmentIds;
+//    private String departmentIds;
-
+//
-    @Schema(description = "用户IDS")
+//    @Schema(description = "用户IDS")
-    @ExcelProperty("用户IDS")
+//    @ExcelProperty("用户IDS")
-    private String userIds;
+//    private String userIds;
 
     @Schema(description = "表单key")
     @ExcelProperty("表单key")