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-20 15:28:24 +08:00
parent 80885dac89
commit 7bf3d2e73a
21 changed files with 263 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

16
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,22 +1,18 @@
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.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;
import com.zt.plat.module.qms.resource.record.controller.admin.recordassign.vo.RecordAssignRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import lombok.Data;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
import java.util.List;
@Schema(description = "管理后台 - 文件记录通用申请 Response VO")
@Data
@@ -132,7 +128,7 @@ public class RecordApplyRespVO {
@Schema(description = "明细列表")
private List<RecordApplyDetailRespVO> detailList;
private List<RecordApplyRespVO> assignList;
private List<RecordAssignRespVO> assignList;
// ===============临时字段=================》

7
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapplydetail/RecordApplyDetailController.java
View File

@@ -1,6 +1,7 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail;
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.RecordApplyDetailRespVO;
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")
@Operation(summary = "获得文件记录通用申请明细分页")
//@PreAuthorize("@ss.hasPermission('qms:record-apply-detail:query')")
public CommonResult<PageResult<RecordApplyDetailRespVO>> getRecordApplyDetailPage(@Valid RecordApplyDetailPageReqVO pageReqVO) {
PageResult<RecordApplyDetailDO> pageResult = recordApplyDetailService.getRecordApplyDetailPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, RecordApplyDetailRespVO.class));
public CommonResult<PageResult<RecordApplyDetailJoinVO>> getRecordApplyDetailPage(@Valid RecordApplyDetailPageReqVO pageReqVO) {
PageResult<RecordApplyDetailJoinVO> recordApplyDetailJoinVOPageResult = recordApplyDetailService.selectDetailAndApplyList(pageReqVO);
return success(BeanUtils.toBean(recordApplyDetailJoinVOPageResult, RecordApplyDetailJoinVO.class));
}
@GetMapping("/export-excel")

4
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

@@ -50,6 +50,10 @@ public class RecordApplyDetailRespVO {
@ExcelProperty("更改原因")
private String modifyCause;
@Schema(description = "表单数据")
@ExcelProperty("表单数据")
private String formData;
@Schema(description = "是否长期有效")
@ExcelProperty("是否长期有效")
private String permanently;

32
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/RecordAssignController.java
View File

@@ -31,9 +31,9 @@ import java.util.List;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物")
@Tag(name = "管理后台 - 文件记录分发号")
@RestController
@RequestMapping("/qms/record-assign")
@RequestMapping("/qms/resource/record-assign")
@Validated
@FileUploadController(source = "qms.recordassign")
public class RecordAssignController extends AbstractFileUploadController implements BusinessControllerMarker{
@@ -49,24 +49,24 @@ public class RecordAssignController extends AbstractFileUploadController impleme
private RecordAssignService recordAssignService;
@PostMapping("/create")
@Operation(summary = "创建文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物")
@PreAuthorize("@ss.hasPermission('qms:record-assign:create')")
@Operation(summary = "创建文件记录分发号")
// @PreAuthorize("@ss.hasPermission('qms:record-assign:create')")
public CommonResult<RecordAssignRespVO> createRecordAssign(@Valid @RequestBody RecordAssignSaveReqVO createReqVO) {
return success(recordAssignService.createRecordAssign(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物")
@PreAuthorize("@ss.hasPermission('qms:record-assign:update')")
@Operation(summary = "更新文件记录分发号")
// @PreAuthorize("@ss.hasPermission('qms:record-assign:update')")
public CommonResult<Boolean> updateRecordAssign(@Valid @RequestBody RecordAssignSaveReqVO updateReqVO) {
recordAssignService.updateRecordAssign(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物")
@Operation(summary = "删除文件记录分发号")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:record-assign:delete')")
// @PreAuthorize("@ss.hasPermission('qms:record-assign:delete')")
public CommonResult<Boolean> deleteRecordAssign(@RequestParam("id") Long id) {
recordAssignService.deleteRecordAssign(id);
return success(true);
@@ -74,33 +74,33 @@ public class RecordAssignController extends AbstractFileUploadController impleme
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物")
@PreAuthorize("@ss.hasPermission('qms:record-assign:delete')")
@Operation(summary = "批量删除文件记录分发号")
// @PreAuthorize("@ss.hasPermission('qms:record-assign:delete')")
public CommonResult<Boolean> deleteRecordAssignList(@RequestBody BatchDeleteReqVO req) {
recordAssignService.deleteRecordAssignListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物")
@Operation(summary = "获得文件记录分发号")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:record-assign:query')")
// @PreAuthorize("@ss.hasPermission('qms:record-assign:query')")
public CommonResult<RecordAssignRespVO> getRecordAssign(@RequestParam("id") Long id) {
RecordAssignDO recordAssign = recordAssignService.getRecordAssign(id);
return success(BeanUtils.toBean(recordAssign, RecordAssignRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物分页")
@PreAuthorize("@ss.hasPermission('qms:record-assign:query')")
@Operation(summary = "获得文件记录分发号")
// @PreAuthorize("@ss.hasPermission('qms:record-assign:query')")
public CommonResult<PageResult<RecordAssignRespVO>> getRecordAssignPage(@Valid RecordAssignPageReqVO pageReqVO) {
PageResult<RecordAssignDO> pageResult = recordAssignService.getRecordAssignPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, RecordAssignRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物 Excel")
@PreAuthorize("@ss.hasPermission('qms:record-assign:export')")
@Operation(summary = "导出文件记录分发号")
// @PreAuthorize("@ss.hasPermission('qms:record-assign:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportRecordAssignExcel(@Valid RecordAssignPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

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

@@ -14,8 +14,8 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class RecordAssignPageReqVO extends PageParam {
@Schema(description = "申请明细ID", example = "13369")
private Long applyDetailId;
// @Schema(description = "申请明细ID", example = "13369")
// private Long applyDetailId;
@Schema(description = "目标类型,人/部门", example = "2")
private String targetType;
@@ -38,6 +38,12 @@ public class RecordAssignPageReqVO extends PageParam {
@Schema(description = "分发号")
private Integer CollectionFlag;
@Schema(description = "排序号")
private Integer sortNo;
@Schema(description = "长期有效")
private String permanently;
@Schema(description = "通知")
private String adviceFlag;

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

@@ -16,9 +16,9 @@ public class RecordAssignRespVO {
@ExcelProperty("ID")
private Long id;
@Schema(description = "申请明细ID", example = "13369")
@ExcelProperty("申请明细ID")
private Long applyDetailId;
// @Schema(description = "申请明细ID", example = "13369")
// @ExcelProperty("申请明细ID")
// private Long applyDetailId;
@Schema(description = "目标类型,人/部门", example = "2")
@ExcelProperty("目标类型,人/部门")
@@ -36,13 +36,19 @@ public class RecordAssignRespVO {
@ExcelProperty("分发号")
private String assignCode;
@Schema(description = "排序号")
private Integer sortNo;
@Schema(description = "长期有效")
private String permanently;
@Schema(description = "分发结束时间")
private LocalDateTime assignStartDate;
@Schema(description = "是否收回")
@Schema(description = "分发结束时间")
private LocalDateTime assignEndDate;
@Schema(description = "分发号")
@Schema(description = "是否收回")
private Integer CollectionFlag;
@Schema(description = "通知")

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

@@ -38,6 +38,12 @@ public class RecordAssignSaveReqVO {
@Schema(description = "分发号")
private Integer CollectionFlag;
@Schema(description = "排序号")
private Integer sortNo;
@Schema(description = "长期有效")
private String permanently;
@Schema(description = "通知")
private String adviceFlag;

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

@@ -53,7 +53,7 @@ public class RecordRecordPageReqVO extends PageParam {
private String confidentialKey;
@Schema(description = "是否长期有效")
private Integer permanently;
private String permanently;
@Schema(description = "是否需要提交(用来判断文件是否需要走流程)")
@Dict(dicCode = "yes_or_no")

12
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordassign/RecordAssignDO.java
View File

@@ -34,8 +34,8 @@ public class RecordAssignDO extends BusinessBaseDO {
/**
* 申请ID
*/
@TableField("APL_DL_ID")
private Long applyDetailId;
// @TableField("APL_DL_ID")
// private Long applyDetailId;
/**
* 目标类型,人/部门
*/
@@ -71,6 +71,14 @@ public class RecordAssignDO extends BusinessBaseDO {
*/
@TableField("COLT_FLG")
private Integer CollectionFlag;
/**
* 排序
*/
@TableField("SRT_NO")
private Integer sortNo;
@TableField("PMNT")
private String permanently;
/**
* 通知
*/

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