From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
index 5bdf496..0e14391 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.exam.vo.ExamPlanVO;
import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.sjztmd.entity.AttResStagChar;
import cn.gistack.sm.sjztmd.service.IAttAdBaseService;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
@@ -18,10 +19,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.node.ForestNodeMerger;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@@ -50,4 +49,53 @@
IPage<AttResBase> pageList = attResBaseService.selectAttResBasePage(Condition.getPage(query), attResBase);
return R.data(pageList);
}
+
+ @ApiOperation(value = "中台水库-查询该行政区下的水库", notes = "中台水库-查询该行政区下的水库")
+ @GetMapping(value = "/getListByRegion")
+ public R getListByRegion(@ApiIgnore @RequestParam Map<String, Object> obj,Query query) {
+ String code = obj.get("code").toString();
+ if (code.substring(0,4).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,2));
+ } else if (code.substring(0,6).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,4));
+ }
+// List<AttResBase> list = attResBaseService.getListByRegion(obj);
+ IPage<AttResBase> pageList = attResBaseService.getListByRegion(Condition.getPage(query),obj);
+ return R.data(pageList);
+ }
+
+ @ApiOperation(value = "中台水库-获取水库详情", notes = "中台水库-获取水库详情")
+ @GetMapping(value = "/getDetailByCode")
+ public R getDetailByCode(String code) {
+ AttResBase attResBase = attResBaseService.getDetailByCode(code);
+ return R.data(attResBase);
+ }
+
+ /**
+ * 获取水库对应责任人分页数据
+ * @param params 条件查询参数对象
+ * @param query 分页查询参数对象
+ * @return
+ */
+ @ApiOperation(value = "中台水库-获取水库对应责任人分页数据", notes = "中台水库-获取水库对应责任人分页数据")
+ @GetMapping(value = "/getAttResBaseUserPage")
+ public R getAttResBaseUserPage(@RequestParam Map<String, Object> params,Query query) {
+ return R.data(attResBaseService.getAttResBaseUserPage(Condition.getPage(query),params));
+ }
+
+ /**
+ * 编辑
+ *
+ * @param attResBase
+ * @return
+ */
+ @ApiOperation(value = "水库信息-编辑", notes = "水库信息-编辑")
+ @PostMapping(value = "/edit")
+ public R edit(@RequestBody AttResBase attResBase) {
+ if (StringUtil.isBlank(attResBase.getGuid())) {
+ return R.fail("参数不正确");
+ }
+ return R.data(attResBaseService.updateResBaseByGuid(attResBase));
+ }
+
}
--
Gitblit v1.9.3