From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/oA/controller/OaProjectController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/oA/controller/OaProjectController.java b/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
index 8862fb5..67cbcaf 100644
--- a/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
+++ b/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
@@ -3,26 +3,25 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedger;
import com.ruoyi.oA.dto.OaProjectDto;
import com.ruoyi.oA.pojo.OaProject;
import com.ruoyi.oA.service.OaProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
@Api(tags = "oA椤圭洰绠＄悊")
@RestController
+@AllArgsConstructor
@RequestMapping("/oA/project")
public class OaProjectController {
- @Autowired
- private OaProjectService oaProjectService;
+ private final OaProjectService oaProjectService;
@ApiOperation("鑾峰彇椤圭洰鍒楄〃")
@GetMapping("/listPage")
@@ -66,7 +65,7 @@
// }
@ApiOperation("瀵煎嚭鎵�閫夐」鐩�")
@PostMapping("/export/{ids}")
- public void export(HttpServletResponse response,@PathVariable("ids") List<Long> ids) {
+ public void export(HttpServletResponse response, @PathVariable("ids") List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
throw new IllegalArgumentException("瀵煎嚭椤圭洰鍒楄〃涓嶈兘涓虹┖");
}
--
Gitblit v1.9.3