优化流程问题

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

@@ -11,10 +11,7 @@ import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
-import com.zt.plat.framework.security.core.LoginUser;
-import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
 import com.zt.plat.module.qms.common.service.BusinessFileService;
-import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyJoinPageVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyPageReqVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyRespVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplySaveReqVO;

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

@@ -4,10 +4,13 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import lombok.*;
+
 import java.util.*;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -44,8 +47,8 @@ public class RecordApplyPageReqVO extends PageParam {
     @Schema(description = "评审范围")
     private String reviewRange;
 
-//    @Schema(description = "分发目标")
+    @Schema(description = "修改标识")
-//    private String assignTarget;
+    private String modifyFlag;
 
     @Schema(description = "参加评审部门")
     private String targetDepartmentIds;

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

@@ -56,8 +56,8 @@ public class RecordApplyRespVO {
     @ExcelProperty("评审范围")
     private String reviewRange;
 
-//    @Schema(description = "分发目标")
+    @Schema(description = "修改标识")
-//    private String assignTarget;
+    private String modifyFlag;
 
     @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

@@ -45,8 +45,8 @@ public class RecordApplySaveReqVO {
     @ExcelProperty("部门名称")
     private String applyDepartmentName;
 
-//    @Schema(description = "分发目标")
+    @Schema(description = "修改标识")
-//    private String assignTarget;
+    private String modifyFlag;
 
     @Schema(description = "评审时间")
     private LocalDateTime reviewTime;

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

@@ -36,7 +36,7 @@ public class RecordAssignPageReqVO extends PageParam {
     private LocalDateTime assignEndDate;
 
     @Schema(description = "分发号")
-    private Integer CollectionFlag;
+    private Integer collectionFlag;
 
     @Schema(description = "排序号")
     private Integer sortNo;

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

@@ -45,7 +45,7 @@ public class RecordAssignRespVO {
     private LocalDateTime assignEndDate;
 
     @Schema(description = "是否收回")
-    private Integer CollectionFlag;
+    private Integer collectionFlag;
 
     @Schema(description = "原始父级Id")
     private String mainId;

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

@@ -26,14 +26,14 @@ public class RecordAssignSaveReqVO {
     @Schema(description = "分发号")
     private String assignCode;
 
-    @Schema(description = "分发结束时间")
+    @Schema(description = "分发开始时间")
     private LocalDateTime assignStartDate;
 
-    @Schema(description = "是否收回")
+    @Schema(description = "分发结束时间")
     private LocalDateTime assignEndDate;
 
-    @Schema(description = "分发号")
+    @Schema(description = "是否收回")
-    private Integer CollectionFlag;
+    private Integer collectionFlag;
 
     @Schema(description = "排序号")
     private Integer sortNo;

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

@@ -73,7 +73,6 @@ public class RecordCategoryController extends AbstractFileUploadController imple
     @PostMapping("/create-temp-data")
     @Operation(summary = "创建文件记录分类临时数据")
     public CommonResult<RecordCategoryRespVO> createRecordTempCategory(@RequestBody RecordCategorySaveReqVO createReqVO) {
-//        RecordCategorySaveReqVO recordCategoryRespVO = new RecordCategorySaveReqVO();
         return success(recordCategoryService.createRecordCategory(createReqVO));
     }
 

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

@@ -35,6 +35,9 @@ public class RecordCategoryPageReqVO extends PageParam {
     @Schema(description = "排序号")
     private Integer sortNo;
 
+    @Schema(description = "排序号")
+    private String cancelFlag;
+
     @Schema(description = "其他配置")
     private String customConfig;
 

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

@@ -123,8 +123,8 @@ public class RecordPermissionController extends AbstractFileUploadController imp
         return success(BeanUtils.toBean(matchedPermissionList, RecordPermissionRespVO.class));
     }
 
-    @GetMapping("/page")
+//    @GetMapping("/page")
-    @Operation(summary = "获得记录权限分页")
+//    @Operation(summary = "获得记录权限分页")
     //@PreAuthorize("@ss.hasPermission('qms:record-permission:query')")
     public CommonResult<PageResult<RecordPermissionRespVO>> getRecordPermissionPage(@Valid RecordPermissionPageReqVO pageReqVO) {
         PageResult<RecordPermissionDO> pageResult = recordPermissionService.getRecordPermissionPage(pageReqVO);