From 22b6ef7fef37496b54579d62b97e6b4e522af904 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 27 Jun 2024 18:16:41 +0800
Subject: [PATCH] 湖北水库:施工:项目列表(查询所有项目)

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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 db8db9c..e28c647 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
@@ -45,6 +45,16 @@
 		return R.data(page);
 	}
 
+
+	/**
+	 * 查询所有接口
+	 */
+	@GetMapping(value = "/list_all")
+	public R queryPageList(ProjectSearchDTO searchDTO) {
+		List<SgProjectInfoDO> list = sgProjectInfoService.listAll(searchDTO);
+		return R.data(list);
+	}
+
 	/**
 	 * 查询项目进度情况
 	 */
@@ -65,16 +75,25 @@
 	}
 
 	/**
+	 * 项目进度列表(分页)
+	 */
+	@GetMapping(value = "/project_progress_page")
+	public R progressPage(ProjectSearchDTO searchDTO,Query query) {
+		IPage<SgProjectInfoVO> page= sgProjectInfoService.progressPage(Condition.getPage(query),searchDTO);
+		return R.data(page);
+	}
+
+	/**
 	 * 首页项目统计(APP)
 	 */
 	@GetMapping(value = "/project_count")
 	public R projectCount(ProjectSearchDTO searchDTO) {
-		Map<String,Long> map = sgProjectInfoService.projectCount(searchDTO);
+		Map<String,Object> map = sgProjectInfoService.projectCount(searchDTO);
 		return R.data(map);
 	}
 
 	/**
-	 * 导入用户
+	 * 导入项目
 	 */
 	@PostMapping("import_project")
 	public R importUser(MultipartFile file, Integer isCovered) {

--
Gitblit v1.9.3