From 5e972eb9928c39b5abbdfd35e2a0aeff40876e7d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 07 May 2024 17:23:16 +0800
Subject: [PATCH] 修改不成功问题
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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 eb8dcb2..b8e986b 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,13 @@
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.StatisticsBar;
+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;
@@ -19,6 +24,7 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -30,19 +36,20 @@
* @DATE: 2024/1/3 14:39
*/
@Slf4j
-@Api(tags = "白蚁普查")
+@Api(tags = "堤防普查")
@RestController
@RequestMapping("/sjztmd/tbDykeInvestigation")
@AllArgsConstructor
public class TbDykeInvestigationController {
private ITbDykeInvestigationService tbDykeInvestigationService;
+ private ITbDykeInvestigationStateService tbDykeInvestigationStateService;
private IAttResBaseService attResBaseService;
@ApiOperation(value = "中台水库-分页列表查询", notes = "中台水库-分页列表查询")
@GetMapping(value = "/queryPageResList")
public R queryPageResList(AttResBaseGeneralInvestigationVO attResBase, Query query) {
- IPage<AttResBaseGeneralInvestigationVO> pageList = attResBaseService.selectAttResBaseGeneralInvestigation(Condition.getPage(query), attResBase);
+ Object pageList = attResBaseService.selectAttResBaseGeneralInvestigation(Condition.getPage(query), attResBase);
return R.data(pageList);
}
@@ -55,9 +62,9 @@
if (!StringUtil.isBlank(param.getDykeName()))
queryWrapper.like("\"dyke_name\"", param.getDykeName());
if (!StringUtil.isBlank(param.getDykeGuid()))
- queryWrapper.like("\"dyke_guid\"", param.getDykeGuid());
+ queryWrapper.eq("\"dyke_guid\"", param.getDykeGuid());
if (!StringUtil.isBlank(param.getCreateUser()))
- queryWrapper.like("\"create_user\"", param.getCreateUser());
+ queryWrapper.eq("\"create_user\"", param.getCreateUser());
if (null != param.getTbYear())
queryWrapper.like("\"tb_year\"", param.getTbYear());
if (!StringUtil.isBlank(param.getTbQuarter()))
@@ -69,19 +76,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 = "白蚁普查-添加或者修改")
@@ -102,8 +117,10 @@
@PostMapping("/remove")
@ApiOperation(value = "物理删除", notes = "传入id")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String id) {
- return R.status(tbDykeInvestigationService.removeById(id));
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+
+// return R.status(tbDykeInvestigationService.removeBatchByIds(Arrays.asList(ids.split(","))));
+ return R.status(tbDykeInvestigationService.removeByIds(Arrays.asList(ids.split(","))));
}
@PostMapping("/getInvestigationListByStateId")
@@ -116,4 +133,16 @@
return R.data(list);
}
+ @GetMapping("/statisticsPie")
+ public R statisticsPie(StatisticsParams statisticsParams){
+ StatisticsPie statisticsPie = tbDykeInvestigationService.statisticsPie(statisticsParams);
+ 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