From 66797b34167669595dd28c93d41334a7a18fe474 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 06 Jan 2024 14:38:23 +0800
Subject: [PATCH] 白蚁普查相关
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 78f325d..f43707c 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
@@ -4,6 +4,7 @@
import cn.gistack.sm.sjztmd.entity.TbResGeneralInvestigation;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbResGeneralInvestigationService;
+import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.wrapper.AttResBaseWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,10 +40,10 @@
private IAttResBaseService attResBaseService;
@ApiOperation(value = "中台水库-分页列表查询", notes = "中台水库-分页列表查询")
- @GetMapping(value = "/resList")
- public R queryPageList(AttResBase attResBase, Query query) {
- IPage<AttResBase> pageList = attResBaseService.selectAttResBasePage(Condition.getPage(query), attResBase);
- return R.data(AttResBaseWrapper.build().pageVO(pageList));
+ @GetMapping(value = "/queryPageResList")
+ public R queryPageResList(AttResBaseGeneralInvestigationVO attResBase, Query query) {
+ IPage<AttResBaseGeneralInvestigationVO> pageList = attResBaseService.selectAttResBaseGeneralInvestigation(Condition.getPage(query), attResBase);
+ return R.data(pageList);
}
@GetMapping("/list")
@@ -53,6 +54,8 @@
queryWrapper.eq("\"check_state\"", param.getCheckState());
if (!StringUtil.isBlank(param.getResName()))
queryWrapper.like("\"res_name\"", param.getResName());
+ if (!StringUtil.isBlank(param.getResGuid()))
+ queryWrapper.like("\"res_guid\"", param.getResGuid());
return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query), queryWrapper));
}
--
Gitblit v1.9.3