用户列表增加查询条件

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -93,6 +93,7 @@ import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.teacher.entity.BaseTeacher;
+import com.xjrsoft.module.teacher.entity.BaseTeacherRegular;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.workflow.constant.WorkflowConstant;
 import com.xjrsoft.module.workflow.entity.WorkflowCirculated;
@@ -210,6 +211,7 @@ public class UserController {
                     .like(StrUtil.isNotBlank(dto.getUserName()), User::getUserName, dto.getUserName())
                     .like(StrUtil.isNotBlank(dto.getCode()), User::getCode, dto.getCode())
                     .like(StrUtil.isNotBlank(dto.getName()), User::getName, dto.getName())
+                    .like(StrUtil.isNotBlank(dto.getTeachingStatus()), BaseTeacherRegular::getTeachingStatus, dto.getTeachingStatus())
                     .like(StrUtil.isNotBlank(dto.getMobile()), User::getMobile, dto.getMobile())
                     .eq((ObjectUtil.isNotNull(dto.getTreeType()) && dto.getTreeType() == 1), Role::getId, dto.getTreeId())
                     .eq((ObjectUtil.isNotNull(dto.getTreeType()) && dto.getTreeType() == 2), UserDeptRelation::getDeptId, dto.getTreeId())
@@ -229,6 +231,7 @@ public class UserController {
                     .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
                     .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, User::getId)
                     .leftJoin(BaseTeacher.class, BaseTeacher::getUserId, User::getId)
+                    .leftJoin(BaseTeacherRegular.class, BaseTeacherRegular::getUserId, User::getId)
                     .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, User::getId)
                     .leftJoin(DictionaryDetail.class, "d1", DictionaryDetail::getCode, BaseTeacher::getEmployWay)
                     .leftJoin(DictionaryDetail.class, "d2", DictionaryDetail::getCode, BaseTeacher::getEmployType)
@@ -274,6 +277,7 @@ public class UserController {
                             .like(StrUtil.isNotBlank(dto.getCode()), User::getCode, dto.getCode())
                             .like(StrUtil.isNotBlank(dto.getName()), User::getName, dto.getName())
                             .like(StrUtil.isNotBlank(dto.getMobile()), User::getMobile, dto.getMobile())
+                            .like(StrUtil.isNotBlank(dto.getTeachingStatus()), BaseTeacherRegular::getTeachingStatus, dto.getTeachingStatus())
                             .eq(ObjectUtil.isNotNull(dto.getUserType()), Role::getId, dto.getUserType())
                             .eq((ObjectUtil.isNotNull(dto.getTreeType()) && dto.getTreeType() == 1), Role::getId, dto.getTreeId())
                             .eq((ObjectUtil.isNotNull(dto.getTreeType()) && dto.getTreeType() == 2), UserDeptRelation::getDeptId, dto.getTreeId())
@@ -293,6 +297,7 @@ public class UserController {
                             .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, User::getId)
                             .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
                             .leftJoin(BaseTeacher.class, BaseTeacher::getUserId, User::getId)
+                            .leftJoin(BaseTeacherRegular.class, BaseTeacherRegular::getUserId, User::getId)
                             .leftJoin(DictionaryDetail.class, "d1", DictionaryDetail::getCode, BaseTeacher::getEmployWay)
                             .leftJoin(DictionaryDetail.class, "d2", DictionaryDetail::getCode, BaseTeacher::getEmployType)
                             .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId);

src/main/java/com/xjrsoft/module/organization/dto/UserPageDto.java

@@ -46,4 +46,7 @@ public class UserPageDto extends PageInput {
 
     @ApiModelProperty("班级id")
     private Long classId;
+
+    @ApiModelProperty("教学状态")
+    private String teachingStatus;
 }