From 614ed340b4a3d0f2cba0d37fd2d494aafb68479a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 06 Jan 2024 08:52:25 +0800
Subject: [PATCH] 白蚁普查增加水库名称查询
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
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 70f85d2..78f325d 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
@@ -15,6 +15,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -48,8 +49,11 @@
@ApiOperation(value = "分页", notes = "白蚁普查分页")
public R list(@ApiIgnore TbResGeneralInvestigation param, Query query) {
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("\"check_state\"", param.getCheckState());
- return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query),queryWrapper));
+ if (null != param.getCheckState())
+ queryWrapper.eq("\"check_state\"", param.getCheckState());
+ if (!StringUtil.isBlank(param.getResName()))
+ queryWrapper.like("\"res_name\"", param.getResName());
+ return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query), queryWrapper));
}
@ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
--
Gitblit v1.9.3