Pārlūkot izejas kodu

台账模块,增加名称搜索

dzx 1 gadu atpakaļ
vecāks
revīzija
ebb4cf1a5c

+ 5 - 1
src/main/java/com/xjrsoft/module/ledger/controller/LedgerConfigController.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.ledger.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.RT;
@@ -50,7 +51,10 @@ public class LedgerConfigController {
     @SaCheckPermission("ledgerconfig:detail")
     public RT<PageOutput<LedgerConfigPageVo>> page(@Valid LedgerConfigPageDto dto){
         LambdaQueryWrapper<LedgerConfig> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.orderByDesc(LedgerConfig::getId).select(LedgerConfig.class,x -> VoToColumnUtil.fieldsToColumns(LedgerConfigPageVo.class).contains(x.getProperty()));
+        queryWrapper
+        .like(StrUtil.isNotEmpty(dto.getName()), LedgerConfig::getName, dto.getName())
+        .orderByDesc(LedgerConfig::getId)
+        .select(LedgerConfig.class,x -> VoToColumnUtil.fieldsToColumns(LedgerConfigPageVo.class).contains(x.getProperty()));
         IPage<LedgerConfig> page = ledgerConfigService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LedgerConfigPageVo> pageOutput = ConventPage.getPageOutput(page, LedgerConfigPageVo.class);
         return RT.ok(pageOutput);

+ 3 - 1
src/main/java/com/xjrsoft/module/ledger/dto/LedgerConfigPageDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.ledger.dto;
 
 import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,5 +16,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class LedgerConfigPageDto extends PageInput {
 
-
+    @ApiModelProperty("台账名称")
+    private String name;
 }

+ 3 - 1
src/main/java/com/xjrsoft/module/ledger/dto/LedgerConfigReleasePageDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.ledger.dto;
 
 import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,5 +16,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class LedgerConfigReleasePageDto extends PageInput {
 
-
+    @ApiModelProperty("台账名称")
+    private String name;
 }

+ 3 - 0
src/main/resources/mapper/ledger/LedgerConfigReleaseMapper.xml

@@ -8,6 +8,9 @@
         LEFT JOIN xjr_menu t2 ON t1.menu_id = t2.id
         LEFT JOIN ledger_config t3 ON t1.ledger_config_id = t3.id
         WHERE t1.delete_mark = 0
+        <if test="dto.name != null and dto.name != ''">
+            and (t3.name like concat('%',#{dto.name},'%') or t2.title like concat('%',#{dto.name},'%'))
+        </if>
     </select>
 
 </mapper>