Compare commits

...

2 Commits

Author SHA1 Message Date
YBP
7bf3d2e73a 文件记录-更新状态,修改文件分发,及分发号表 2026-03-20 15:28:24 +08:00
YBP
80885dac89 文件记录-状态修改 2026-03-20 08:31:23 +08:00
38 changed files with 1714 additions and 332 deletions

View File

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

View File

@@ -0,0 +1,99 @@
package com.zt.plat.module.qms.resource.record.controller.admin.onlyOffice.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Schema(description = "管理后台 - OnlyOffice 编辑器配置 Response VO")
@Data
public class OnlyOfficeEditorConfigRespVO {
@Schema(description = "文档类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "text")
private String documentType;
@Schema(description = "文档配置", requiredMode = Schema.RequiredMode.REQUIRED)
private DocumentConfig document;
@Schema(description = "编辑器配置", requiredMode = Schema.RequiredMode.REQUIRED)
private EditorConfig editorConfig;
@Schema(description = "文档高度", requiredMode = Schema.RequiredMode.REQUIRED, example = "100%")
private String height;
@Schema(description = "令牌", requiredMode = Schema.RequiredMode.REQUIRED)
private String token;
@Schema(description = "OnlyOffice服务器地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://localhost:8085")
private String documentServerUrl;
@Schema(description = "文档配置")
@Data
public static class DocumentConfig {
@Schema(description = "文件类型", example = "docx")
private String fileType;
@Schema(description = "文档key", example = "doc123")
private String key;
@Schema(description = "文档标题", example = "技术文档")
private String title;
@Schema(description = "文档地址")
private String url;
@Schema(description = "权限配置")
private Permissions permissions;
}
@Schema(description = "权限配置")
@Data
public static class Permissions {
@Schema(description = "是否可编辑", example = "true")
private Boolean edit;
@Schema(description = "是否可下载", example = "true")
private Boolean download;
@Schema(description = "是否可打印", example = "true")
private Boolean print;
}
@Schema(description = "编辑器配置")
@Data
public static class EditorConfig {
@Schema(description = "回调地址")
private String callbackUrl;
@Schema(description = "语言", example = "zh-CN")
private String lang;
@Schema(description = "模式", example = "edit")
private String mode;
@Schema(description = "用户配置")
private User user;
@Schema(description = "协作配置")
private CoEditing coEditing;
}
@Schema(description = "用户配置")
@Data
public static class User {
@Schema(description = "用户ID", example = "1")
private String id;
@Schema(description = "用户名", example = "admin")
private String name;
}
@Schema(description = "协作配置")
@Data
public static class CoEditing {
@Schema(description = "协作模式", example = "fast")
private String mode;
@Schema(description = "是否允许更改", example = "true")
private Boolean change;
}
}

View File

@@ -0,0 +1,57 @@
package com.zt.plat.module.qms.resource.record.controller.admin.onlyOffice.controller.vo;
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
import lombok.*;
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OnlyOfficeFileDO extends BaseDO {
/**
* 文档编号
*/
private Long id;
/**
* 文档标题
*/
private String title;
/**
* 文件编号
*/
private Long fileId;
/**
* 文件类型
*
* 枚举 {@link com.zt.plat.module.infra.enums.doc.DocFileTypeEnum}
*/
private String fileType;
/**
* 空间类型
*
* 枚举 {@link com.zt.plat.module.infra.enums.doc.DocSpaceTypeEnum}
*/
private Integer spaceType;
/**
* 文档描述
*/
private String description;
/**
* 最新版本编号
*/
private Long latestVersionId;
/**
* 所有者用户编号
*/
private Long ownerUserId;
/**
* 状态
*
* 枚举 {@link com.zt.plat.framework.common.enums.CommonStatusEnum}
*/
private Integer status;
}

View File

@@ -0,0 +1,8 @@
package com.zt.plat.module.qms.resource.record.controller.admin.onlyOffice.service;
import com.zt.plat.module.qms.resource.record.controller.admin.onlyOffice.controller.vo.OnlyOfficeEditorConfigRespVO;
public interface OnlyOfficeService {
OnlyOfficeEditorConfigRespVO getEditorConfig(Long id);
}

View File

@@ -61,7 +61,7 @@ public class CommonRecordController {
return CommonResult.error(CURRENT_USER_COMPANY_NOT_EXISTS); return CommonResult.error(CURRENT_USER_COMPANY_NOT_EXISTS);
CommonResult<List<DeptRespDTO>> childDeptList = deptApi.getChildDeptList(visitCompanyId); CommonResult<List<DeptRespDTO>> childDeptList = deptApi.getChildDeptList(visitCompanyId);
List<DeptRespDTO> data = childDeptList.getData(); List<DeptRespDTO> data = childDeptList.getData();
deptDataList = getChildDeptList(data); List<DeptRespDTO> deptDataList = getChildDeptList(data);
return CommonResult.success(deptDataList); return CommonResult.success(deptDataList);
} }

View File

@@ -1,22 +1,18 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo; package com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO; import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO;
import com.zt.plat.module.qms.core.aspect.annotation.Dict; import com.zt.plat.module.qms.core.aspect.annotation.Dict;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailRespVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailRespVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailSaveReqVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordassign.vo.RecordAssignRespVO;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import lombok.*; import lombok.Data;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 文件记录通用申请 Response VO") @Schema(description = "管理后台 - 文件记录通用申请 Response VO")
@Data @Data
@@ -132,6 +128,8 @@ public class RecordApplyRespVO {
@Schema(description = "明细列表") @Schema(description = "明细列表")
private List<RecordApplyDetailRespVO> detailList; private List<RecordApplyDetailRespVO> detailList;
private List<RecordAssignRespVO> assignList;
// ===============临时字段=================》 // ===============临时字段=================》

View File

@@ -1,6 +1,7 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail; package com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailJoinVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailPageReqVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailPageReqVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailRespVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailRespVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailSaveReqVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailSaveReqVO;
@@ -99,9 +100,9 @@ public class RecordApplyDetailController extends AbstractFileUploadController im
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得文件记录通用申请明细分页") @Operation(summary = "获得文件记录通用申请明细分页")
//@PreAuthorize("@ss.hasPermission('qms:record-apply-detail:query')") //@PreAuthorize("@ss.hasPermission('qms:record-apply-detail:query')")
public CommonResult<PageResult<RecordApplyDetailRespVO>> getRecordApplyDetailPage(@Valid RecordApplyDetailPageReqVO pageReqVO) { public CommonResult<PageResult<RecordApplyDetailJoinVO>> getRecordApplyDetailPage(@Valid RecordApplyDetailPageReqVO pageReqVO) {
PageResult<RecordApplyDetailDO> pageResult = recordApplyDetailService.getRecordApplyDetailPage(pageReqVO); PageResult<RecordApplyDetailJoinVO> recordApplyDetailJoinVOPageResult = recordApplyDetailService.selectDetailAndApplyList(pageReqVO);
return success(BeanUtils.toBean(pageResult, RecordApplyDetailRespVO.class)); return success(BeanUtils.toBean(recordApplyDetailJoinVOPageResult, RecordApplyDetailJoinVO.class));
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")

View File

@@ -1,5 +1,7 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo; package com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo;
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -19,6 +21,12 @@ public class RecordApplyDetailJoinVO {
private String businessStatus; private String businessStatus;
private String businessType; private String businessType;
private String flowInstanceId; private String flowInstanceId;
private String formData;
private String applyContent;
private String changeBefore;
private String changeAfter;
// private String permanently;
// RecordApplyDetailDO 字段 // RecordApplyDetailDO 字段
private Long detailId; private Long detailId;
@@ -29,4 +37,9 @@ public class RecordApplyDetailJoinVO {
private String sortNo; private String sortNo;
private String systemDepartmentCode; private String systemDepartmentCode;
private String remark; private String remark;
private Long id;
private String targetType;
private String targetName;
private Long targetId;
private String detailFormData;
} }

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