From 8018e564729067b0b61a5c992b5667dbcad39c70 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 13 Sep 2024 23:12:15 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java | 18 ++++++++++++------
1 files changed, 12 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 ed1070d..3c63867 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,10 +2,7 @@
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;
@@ -139,15 +136,24 @@
@PostMapping("add")
public R add(@RequestBody SgProjectInfoDO sgProjectInfoDO) {
sgProjectInfoService.save(sgProjectInfoDO);
- return R.success("新增成功");
+ return R.data(sgProjectInfoDO);
}
/**
- * 新增项目
+ * 修改项目
*/
@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