zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

文件记录-重构-通用申请

Browse Source
This commit is contained in:
YBP
2026-03-24 18:21:01 +08:00
parent a227770ec1
commit 89ebf4437c
28 changed files with 495 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java
View File

@@ -248,6 +248,7 @@ public interface ErrorCodeConstants {
/*================================= 部门信息、用户信息 ==================================*/
ErrorCode CURRENT_USER_COMPANY_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户公司不存在");
ErrorCode CURRENT_USER_DEPT_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户部门不存在");
ErrorCode CURRENT_USER_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户部门不存在");
// ========== 文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物 TODO 补充编号 ==========
ErrorCode RECORD_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_450_000, "文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物不存在");

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/CommonRecordController.java
View File

@@ -40,10 +40,6 @@ public class CommonRecordController {
@Resource
private AdminUserApi adminUserApi;
private List<DeptRespDTO> deptDataList = new ArrayList<>();
private CommonResult<List<AdminUserRespDTO>> userDataList;
@Resource
private PermissionCommonApi permissionCommonApi;
@@ -88,7 +84,7 @@ public class CommonRecordController {
return;
}
List<Long> deptIds = new ArrayList<>();
// List<Long> deptIds = new ArrayList<>();
for (DeptRespDTO deptRespDTO : list) {
CommonResult<List<DeptRespDTO>> result = deptApi.getChildDeptList(deptRespDTO.getId());
if (result != null && result.isSuccess()) {
@@ -107,7 +103,7 @@ public class CommonRecordController {
@Operation(summary = "获得当前公司下面的所有用户")
//@PreAuthorize("@ss.hasPermission('qms:record-relation:query')")
public CommonResult<List<AdminUserRespDTO>> getUserList() {
// if (userDataList != null) return userDataList;
CommonResult<List<AdminUserRespDTO>> userDataList;
CommonResult<List<DeptRespDTO>> deptList = this.getDeptList();
List<DeptRespDTO> data = deptList.getData();
// 获取部门的所有id

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

@@ -23,7 +23,7 @@ public class RecordApplyDetailPageReqVO extends PageParam {
private Long documentId;
@Schema(description = "授权类型")
private String TargetType;
private String targetType;
@Schema(description = "授权Id")
private Long targetId;
@@ -38,6 +38,12 @@ public class RecordApplyDetailPageReqVO extends PageParam {
@Schema(description = "更改原因")
private String modifyCause;
@Schema(description = "是否保留")
private String saveFlag;
@Schema(description = "保留结束日期")
private LocalDateTime saveEndDate;
@Schema(description = "是否长期有效")
private String permanently;

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

@@ -28,7 +28,7 @@ public class RecordApplyDetailRespVO {
@Schema(description = "授权类型")
@ExcelProperty("授权类型")
private String TargetType;
private String targetType;
@Schema(description = "授权名称")
private String targetName;
@@ -58,6 +58,12 @@ public class RecordApplyDetailRespVO {
@ExcelProperty("是否长期有效")
private String permanently;
@Schema(description = "是否保留")
private String saveFlag;
@Schema(description = "保留结束日期")
private LocalDateTime saveEndDate;
@Schema(description = "开始日期")
@ExcelProperty("开始日期")
private LocalDateTime applyStartDate;

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

@@ -37,6 +37,12 @@ public class RecordApplyDetailSaveReqVO {
@Schema(description = "更改原因")
private String modifyCause;
@Schema(description = "是否保留")
private String saveFlag;
@Schema(description = "保留结束日期")
private LocalDateTime saveEndDate;
private String formData;
@Schema(description = "是否长期有效")

10
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/vo/RecordPermissionPageReqVO.java
View File

@@ -1,6 +1,7 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,9 +21,6 @@ public class RecordPermissionPageReqVO extends PageParam {
@Schema(description = "记录类型", example = "1")
private String sourceType;
// @Schema(description = "记录分类ID", example = "1")
// private Long categoryId;
@Schema(description = "记录id", example = "1104")
private Long sourceId;
@@ -54,6 +52,12 @@ public class RecordPermissionPageReqVO extends PageParam {
@Schema(description = "作废标识,0-有效，1-作废")
private String cancelFlag;
@Schema(description = "是否保留标志")
private String saveFlag;
@Schema(description = "保留结束日期")
private String saveEndDate;
@Schema(description = "所属部门")
private String systemDepartmentCode;

11
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/vo/RecordPermissionRespVO.java
View File

@@ -25,10 +25,6 @@ public class RecordPermissionRespVO {
@ExcelProperty("记录类型")
private String sourceType;
// @Schema(description = "记录分类ID", example = "1")
// @ExcelProperty("记录分类ID")
// private Long categoryId;
@Schema(description = "记录id", example = "1104")
@ExcelProperty("记录id")
private Long sourceId;
@@ -70,6 +66,13 @@ public class RecordPermissionRespVO {
@ExcelProperty("作废标识,0-有效，1-作废")
private String cancelFlag;
@Schema(description = "是否保留标志")
private String saveFlag;
@Schema(description = "保留结束日期")
private String saveEndDate;
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/vo/RecordPermissionSaveReqVO.java
View File

@@ -21,9 +21,6 @@ public class RecordPermissionSaveReqVO {
@Schema(description = "记录类型", example = "1")
private String sourceType;
// @Schema(description = "记录分类ID", example = "1")
// private Long categoryId;
@Schema(description = "记录id", example = "1104")
private Long sourceId;
@@ -57,6 +54,12 @@ public class RecordPermissionSaveReqVO {
@Schema(description = "作废标识,0-有效，1-作废")
private String cancelFlag;
@Schema(description = "是否保留标志")
private String saveFlag;
@Schema(description = "保留结束日期")
private String saveEndDate;
@Schema(description = "所属部门")
private String systemDepartmentCode;

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

@@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.PageResult;
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.module.qms.common.service.BusinessFileService;
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;
@@ -34,7 +35,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RestController
@RequestMapping("/qms/resource/record-record")
@Validated
//@DeptDataPermissionIgnore(enable = "true")
@DeptDataPermissionIgnore(enable = "true")
@FileUploadController(source = "qms.recordrecord", codeKey = "data.fileUploadBusinessCode")
public class RecordRecordController extends AbstractFileUploadController implements BusinessControllerMarker {
@@ -142,14 +143,14 @@ public class RecordRecordController extends AbstractFileUploadController impleme
// 流程-评审--查询记录列表
@GetMapping("/getRecordList")
@Operation(summary = "获得文件、模板、记录分页")
//@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
public CommonResult<List<RecordRecordRespVO>> getRecordList(RecordRecordPageReqVO pageReqVO) {
List<RecordRecordRespVO> result = recordRecordService.getRecordList(pageReqVO);
return success(BeanUtils.toBean(result, RecordRecordRespVO.class));
}
// @GetMapping("/getRecordList")
// @Operation(summary = "获得文件、模板、记录分页")
// //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
// public CommonResult<List<RecordRecordRespVO>> getRecordList(RecordRecordPageReqVO pageReqVO) {
//
// List<RecordRecordRespVO> result = recordRecordService.getRecordList(pageReqVO);
// return success(BeanUtils.toBean(result, RecordRecordRespVO.class));
// }
/**
* 流程-查看申请--查询记录列表

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

@@ -100,7 +100,7 @@ public class RecordRecordPageReqVO extends PageParam {
private Integer collectionFlag;
@Schema(description = "审批状态,需要走流程的审批状态")
private Integer ApplyStatus;
private String ApplyStatus;
@Schema(description = "流程实例Id")
private String flowInstanceId;

Some files were not shown because too many files have changed in this diff Show More