From 2aa0dd9c34c6be86e70b1d2d939d3660552cb514 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 九月 2025 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java
index 449a6ac..483dcdb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java
@@ -1,20 +1,61 @@
package com.ruoyi.web.controller.api;
-
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageGeneralDTO;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationStoragePropertyDTO;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageVehicleDTO;
+import com.ruoyi.system.service.OaApprovalApplicationStorageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+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
+ * @author CodeBuddy
+ * @since 2025-09-17
*/
+@Api(tags = {"OA审批-资产入库申请相关接口"})
+@Validated
@RestController
@RequestMapping("/oa-approval-application-storage")
+@RequiredArgsConstructor
public class OaApprovalApplicationStorageController {
-}
+ private final OaApprovalApplicationStorageService oaApprovalApplicationStorageService;
+ @ApiOperation("提交通用资产入库申请")
+ @PostMapping("/submit-general")
+ @Log(title = "通用资产入库申请-提交", businessType = BusinessType.INSERT)
+ public R<Void> submitGeneralAssetStorage(@Valid @RequestBody OaApprovalApplicationStorageGeneralDTO dto) {
+ oaApprovalApplicationStorageService.submitGeneralAssetStorage(dto);
+ return R.ok();
+ }
+
+ @ApiOperation("提交房产资产入库申请")
+ @PostMapping("/submit-property")
+ @Log(title = "房产资产入库申请-提交", businessType = BusinessType.INSERT)
+ public R<Void> submitPropertyAssetStorage(@Valid @RequestBody OaApprovalApplicationStoragePropertyDTO dto) {
+ oaApprovalApplicationStorageService.submitPropertyAssetStorage(dto);
+ return R.ok();
+ }
+
+ @ApiOperation("提交车辆资产入库申请")
+ @PostMapping("/submit-vehicle")
+ @Log(title = "车辆资产入库申请-提交", businessType = BusinessType.INSERT)
+ public R<Void> submitVehicleAssetStorage(@Valid @RequestBody OaApprovalApplicationStorageVehicleDTO dto) {
+ oaApprovalApplicationStorageService.submitVehicleAssetStorage(dto);
+ return R.ok();
+ }
+}
\ No newline at end of file
--
Gitblit v1.7.1