From 595a52b5812c243918d91cfd339fb06491970abc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 17:10:26 +0800
Subject: [PATCH] 补提交类文件
---
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
index ee36545..973bccf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
@@ -6,9 +6,8 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoIr.IrProject;
-import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voIr.VoProject;
-import com.dy.pipIrrGlobal.voPr.VoIntake;
+import com.dy.pipIrrGlobal.voIr.VoProjectOne;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrIrrigate.result.IrrigateResultCode;
import io.swagger.v3.oas.annotations.Operation;
@@ -20,14 +19,15 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.lang.reflect.Array;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
/**
* @author :WuZeYu
@@ -221,13 +221,11 @@
})
@GetMapping(path = "one")
@SsoAop()
- public BaseResponse<IrProject> one(@RequestParam Long id) {
- IrProject irProject = this.projectSv.selectById(id);
- if (irProject == null) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.NO_PROJECT.getMessage());
- } else {
+ public BaseResponse<VoProjectOne> one(@RequestParam Long id) {
+ VoProjectOne irProject = this.projectSv.selectById(id);
+
return BaseResponseUtils.buildSuccess(irProject);
- }
+
}
/**
@@ -246,12 +244,9 @@
})
@GetMapping(path = "some")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoProject>>> getIntakes(QueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoProject>>> getProjects(QueryVo vo) {
try {
QueryResultVo<List<VoProject>> res = projectSv.getProjects(vo);
- if (res == null) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.NO_PROJECT.getMessage());
- }
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇椤圭洰璁板綍寮傚父", e);
--
Gitblit v1.8.0