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-17 18:20:38 +08:00
parent a5b9584af0
commit 6f21dd18fd
22 changed files with 614 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@@ -13,6 +13,7 @@ import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIg
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;
@@ -39,7 +40,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RequestMapping("/qms/resource/record-apply")
@Validated
@DeptDataPermissionIgnore(enable = "true")
@FileUploadController(source = "qms.recordapply")
@FileUploadController(source = "qms.recordapply",codeKey = "data.fileUploadBusinessCode")
public class RecordApplyController extends AbstractFileUploadController implements BusinessControllerMarker{
static {
@@ -52,6 +53,9 @@ public class RecordApplyController extends AbstractFileUploadController implemen
@Resource
private RecordApplyService recordApplyService;
@Resource
private BusinessFileService businessFileService;
@PostMapping("/create")
@Operation(summary = "创建文件记录创建申请")
@@ -77,9 +81,9 @@ public class RecordApplyController extends AbstractFileUploadController implemen
@PutMapping("/update")
@Operation(summary = "更新文件记录通用申请")
//@PreAuthorize("@ss.hasPermission('qms:record-apply:update')")
public CommonResult<Boolean> updateRecordApply(@Valid @RequestBody RecordApplySaveReqVO updateReqVO) {
recordApplyService.updateRecordApply(updateReqVO);
return success(true);
public CommonResult<RecordApplyRespVO> updateRecordApply(@Valid @RequestBody RecordApplySaveReqVO updateReqVO) {
RecordApplyRespVO recordApplyRespVO = recordApplyService.updateRecordApply(updateReqVO);
return success(recordApplyRespVO);
}
@DeleteMapping("/delete")
@@ -109,6 +113,7 @@ public class RecordApplyController extends AbstractFileUploadController implemen
// 先转换为VO，避免JSONObject中包含ArrayList导致的转换错误
RecordApplyRespVO respVO = BeanUtils.toBean(recordApply, RecordApplyRespVO.class);
respVO.setBusinessFileRet(businessFileService.getBusinessFileList(id));
return success(respVO);
}
@@ -173,4 +178,17 @@ public class RecordApplyController extends AbstractFileUploadController implemen
BeanUtils.toBean(list, RecordApplyRespVO.class));
}
/**
* 通过定时任务，判断文件是否到期（到期自动作废）
* @return
*/
// 已由 XXL-Job 定时任务（XXX）驱动，此接口保留用于手动触发/测试
@GetMapping("/timing-updateRecordStatus")
@Operation(summary = "定时更新文件、模板、记录状态")
//@PreAuthorize("@ss.hasPermission('qms:record-record:update')")
public CommonResult<Boolean> timingUpdateRecordStatus() {
// recordApplyService.updateApplyStatus();
return success(true);
}
}

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

@@ -1,6 +1,8 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo;
import com.alibaba.fastjson2.JSONObject;
import com.zt.plat.framework.common.pojo.CommonResult;
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.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailRespVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailSaveReqVO;
@@ -118,6 +120,14 @@ public class RecordApplyRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
// ===================扩展字段=========================
@Schema(description = "附件对象")
private CommonResult<List<BusinessFileWithUrlRespDTO>> businessFileRet;
@Schema(description = "附件上传code")
@ExcelProperty("附件上传code")
private String fileUploadBusinessCode = "qms_resource_record_apply";
// // ===============临时字段=================》
@Schema(description = "明细列表")
private List<RecordApplyDetailRespVO> detailList;

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

@@ -1,6 +1,7 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.zt.plat.module.qms.resource.clientManage.controller.vo.UploadFileVo;
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 io.swagger.v3.oas.annotations.media.Schema;
@@ -94,6 +95,12 @@ public class RecordApplySaveReqVO {
// ============================================
@Schema(description = "上传文件列表")
private List<UploadFileVo> files;
@Schema(description = "删除的文件id")
private List<Long> deleteFileIdList;
@Schema(description = "文件记录ID")
private Long recordId;

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

@@ -1,6 +1,7 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordpermission;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.module.qms.resource.record.constant.RecordConstants;
import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionPageReqVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionRespVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionSaveReqVO;
@@ -96,12 +97,19 @@ public class RecordPermissionController extends AbstractFileUploadController imp
return success(BeanUtils.toBean(recordPermission, RecordPermissionRespVO.class));
}
@GetMapping("/isAdminByUserId")
@GetMapping("/isPermissionByUserId")
@Operation(summary = "通过分类Id判断当前用户是否有管理员权限")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
//@PreAuthorize("@ss.hasPermission('qms:record-category:query')")
public CommonResult<Boolean> isAdminByUserId(@RequestParam("categoryId") Long categoryId) {
boolean b = recordPermissionService.isAdminByUserId(categoryId);
public CommonResult<Boolean> isAdminByUserId(@RequestParam("categoryId") Long categoryId,@RequestParam("permission") String permission) {
boolean b = false;
boolean isAdmin = recordPermissionService.judgeIsAdmin();
if (isAdmin) return success(isAdmin);
if (permission.equals(RecordConstants.PermissionType.ADMIN)) {
b = recordPermissionService.isAdminByUserId(categoryId);
} else if (permission.equals(RecordConstants.PermissionType.EDIT)) {
b = recordPermissionService.isEditPermissionByUserId(categoryId);
}
return success(b);
}
@@ -136,13 +144,4 @@ public class RecordPermissionController extends AbstractFileUploadController imp
BeanUtils.toBean(list, RecordPermissionRespVO.class));
}
@GetMapping("/test")
@Operation(summary = "导出记录权限 Excel")
//@PreAuthorize("@ss.hasPermission('qms:record-permission:export')")
@ApiAccessLog(operateType = EXPORT)
public void test() {
recordPermissionService.test();
}
}

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

File diff suppressed because it is too large Load Diff

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java
View File

@@ -148,6 +148,11 @@ public class RecordApplyDO extends BusinessBaseDO {
@TableField("RMK")
private String remark;
// =========临时字段========
@TableField(exist = false)
private LocalDateTime expirationDate; // TODO
// ==========================
@TableField(exist = false)

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapplydetail/RecordApplyDetailDO.java
View File

@@ -114,8 +114,11 @@ public class RecordApplyDetailDO extends BusinessBaseDO {
@TableField(exist = false)
private String recordPermanently;
// =========临时字段========
@TableField(exist = false)
private LocalDateTime expirationDate;
}

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordApplyDetailMapper.java
View File

@@ -4,6 +4,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailPageReqVO;
import com.zt.plat.module.qms.resource.record.dal.dataobject.recordapply.RecordApplyDO;
import com.zt.plat.module.qms.resource.record.dal.dataobject.recordapplydetail.RecordApplyDetailDO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailJoinVO;
import org.apache.ibatis.annotations.Mapper;
@@ -57,4 +58,6 @@ public interface RecordApplyDetailMapper extends BaseMapperX<RecordApplyDetailDO
List<RecordApplyDetailDO> selectDetailAndRecordList(@Param("applyId") Long applyId);
List<RecordApplyDetailDO> selectDistributionDetailAndRecordList(@Param("applyId") Long applyId);
List<RecordApplyDetailDO> updateDistributionPermissionJob();
}

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.java
View File

@@ -46,10 +46,9 @@ public interface RecordPermissionMapper extends BaseMapperX<RecordPermissionDO>
* 2. 或用户所在部门有权限 (targetType='部门' AND targetId in userDepts)
* 3. 或用户的角色有权限 (targetType='角色' AND targetId in userRoles)
*/
List<RecordPermissionDO> selectPermissionList(@Param("categoryId") Long categoryId,
List<RecordPermissionDO> selectPermissionList(@Param("recordP") RecordPermissionDO recordPermissionDO,
@Param("userId") Long userId,
@Param("userDepts") List<Long> userDepts,
@Param("userRoles") Set<Long> userRoles,
@Param("permission") String permission); // permission: 管理员/可编辑/可查看
@Param("userRoles") Set<Long> userRoles); // permission: 管理员/可编辑/可查看
}

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