字典表查询

py-base/src/main/java/com/poyee/base/dto/BaseReq.java

@@ -17,6 +17,9 @@ import java.util.List;
 @Data
 public class BaseReq {
 
+    @ApiModelProperty("搜索关键字")
+    @TableField(exist = false)
+    private String keyword;
     @ApiModelProperty(value = "数据源",example = "slave", required = true,hidden = true)
     @TableField(exist = false)
     private String dbVersion;

py-base/src/main/java/com/poyee/common/dict/controller/DictController.java

@@ -1,6 +1,8 @@
 package com.poyee.common.dict.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.poyee.base.controller.BaseController;
 import com.poyee.base.dto.Result;
@@ -12,6 +14,7 @@ import com.poyee.common.dict.service.IDictTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,10 +47,20 @@ public class DictController extends BaseController {
     @ApiOperation(value = "字典表type列表")
     @PostMapping("/type/list")
     public Result listDictType(@RequestBody DictType dictType) {
-        Page<DictType> pageInfo = dictTypeService.page(dictType);
+        LambdaQueryWrapper<DictType> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(StringUtils.isNotBlank(dictType.getDictType()), DictType::getDictType, dictType.getDictType());
+        queryWrapper.eq(dictType.getStatus() != null, DictType::getStatus, dictType.getStatus());
+        if(StringUtils.isNotBlank(dictType.getKeyword())) {
+            queryWrapper.nested(q -> q.like(DictType::getDictType, dictType.getKeyword())
+                    .or()
+                    .like(DictType::getDictName, dictType.getKeyword()));
+        }
+        Page<DictType> dictTypePage = new Page<>(dictType.getPageNo(),dictType.getPageSize());
+        Page<DictType> pageInfo = dictTypeService.page(dictTypePage,queryWrapper);
         return Result.success(pageInfo);
     }
 
+
     @ApiOperation(value = "字典表type新增")
     @PostMapping("/type/add")
     public Result addDictType(@RequestBody DictType dictType) {
@@ -65,10 +78,12 @@ public class DictController extends BaseController {
 
     @ApiOperation(value = "字典表Data列表")
     @PostMapping("/data/list")
-
     public Result listDictData(@RequestBody DictData dictData) {
         Page<DictData> dictDataPage = new Page<>(dictData.getPageNo(), dictData.getPageSize());
-        Page<DictData> pageInfo = dictDataService.page(dictDataPage);
+        LambdaQueryWrapper<DictData> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(dictData.getDictType()), DictData::getDictType, dictData.getDictType());
+        queryWrapper.eq(dictData.getStatus() != null, DictData::getStatus, dictData.getStatus());
+        Page<DictData> pageInfo = dictDataService.page(dictDataPage,queryWrapper);
         return Result.success(pageInfo);
     }
 

py-base/src/main/java/com/poyee/common/dict/query/DictQuery.java

@@ -23,6 +23,6 @@ public class DictQuery extends BaseReq {
     private boolean userCache;
 
     private Integer status;
-    protected String keyword;
+
 
 }