From daf4ede1b07dd92aa3e5cbc80c401a56cb74d7ec Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 08 Aug 2024 14:53:22 +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 | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 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 e28c647..9e0ee55 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;
@@ -14,10 +17,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -39,8 +39,11 @@
/**
* 分页列表查询
*/
- @GetMapping(value = "/list")
- public R queryPageList(ProjectSearchDTO searchDTO, Query query) {
+ @PostMapping(value = "/list")
+ public R queryPageListPage(@RequestBody ProjectSearchDTO searchDTO) {
+ Query query = new Query();
+ query.setCurrent(searchDTO.getCurrent());
+ query.setSize(searchDTO.getSize());
IPage<SgProjectInfoDO> page = sgProjectInfoService.queryPageList(Condition.getPage(query), searchDTO);
return R.data(page);
}
@@ -101,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