From 4232f019052adb8832a4796bbc777c329e1f1117 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 15 May 2024 09:13:59 +0800
Subject: [PATCH] 普查新增、修改接口调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
index 126107a..dc066aa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
@@ -6,6 +6,10 @@
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbResGeneralInvestigationService;
import cn.gistack.sm.sjztmd.service.ITbResGeneralInvestigationStateService;
+import cn.gistack.sm.sjztmd.statisticsVO.StatisticsBar;
+import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams;
+import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
+import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTable;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.vo.TbResGeneralInvestigationParam;
import cn.gistack.sm.sjztmd.wrapper.AttResBaseWrapper;
@@ -100,9 +104,9 @@
@ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
@PostMapping(value = "/submit")
public R submit(@RequestBody TbResGeneralInvestigation tbResGeneralInvestigation) {
- if (tbResGeneralInvestigation.getGuid() == null) {
- tbResGeneralInvestigation.setCreateTime(new Date());
- }
+// if (tbResGeneralInvestigation.getGuid() == null) {
+ tbResGeneralInvestigation.setCreateTime(new Date());
+// }
return tbResGeneralInvestigationService.saveOrUpdateBy(tbResGeneralInvestigation);
}
@@ -130,4 +134,25 @@
return R.data(list);
}
+
+
+ @GetMapping("/statisticsPie")
+ public R statisticsPie(StatisticsParams statisticsParams){
+ StatisticsPie statisticsPie = tbResGeneralInvestigationService.statisticsPie(statisticsParams);
+ return R.data(statisticsPie);
+ }
+
+ @GetMapping("/statisticsBar")
+ public R statisticsBarProvince(StatisticsParams statisticsParams){
+ List<StatisticsBar> list = tbResGeneralInvestigationService.statisticsBar(statisticsParams);
+ return R.data(list);
+ }
+
+
+ @GetMapping("/statisticsTable")
+ public R statisticsTable(StatisticsParams statisticsParams){
+ List<StatisticsTable> list = tbResGeneralInvestigationService.statisticsTable(statisticsParams);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3