From bcf551a979c1468cf3d395f5c795a5f76f078466 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Sun, 29 Sep 2024 16:04:57 +0800
Subject: [PATCH] 湖北水库：施工项目批量删除报错、导出报错
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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..9f1be3e 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);
}
@@ -138,15 +136,43 @@
@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);
+ }
+
+
+ /**
+ * 水库列表
+ */
+ @GetMapping("res_list")
+ public R resList(ProjectSearchDTO dto,Query query) {
+ IPage<ResVO> page= sgProjectInfoService.resList(Condition.getPage(query),dto);
+ return R.data(page);
+ }
+
+ /**
+ * 删除项目
+ */
+ @PostMapping("delete")
+ public R delete(@RequestParam(name="ids",required=true) String ids) {
+ sgProjectInfoService.delete(ids);
+ return R.success("删除成功");
+ }
}
--
Gitblit v1.9.3