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/sjztmd/controller/TbProjectController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbProjectController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbProjectController.java
index edbf646..5060397 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbProjectController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbProjectController.java
@@ -1,12 +1,14 @@
package cn.gistack.sm.sjztmd.controller;
import cn.gistack.sm.sjztmd.dto.TbProjectDTO;
+import cn.gistack.sm.sjztmd.dto.TbProjectIsfillDTO;
import cn.gistack.sm.sjztmd.excel.TbProjectExcel;
import cn.gistack.sm.sjztmd.excel.TbProjectImporter;
import cn.gistack.sm.sjztmd.service.ITbProjectService;
-import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams;
-import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTable;
-import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTableProject;
+import cn.gistack.sm.sjztmd.statisticsVO.*;
+import cn.gistack.sm.sjztmd.vo.StatisticsPrice;
+import cn.gistack.sm.sjztmd.vo.StatisticsPriceVO;
+import cn.gistack.sm.sjztmd.vo.TbProjectIsfillVO;
import cn.gistack.sm.sjztmd.vo.TbProjectVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -74,4 +76,44 @@
return R.success("操作成功");
}
+ /**
+ *校验
+ * @param id
+ * @return
+ */
+ @PostMapping("checkInfoByGuid")
+ public R checkInfoByGuid(@RequestParam String id,@RequestParam String checkState){
+
+ return R.status(tbProjectService.updatecheckState(id,checkState));
+ }
+
+ /**
+ * 项目管理统计饼状图
+ * @param statisticsParams
+ * @return
+ */
+
+ @GetMapping("/statisticsPie")
+ public R statisticsPie(StatisticsParams statisticsParams){
+ StatisticsPrice statisticsPrice = tbProjectService.statisticsPie(statisticsParams);
+ return R.data(statisticsPrice);
+ }
+
+ @GetMapping("/statisticsBar")
+ public R statisticsBar(StatisticsParams statisticsParams){
+ List<StatisticsPriceVO> list = tbProjectService.statisticsBar(statisticsParams);
+ return R.data(list);
+ }
+
+ @PostMapping("isFill")
+ public R isFill(@RequestBody TbProjectIsfillDTO fil ){
+ tbProjectService.updateFill(fil);
+ return R.success("操作成功");
+ }
+
+ @GetMapping("/isfillList")
+ public R isFillList(){
+ TbProjectIsfillVO tbProjectIsfillVO = tbProjectService.getfill();
+ return R.data(tbProjectIsfillVO);
+ }
}
--
Gitblit v1.9.3