From 5b13db7e2c95385d69b8bdb449560bbbfe359146 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 23 十月 2025 17:16:47 +0800
Subject: [PATCH] 广告物料零星结算接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java
index 03bb7f9..8cb3d6d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java
@@ -5,11 +5,13 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.dto.dispose.OaApprovalApplicationDisposeDTO;
+import com.ruoyi.system.constants.AssetDeptConstant;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationDisposeDTO;
import com.ruoyi.system.query.OaApprovalApplicationDisposePageQuery;
-import com.ruoyi.system.service.OaApprovalApplicationDisposeService;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.vo.dispose.OaApprovalApplicationDisposePageVO;
+import com.ruoyi.system.service.OaApprovalApplicationDisposeService;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationDisposeDetailVO;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationDisposePageVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -17,6 +19,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -61,10 +64,10 @@
if (!isAdmin) {
try {
// 获取当前用户的部门名称
- String deptName = sysUserService.selectUserById(userId).getDept().getDeptName();
+ String deptName = sysUserService.selectUserById(userId).getDeptName();
// 非超级管理员且非资产管理部，设置部门权限
- if (!"资产管理部".equals(deptName)) {
+ if (!AssetDeptConstant.ASSET_DEPARTMENT_NAME.equals(deptName)) {
pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
}
} catch (Exception e) {
@@ -87,5 +90,12 @@
oaApprovalApplicationDisposeService.deleteByApplicationId(id);
return R.ok();
}
+
+ @ApiOperation("获取资产处置申请详情")
+ @GetMapping("/detail/{id}")
+ public R<OaApprovalApplicationDisposeDetailVO> getDisposeDetail(@ApiParam(name = "id", value = "申请单ID", required = true) @PathVariable Integer id) {
+ OaApprovalApplicationDisposeDetailVO detail = oaApprovalApplicationDisposeService.getDisposeDetail(id);
+ return R.ok(detail);
+ }
}
--
Gitblit v1.7.1