文件记录分类明细-修改-历史版本

This commit is contained in:
YBP
2026-02-12 15:15:06 +08:00
parent 0aacc686a6
commit bafdcd501d
7 changed files with 178 additions and 25 deletions

View File

@@ -38,7 +38,7 @@ import com.zt.plat.module.qms.resource.record.service.recordrecord.RecordRecordS
@Tag(name = "管理后台 - 文件、模板、记录")
@RestController
@RequestMapping("/qms/record-record")
@RequestMapping("/qms/resource/record-record")
@Validated
@DeptDataPermissionIgnore(enable = "true")
@FileUploadController(source = "qms.recordrecord")
@@ -54,8 +54,17 @@ public class RecordRecordController extends AbstractFileUploadController impleme
@Resource
private RecordRecordService recordRecordService;
// @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 = "创建文件、模板、记录")
@Operation(summary = "创建文件、模板、记录->分类明细")
//@PreAuthorize("@ss.hasPermission('qms:record-record:create')")
public CommonResult<RecordRecordRespVO> createRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO createReqVO) {
return success(recordRecordService.createRecordRecord(createReqVO));
@@ -100,7 +109,13 @@ public class RecordRecordController extends AbstractFileUploadController impleme
@Operation(summary = "获得文件、模板、记录分页")
//@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
public CommonResult<PageResult<RecordRecordRespVO>> getRecordRecordPage(@Valid RecordRecordPageReqVO pageReqVO) {
PageResult<RecordRecordDO> pageResult = recordRecordService.getRecordRecordPage(pageReqVO);
PageResult<RecordRecordDO> pageResult = new PageResult<>();
Integer isQueryHistory = pageReqVO.getIsQueryHistory();
if (isQueryHistory != null && isQueryHistory == 1) { // 查询历史分页
pageResult=recordRecordService.getRecordHistoryPage(pageReqVO);
}else {
pageResult = recordRecordService.getRecordRecordPage(pageReqVO);
}
return success(BeanUtils.toBean(pageResult, RecordRecordRespVO.class));
}

View File

@@ -29,14 +29,14 @@ public class RecordRecordPageReqVO extends PageParam {
private String version;
@Schema(description = "是否最新版本,默认显示最新版本")
private String currentFlag;
private Integer currentFlag;
@Schema(description = "编制日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] makeDate;
@Schema(description = "是否涉密")
private String confidentialFlag;
private Integer confidentialFlag;
@Schema(description = "密级")
private String confidentialLevel;
@@ -48,7 +48,7 @@ public class RecordRecordPageReqVO extends PageParam {
private String confidentialKey;
@Schema(description = "是否长期有效")
private String permanently;
private Integer permanently;
@Schema(description = "过期日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -82,4 +82,14 @@ public class RecordRecordPageReqVO extends PageParam {
@Schema(description = "是否回收权限")
private Integer collectionFlag;
@Schema(description = "原始父级ID")
private Long mainId;
@Schema(description = "是否可编辑")
private Integer operationFlag;
// ===========临时字段==========
@Schema(description = "是否查询历史数据")
private Integer isQueryHistory; // 1-查询0-不查询
}

View File

@@ -1,10 +1,15 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo;
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 文件、模板、记录 Response VO")
@@ -38,7 +43,8 @@ public class RecordRecordRespVO {
@Schema(description = "是否最新版本,默认显示最新版本", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否最新版本,默认显示最新版本")
private String currentFlag;
@Dict(dicCode = "yes_or_no")
private Integer currentFlag;
@Schema(description = "编制日期")
@ExcelProperty("编制日期")
@@ -46,7 +52,8 @@ public class RecordRecordRespVO {
@Schema(description = "是否涉密", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否涉密")
private String confidentialFlag;
@Dict(dicCode = "yes_or_no")
private Integer confidentialFlag;
@Schema(description = "密级")
@ExcelProperty("密级")
@@ -62,7 +69,8 @@ public class RecordRecordRespVO {
@Schema(description = "是否长期有效", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否长期有效")
private String permanently;
@Dict(dicCode = "yes_or_no")
private Integer permanently;
@Schema(description = "过期日期")
@ExcelProperty("过期日期")
@@ -70,11 +78,13 @@ public class RecordRecordRespVO {
@Schema(description = "过期标识,0-有效1-过期", example = "1")
@ExcelProperty("过期标识,0-有效1-过期")
private String expirationStatus;
@Dict(dicCode = "yes_or_no")
private Integer expirationStatus;
@Schema(description = "作废标志,0-有效1-作废")
@ExcelProperty("作废标志,0-有效1-作废")
private String cancelFlag;
@Dict(dicCode = "yes_or_no")
private Integer cancelFlag;
@Schema(description = "表单数据")
@ExcelProperty("表单数据")
@@ -100,4 +110,16 @@ public class RecordRecordRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "原始父级ID")
private Long mainId;
@Schema(description = "是否可编辑")
@ExcelProperty("是否可编辑")
private Integer operationFlag;
//===========临时字段=============>
@Schema(description = "文件分类名称")
@ExcelProperty("文件分类名称")
private String categoryName;
}

View File

@@ -1,11 +1,15 @@
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 文件、模板、记录新增/修改 Request VO")
@@ -35,15 +39,14 @@ public class RecordRecordSaveReqVO {
private String version;
@Schema(description = "是否最新版本,默认显示最新版本", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "是否最新版本,默认显示最新版本不能为空")
private String currentFlag;
private Integer currentFlag;
@Schema(description = "编制日期")
private LocalDateTime makeDate;
@Schema(description = "是否涉密", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "是否涉密不能为空")
private String confidentialFlag;
@NotNull(message = "是否涉密不能为空")
private Integer confidentialFlag;
@Schema(description = "密级")
private String confidentialLevel;
@@ -55,8 +58,7 @@ public class RecordRecordSaveReqVO {
private String confidentialKey;
@Schema(description = "是否长期有效", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "是否长期有效不能为空")
private String permanently;
private Integer permanently;
@Schema(description = "过期日期")
private LocalDateTime expirationDate;
@@ -84,4 +86,14 @@ public class RecordRecordSaveReqVO {
@Schema(description = "是否回收权限")
private Integer collectionFlag;
@Schema(description = "原始父级ID")
private Long mainId;
@Schema(description = "是否可编辑")
private Integer operationFlag;
// =================临时字段==================>
@Schema(description = "是否新版本")
private String newVersion;
}

View File

@@ -62,7 +62,7 @@ public class RecordRecordDO extends BusinessBaseDO {
* 是否最新版本,默认显示最新版本
*/
@TableField("CRNT_FLG")
private String currentFlag;
private Integer currentFlag;
/**
* 编制日期
*/
@@ -72,7 +72,7 @@ public class RecordRecordDO extends BusinessBaseDO {
* 是否涉密
*/
@TableField("CNF_FLG")
private String confidentialFlag;
private Integer confidentialFlag;
/**
* 密级
*/
@@ -138,5 +138,23 @@ public class RecordRecordDO extends BusinessBaseDO {
*/
@TableField("COLT_FLG")
private Integer collectionFlag;
/**
* 原始父级ID
*/
@TableField("MAIN_ID")
private Long mainId;
/**
* 是否可编辑
*/
@TableField("OPTN_FLG")
private Integer operationFlag;
// =============临时字段============>
@TableField(exist = false)
private String categoryName;
@TableField(exist = false)
private String newVersion;
}

View File

@@ -61,4 +61,7 @@ public interface RecordRecordService {
*/
PageResult<RecordRecordDO> getRecordRecordPage(RecordRecordPageReqVO pageReqVO);
// PageResult<RecordRecordDO> getRecordListByCategoryId(Long categoryId);
PageResult<RecordRecordDO> getRecordHistoryPage(RecordRecordPageReqVO pageReqVO);
}