From ab5c1c6cbcdeb98d84bdde3c111fe871466d3a5c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Wed, 15 May 2024 10:38:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 39f9cbe..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
@@ -9,6 +9,7 @@
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;
@@ -103,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);
}
@@ -142,9 +143,16 @@
}
@GetMapping("/statisticsBar")
- public R statisticsBar(StatisticsParams statisticsParams){
+ 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