实习教师收集审核

src/main/java/com/xjrsoft/module/internship/controller/InternshipTeacherCollectEnrollController.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.internship.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -45,6 +46,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.sql.Struct;
 import java.util.List;
 
 /**
@@ -191,6 +193,9 @@ public class InternshipTeacherCollectEnrollController {
                 .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, InternshipTeacherCollectEnroll::getUserId)
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getJobState)
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getEmployType)
+                .like(StrUtil.isNotEmpty(dto.getName()), User::getName, dto.getName())
+                .like(StrUtil.isNotEmpty(dto.getUserName()), User::getUserName, dto.getUserName())
+                .like(StrUtil.isNotEmpty(dto.getMobile()), User::getMobile, dto.getMobile())
                 .orderByDesc(InternshipTeacherCollect::getId);
         IPage<InternshipTeacherCollectEnrollExamPageVo> page = internshipTeacherCollectEnrollService.selectJoinListPage(ConventPage.getPage(dto), InternshipTeacherCollectEnrollExamPageVo.class, queryWrapper);
         PageOutput<InternshipTeacherCollectEnrollExamPageVo> pageOutput = ConventPage.getPageOutput(page, InternshipTeacherCollectEnrollExamPageVo.class);

src/main/java/com/xjrsoft/module/internship/dto/InternshipTeacherCollectEnrollPageDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.internship.dto;
 
 import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,4 +16,12 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class InternshipTeacherCollectEnrollPageDto extends PageInput {
 
+    @ApiModelProperty("工号")
+    private String userName;
+
+    @ApiModelProperty("教师姓名")
+    private String name;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
 }