From 84b7d5223a5f5229866a7d5686d198cca4251453 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 26 九月 2025 15:23:25 +0800 Subject: [PATCH] 代码提交,查询部门下级递归 --- ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java index d25e522..05a78e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java @@ -28,6 +28,8 @@ private Double duration; @ApiModelProperty(value = "申请人名称") private String applyUserName; + @ApiModelProperty(value = "事由/原因/说明") + private String applicationReason; @ApiModelProperty(value = "申请人部门名称") private String applyDeptName; @ApiModelProperty(value = "申请单号") @@ -37,7 +39,8 @@ private LocalDateTime createTime; - + @ApiModelProperty(value = "事项标题") + private String title; @ApiModelProperty(value = "审批申请ID") private Integer applicationId; @ApiModelProperty(value = "报销金额/申请金额/合计金额/总金额(报销申请/款项申请/款项支付审批/广告制作)") @@ -45,11 +48,13 @@ @ApiModelProperty(value = "入库类型 0-正常入库(资产入库)") private Integer storageType; @ApiModelProperty(value = "领用/借用/归还日期(物品借用/领用归还)") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate operateTime; @ApiModelProperty(value = "处置方式 0-报废,1-报损,2-捐赠(资产处置)") private Integer disposeType; + @ApiModelProperty(value = "报销类型 0-差旅招待交通费,1-企业日常采购,2-房租水电日常,3-聚餐团建,4-其他") + private Integer type; @ApiModelProperty(value = "更改方(资产变更)") private String ownershipDeptName; @ApiModelProperty(value = "领用物品(资产领用)") @@ -58,6 +63,8 @@ private String description; @ApiModelProperty(value = "内容(广告制作)") private String content; + @ApiModelProperty(value = "项目名称") + private String projectName; @ApiModelProperty(value = "审批状态 0-草稿,1-待审批,2-审批通过,3-审批拒绝 ,4-已撤回") private Integer approvalStatus; -- Gitblit v1.7.1