From 9e10fc0b510b00109927edb641325ff2720b9837 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 20 Mar 2024 15:47:53 +0800
Subject: [PATCH] 普查饼图接口，是否危害字段修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 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 0fdd537..6b24f8e 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
@@ -1,8 +1,12 @@
package cn.gistack.sm.sjztmd.controller;
import cn.gistack.sm.sjztmd.entity.TbDykeInvestigation;
+import cn.gistack.sm.sjztmd.entity.TbDykeInvestigationState;
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.StatisticsParams;
+import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.vo.TbDykeInvestigationParam;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -38,6 +42,7 @@
public class TbDykeInvestigationController {
private ITbDykeInvestigationService tbDykeInvestigationService;
+ private ITbDykeInvestigationStateService tbDykeInvestigationStateService;
private IAttResBaseService attResBaseService;
@ApiOperation(value = "中台水库-分页列表查询", notes = "中台水库-分页列表查询")
@@ -70,19 +75,27 @@
@PostMapping("/checkInfoByDykeGuid")
public R checkInfoByResGuid(@RequestBody TbDykeInvestigation tbDykeInvestigation) {
- if (tbDykeInvestigation.getDykeGuid() == null || tbDykeInvestigation.getCheckState() == null) {
+ if (tbDykeInvestigation.getTbStateId() == null || tbDykeInvestigation.getCheckState() == null) {
return R.fail(-1,"参数不对");
}
+ //查询根据状态id查询普查记录表
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("\"dyke_guid\"", tbDykeInvestigation.getDykeGuid());
+ queryWrapper.eq("\"tb_state_id\"", tbDykeInvestigation.getTbStateId());
List<TbDykeInvestigation> list = tbDykeInvestigationService.list(queryWrapper);
List<TbDykeInvestigation> editList = list.stream().map(categoryEntity -> {
categoryEntity.setCheckState(tbDykeInvestigation.getCheckState()); // 给每个categoryEntity对象的EvaluateTaskId属性设置新值
return categoryEntity; // 返回修改后的对象
})
.collect(Collectors.toList());
- return R.status(tbDykeInvestigationService.updateBatchById(editList));
+
+ TbDykeInvestigationState tbDykeInvestigationState = new TbDykeInvestigationState();
+ tbDykeInvestigationState.setGuid(tbDykeInvestigation.getTbStateId());
+ tbDykeInvestigationState.setCheckState(tbDykeInvestigation.getCheckState());
+
+
+ //更新普查记录表状态和状态表状态
+ return R.status(tbDykeInvestigationService.updateBatchById(editList) && tbDykeInvestigationStateService.updateById(tbDykeInvestigationState) );
}
@ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
@@ -119,4 +132,10 @@
return R.data(list);
}
+ @GetMapping("/statisticsPie")
+ public R statisticsPie(StatisticsParams statisticsParams){
+ StatisticsPie statisticsPie = tbDykeInvestigationService.statisticsPie(statisticsParams);
+ return R.data(statisticsPie);
+ }
+
}
--
Gitblit v1.9.3