From aa17cc9993090ab021a6c1f440a2f2fe3f89a98d Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期五, 17 三月 2023 15:55:21 +0800
Subject: [PATCH] 修改条件查询接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java | 21 +++++++++------------
zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java | 4 ++++
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
4 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
index 2710cf2..1afcf61 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
@@ -6,7 +6,9 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.PageParams;
import com.ruoyi.domain.ZfProperty;
@@ -17,6 +19,9 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
* @Version 1.0
@@ -31,18 +36,10 @@
private IZfPropertyService zfPropertyService;
@GetMapping("/all")
- public AjaxResult listAll(PageParams pageParams){
-
- Page<ZfProperty> page = new Page<ZfProperty>(pageParams.getPageNum(),pageParams.getPageSize());
- Page<ZfProperty> pageResult = zfPropertyService.page(page);
- AjaxResult success = AjaxResult.success();
- success.put("msg","鎿嶄綔鎴愬姛");
- success.put("code",200);
- success.put("data",pageResult.getRecords());
- success.put("total",pageResult.getTotal());
- success.put("pageNum",pageResult.getCurrent());
- success.put("pageSize",pageResult.getSize());
- return success;
+ public AjaxResult listAll(@RequestBody ZfProperty zfProperty){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfPropertyService.selectUserList(zfProperty,pageNum,pageSize);
}
// /**
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
index c0bb592..2954224 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
@@ -53,7 +53,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name="鍒涘缓鏃堕棿")
- private LocalDateTime createTime= LocalDateTime.now();
+ private LocalDateTime createTime;
private String url;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
index dd9a2b3..e6a397f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
@@ -1,9 +1,12 @@
package com.ruoyi.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.PageParams;
import com.ruoyi.domain.ZfProperty;
import java.time.LocalDateTime;
+import java.util.List;
/**
@@ -13,5 +16,6 @@
*/
public interface IZfPropertyService extends IService<ZfProperty>
{
+ AjaxResult selectUserList(ZfProperty zfProperty,Integer pageNum,Integer pageSize);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 6cca910..09cf3f4 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -1,10 +1,17 @@
package com.ruoyi.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.PageParams;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.IZfPropertyService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
@@ -15,7 +22,32 @@
@Service
public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {
+ @Override
+ public AjaxResult selectUserList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
+ LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
+ lqw.like(!StringUtils.isEmpty(zfProperty.getType()),ZfProperty::getType,zfProperty.getType());
+ lqw.like(!StringUtils.isEmpty(zfProperty.getTitle()),ZfProperty::getTitle,zfProperty.getTitle());
+ lqw.like(!StringUtils.isEmpty(zfProperty.getLocation()),ZfProperty::getLocation,zfProperty.getLocation());
+ lqw.like(!StringUtils.isEmpty(zfProperty.getHolder()),ZfProperty::getHolder,zfProperty.getHolder());
+ lqw.like(!StringUtils.isEmpty(zfProperty.getAddress()),ZfProperty::getAddress,zfProperty.getAddress());
+ lqw.like(!StringUtils.isEmpty(zfProperty.getRemark()),ZfProperty::getRemark,zfProperty.getRemark());
+ lqw.like(zfProperty.getCreateTime()!=null,ZfProperty::getCreateTime,zfProperty.getCreateTime());
+
+ Page<ZfProperty> zfPropertyPage = new Page<>(pageNum,pageSize);
+ Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
+
+ AjaxResult success = AjaxResult.success();
+ success.put("msg","鎿嶄綔鎴愬姛");
+ success.put("code",200);
+ success.put("data",pageResult.getRecords());
+ success.put("total",pageResult.getTotal());
+ success.put("pageNum",pageResult.getCurrent());
+ success.put("pageSize",pageResult.getSize());
+
+ return success;
+
+ }
}
--
Gitblit v1.9.1