From a331dacaa853a79efb78937dd49e5f6cca22ba69 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 11 Jan 2024 11:49:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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..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;
@@ -15,6 +16,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;
@@ -38,18 +40,23 @@
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")
@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());
+ if (!StringUtil.isBlank(param.getResGuid()))
+ queryWrapper.like("\"res_guid\"", param.getResGuid());
+ return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query), queryWrapper));
}
@ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
--
Gitblit v1.9.3