From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 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..480e067 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
@@ -3,6 +3,9 @@
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.excel.ProjectExcel;
import cn.gistack.sm.sg.excel.ProjectImport;
import cn.gistack.sm.sg.service.SgProjectInfoService;
@@ -45,6 +48,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 +78,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) {
@@ -82,4 +104,31 @@
ExcelUtil.save(file, projectImport, ProjectExcel.class);
return R.success("操作成功");
}
+
+ /**
+ * 统计项目饼状图
+ */
+ @GetMapping("statisticsce")
+ public R projectStatisSum(String code) {
+ SgStatisticsVO sgStatisticsVO = sgProjectInfoService.getsgStatistics(code);
+ return R.data(sgStatisticsVO);
+ }
+
+ /**
+ * 统计项目图列表
+ */
+ @GetMapping("statisticsBarlist")
+ public R projectStatisList(String code) {
+ List<SgStatisProVO> sgStatisProVOS = sgProjectInfoService.getsgStatisticsList(code);
+ return R.data(sgStatisProVOS);
+ }
+
+ /**
+ * 统计项目柱状图
+ */
+ @GetMapping("statisticsBar")
+ public R projectStatis(String code) {
+ List<SgStatistccVO> sgStatisProVOS = sgProjectInfoService.getsgStatisticscc(code);
+ return R.data(sgStatisProVOS);
+ }
}
--
Gitblit v1.9.3