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/TbDykeInvestigationController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
index 6b24f8e..034863e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
@@ -5,6 +5,7 @@
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbDykeInvestigationService;
import cn.gistack.sm.sjztmd.service.ITbDykeInvestigationStateService;
+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.vo.AttResBaseGeneralInvestigationVO;
@@ -101,9 +102,9 @@
@ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
@PostMapping(value = "/submit")
public R submit(@RequestBody TbDykeInvestigation tbDykeInvestigation) {
- if (tbDykeInvestigation.getGuid() == null) {
- tbDykeInvestigation.setCreateTime(new Date());
- }
+// if (tbDykeInvestigation.getGuid() == null) {
+ tbDykeInvestigation.setCreateTime(new Date());
+// }
return tbDykeInvestigationService.saveOrUpdateBy(tbDykeInvestigation);
}
@@ -138,4 +139,10 @@
return R.data(statisticsPie);
}
+ @GetMapping("/statisticsBar")
+ public R statisticsBar(StatisticsParams statisticsParams){
+ List<StatisticsBar> list = tbDykeInvestigationService.statisticsBar(statisticsParams);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3