/textbook/subjectGroup/page 增添搜索条件

src/main/java/com/xjrsoft/module/textbook/controller/SubjectGroupController.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.textbook.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
@@ -57,6 +58,8 @@ public class SubjectGroupController {
                 .selectAs(XjrUser::getName,SubjectGroupPageVo::getLeaderUserIdCN)
                 .select(SubjectGroup.class,x -> VoToColumnUtil.fieldsToColumns(SubjectGroupPageVo.class).contains(x.getProperty()))
                 .leftJoin(XjrUser.class,XjrUser::getId,SubjectGroup::getLeaderUserId)
+                .like(ObjectUtil.isNotNull(dto.getGroupName()) && dto.getGroupName().equals(""),SubjectGroup::getGroupName,dto.getGroupName())
+                .eq(ObjectUtil.isNotNull(dto.getLeaderUserId()) && dto.getLeaderUserId() > 0, SubjectGroup::getLeaderUserId, dto.getLeaderUserId())
                 .orderByDesc(SubjectGroup::getId);
         IPage<SubjectGroupPageVo> page = subjectGroupService.selectJoinListPage(ConventPage.getPage(dto),SubjectGroupPageVo.class, queryWrapper);
         for (SubjectGroupPageVo subjectGroupPageVo : page.getRecords()) {

src/main/java/com/xjrsoft/module/textbook/dto/SubjectGroupPageDto.java

@@ -4,12 +4,6 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**
@@ -21,6 +15,15 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class SubjectGroupPageDto extends PageInput {
-
+    /**
+     * 组名
+     */
+    @ApiModelProperty("组名")
+    private String groupName;
+    /**
+     * 组长用户编号
+     */
+    @ApiModelProperty("组长用户编号")
+    private Long leaderUserId;
 
 }

src/test/java/com/xjrsoft/xjrsoftboot/StrTest.java

@@ -10,7 +10,6 @@ import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.TextStyle;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -25,6 +24,13 @@ public class StrTest {
         System.out.println(StrUtil.format(f, "sdfsdf","bbbbbb"));
     }
 
+    @Test
+    public void arrayTest() {
+        String f = "《{}》等待{}审批。";
+
+        System.out.println(StrUtil.format(f, "sdfsdf","bbbbbb"));
+    }
+
     @Test
     public void date() throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");