From 2bdcf12109e62a731eb16e90b6e1c39a67853fb1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 13 十月 2025 18:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 2 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 ae7dca6..d0e754f 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
@@ -1,20 +1,101 @@
package com.ruoyi.web.controller.api;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.constants.AssetDeptConstant;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationDisposeDTO;
+import com.ruoyi.system.query.OaApprovalApplicationDisposePageQuery;
+import com.ruoyi.system.service.ISysUserService;
+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;
+import lombok.RequiredArgsConstructor;
+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;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.validation.Valid;
+
/**
* <p>
- * 资产领用单明细表 前端控制器
+ * 资产处置单明细表 前端控制器
* </p>
*
* @author WuGuanFengYue
* @since 2025-09-15
*/
+@Validated
@RestController
+@Api(tags = {"OA审批-资产处置相关接口"})
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
@RequestMapping("/oa-approval-application-dispose")
public class OaApprovalApplicationDisposeController {
+
+ private final OaApprovalApplicationDisposeService oaApprovalApplicationDisposeService;
+ private final ISysUserService sysUserService;
+ @ApiOperation("提交资产处置申请")
+ @PostMapping("/submit-dispose")
+ @Log(title = "资产处置申请-提交", businessType = BusinessType.INSERT)
+ public R<Void> submitDispose(@Valid @RequestBody OaApprovalApplicationDisposeDTO dto) {
+ oaApprovalApplicationDisposeService.submitDispose(dto);
+ return R.ok();
+ }
+
+ @ApiOperation("获取资产处置申请分页列表")
+ @PostMapping("/page-list")
+ public R<IPage<OaApprovalApplicationDisposePageVO>> getDisposePageList(@RequestBody OaApprovalApplicationDisposePageQuery pageQuery) {
+ // 数据权限：超级管理员/资产管理部查看所有数据，其他部门查看当前及下级部门的数据
+ Long userId = SecurityUtils.getUserId();
+ boolean isAdmin = SecurityUtils.isAdmin(userId);
+
+ if (!isAdmin) {
+ try {
+ // 获取当前用户的部门名称
+ String deptName = sysUserService.selectUserById(userId).getDept().getDeptName();
+
+ // 非超级管理员且非资产管理部，设置部门权限
+ if (!AssetDeptConstant.ASSET_DEPARTMENT_NAME.equals(deptName)) {
+ pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
+ }
+ } catch (Exception e) {
+ // 如果获取部门信息失败，默认设置部门权限
+ try {
+ pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
+ } catch (Exception ex) {
+ // ignore parse, leave null if cannot parse
+ }
+ }
+ }
+
+ IPage<OaApprovalApplicationDisposePageVO> page = oaApprovalApplicationDisposeService.getDisposePageList(pageQuery);
+ return R.ok(page);
+ }
+
+ @ApiOperation("删除处置申请")
+ @DeleteMapping("/{id}")
+ public R<?> deleteByApplicationId(@ApiParam(name = "id", value = "申请单ID", required = true) @PathVariable Integer id) {
+ 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