From 2b9cd5d7c0cf41bb1996079eb62bd4c390a27e12 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 18 Mar 2024 11:59:29 +0800
Subject: [PATCH] 删除接口修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java | 9 +++++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java | 6 ++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java | 5 +++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java | 6 +++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java | 2 +-
6 files changed, 21 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 0d8b7b1..0fdd537 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
@@ -43,7 +43,7 @@
@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);
}
@@ -104,7 +104,9 @@
@PostMapping("/remove")
@ApiOperation(value = "物理删除", notes = "传入id")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(tbDykeInvestigationService.removeBatchByIds(Arrays.asList(ids)));
+
+// return R.status(tbDykeInvestigationService.removeBatchByIds(Arrays.asList(ids.split(","))));
+ return R.status(tbDykeInvestigationService.removeByIds(Arrays.asList(ids.split(","))));
}
@PostMapping("/getInvestigationListByStateId")
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 a35c593..efbe60e 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
@@ -46,7 +46,7 @@
@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);
}
@@ -107,7 +107,8 @@
@PostMapping("/remove")
@ApiOperation(value = "物理删除", notes = "传入id")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(tbResGeneralInvestigationService.removeBatchByIds(Arrays.asList(ids)));
+// return R.status(tbResGeneralInvestigationService.removeBatchByIds(Arrays.asList(ids.split(","))));
+ return R.status(tbResGeneralInvestigationService.removeByIds(Arrays.asList(ids.split(","))));
}
@PostMapping("/getInvestigationListByStateId")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
index 03a4db0..809e719 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
@@ -22,7 +22,7 @@
IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase);
- IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase);
+ Object selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase);
IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
index 06a8623..d952bb5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -46,8 +46,13 @@
}
@Override
- public IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) {
- return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase));
+ public Object selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) {
+
+ if (attResBase.getIsPage()){
+ return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase));
+ }else {
+ return baseMapper.selectAttResBaseGeneralInvestigation(null,attResBase);
+ }
}
@Override
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
index a357ba9..58f60d8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
@@ -31,6 +31,10 @@
@Override
public IPage<TbResDykeVO> findTbResDykePcBy(IPage<TbResDykeVO> page, TbResDykeVO tbResDykeVO) {
- return page.setRecords(baseMapper.findTbResDykePcBy(page,tbResDykeVO));
+ if (tbResDykeVO.getIsPage()){
+ return page.setRecords(baseMapper.findTbResDykePcBy(page,tbResDykeVO));
+ }else {
+ return page.setRecords(baseMapper.findTbResDykePcBy(null,tbResDykeVO));
+ }
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java
index 8116d54..5272c56 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java
@@ -42,6 +42,6 @@
//其他危害处数
private int otherNum;
-
+ private Boolean isPage;
}
--
Gitblit v1.9.3