From 7215d4e27d9eede3bc16f282c957f2356d909c2d Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 30 Aug 2024 17:51:53 +0800
Subject: [PATCH] 湖北水库:工程项目树修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
index 29ca58a..20f5ce4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
@@ -2,13 +2,11 @@
 
 import cn.gistack.sm.sg.DO.SgProjectInfoDO;
 import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
-import cn.gistack.sm.sg.VO.SgProjectInfoVO;
-import cn.gistack.sm.sg.VO.SgStatisProVO;
-import cn.gistack.sm.sg.VO.SgStatistccVO;
-import cn.gistack.sm.sg.VO.SgStatisticsVO;
+import cn.gistack.sm.sg.VO.*;
 import cn.gistack.sm.sg.excel.ProjectExcel;
 import cn.gistack.sm.sg.excel.ProjectImport;
 import cn.gistack.sm.sg.service.SgProjectInfoService;
+import cn.gistack.sm.sjztmd.entity.AttResBase;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -44,7 +42,7 @@
 		Query query = new Query();
 		query.setCurrent(searchDTO.getCurrent());
 		query.setSize(searchDTO.getSize());
-		IPage<SgProjectInfoDO> page = sgProjectInfoService.queryPageList(Condition.getPage(query), searchDTO);
+		Object page = sgProjectInfoService.queryPageList(Condition.getPage(query), searchDTO);
 		return R.data(page);
 	}
 
@@ -142,11 +140,20 @@
 	}
 
 	/**
-	 * 新增项目
+	 * 修改项目
 	 */
 	@PostMapping("update")
 	public R update(@RequestBody SgProjectInfoDO sgProjectInfoDO) {
 		sgProjectInfoService.updateById(sgProjectInfoDO);
 		return R.success("修改成功");
 	}
+
+	/**
+	 * 项目树
+	 */
+	@GetMapping("project_tree")
+	public R projectTree(ProjectSearchDTO dto) {
+	List<SgProjectTreeVO> tree = sgProjectInfoService.projectTree(dto);
+		return R.data(tree);
+	}
 }

--
Gitblit v1.9.3