修改车辆和老师人脸 部门查询

src/main/java/com/xjrsoft/module/personnel/controller/CarMessageApplyController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -19,6 +20,8 @@ import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.app.dto.UpdateEnableMarkDto;
 import com.xjrsoft.module.app.entity.AppFuncDesign;
 import com.xjrsoft.module.app.entity.AppMenu;
+import com.xjrsoft.module.attendance.entity.StudentAttendanceRecord;
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.personnel.dto.AddCarMessageApplyDto;
 import com.xjrsoft.module.personnel.dto.UpdateCarMessageApplyDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -64,20 +67,26 @@ public class CarMessageApplyController {
     @ApiOperation(value="车辆信息审核列表(分页)")
     @SaCheckPermission("carmessageapply:detail")
     public RT<PageOutput<CarMessageApplyPageVo>> page(@Valid CarMessageApplyPageDto dto){
-        IPage<CarMessageApplyPageVo> page = carMessageApplyService.selectJoinListPage(ConventPage.getPage(dto), CarMessageApplyPageVo.class,
-                MPJWrappers.<CarMessageApply>lambdaJoin()
-                        .orderByDesc(CarMessageApply::getId)
-                        .disableSubLogicDel()
-                        .like(StrUtil.isNotBlank(dto.getName()), XjrUser::getName,dto.getName())
-                        .eq(StrUtil.isNotBlank(dto.getUserName()), XjrUser::getUserName,dto.getUserName())
-                        .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
-                        .eq(ObjectUtil.isNotNull(dto.getDepId())&&dto.getDepId()!=0, CarMessageApply::getDeptId,dto.getDepId())
-                        .eq(ObjectUtil.isNotNull(dto.getStatus())&&dto.getStatus()!=0, CarMessageApply::getStatus,dto.getStatus())
-                        .select(CarMessageApply.class,x -> VoToColumnUtil.fieldsToColumns(CarMessageApplyPageVo.class).contains(x.getProperty()))
-                        .select(CarMessageApply::getId)
-                        .leftJoin(XjrUser.class,XjrUser::getId,CarMessageApply::getUserId, ext->ext.selectAs(XjrUser::getUserName, CarMessageApplyPageVo::getUserName).select(XjrUser::getMobile))
-                        .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,CarMessageApply::getGender, ext->ext.selectAs(DictionaryDetail::getName, CarMessageApplyPageVo::getGender))
-                );
+
+        MPJLambdaWrapper<CarMessageApply> queryWrapper =  MPJWrappers.<CarMessageApply>lambdaJoin()
+                .orderByDesc(CarMessageApply::getId)
+                .disableSubLogicDel()
+                .like(StrUtil.isNotBlank(dto.getName()), XjrUser::getName,dto.getName())
+                .eq(StrUtil.isNotBlank(dto.getUserName()), XjrUser::getUserName,dto.getUserName())
+                .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
+                .eq(ObjectUtil.isNotNull(dto.getStatus())&&dto.getStatus()!=0, CarMessageApply::getStatus,dto.getStatus())
+                .select(CarMessageApply.class,x -> VoToColumnUtil.fieldsToColumns(CarMessageApplyPageVo.class).contains(x.getProperty()))
+                .select(CarMessageApply::getId)
+                .leftJoin(XjrUser.class,XjrUser::getId,CarMessageApply::getUserId, ext->ext.selectAs(XjrUser::getUserName, CarMessageApplyPageVo::getUserName).select(XjrUser::getMobile))
+                .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,CarMessageApply::getGender, ext->ext.selectAs(DictionaryDetail::getName, CarMessageApplyPageVo::getGender))
+                ;
+
+        if(ObjectUtil.isNotNull(dto.getDepId())&&dto.getDepId()!=0) { // 要用用户关联部门查询
+            queryWrapper.leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, CarMessageApply::getUserId)
+                    .eq(UserDeptRelation::getDeptId, dto.getDepId());
+        }
+
+        IPage<CarMessageApplyPageVo> page = carMessageApplyService.selectJoinListPage(ConventPage.getPage(dto), CarMessageApplyPageVo.class,queryWrapper);
         PageOutput<CarMessageApplyPageVo> pageOutput = ConventPage.getPageOutput(page, CarMessageApplyPageVo.class);
         return RT.ok(pageOutput);
     }

src/main/java/com/xjrsoft/module/personnel/controller/TeacherFaceProcessController.java

@@ -14,11 +14,13 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.personnel.dto.AddTeacherFaceProcessDto;
 import com.xjrsoft.module.personnel.dto.UpdateTeacherFaceProcessDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
 import com.xjrsoft.module.personnel.dto.TeacherFaceProcessPageDto;
+import com.xjrsoft.module.personnel.entity.CarMessageApply;
 import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
 import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
 import com.xjrsoft.module.personnel.service.ITeacherFaceProcessService;
@@ -62,22 +64,28 @@ public class TeacherFaceProcessController {
         if(ObjectUtil.isNull(dto.getStatus())){
             dto.setStatus(1);
         }
-        IPage<TeacherFaceProcessPageVo> page=teacherFaceProcessService.selectJoinListPage(ConventPage.getPage(dto),TeacherFaceProcessPageVo.class,
-                MPJWrappers.<TeacherFaceProcess>lambdaJoin()
-                        .orderByDesc(TeacherFaceProcess::getId)
-                        .disableSubLogicDel()
-                        .like(StrUtil.isNotBlank(dto.getName()),XjrUser::getName,dto.getName())
-                        .like(StrUtil.isNotBlank(dto.getUserName()),XjrUser::getUserName,dto.getUserName())
-                        .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
-                        .eq(ObjectUtil.isNotNull(dto.getDepId())&&dto.getDepId()!=0,TeacherFaceProcess::getDepId,dto.getDepId())
-                        .eq(TeacherFaceProcess::getExamStatus,dto.getStatus())
-                        .select(TeacherFaceProcess::getId,TeacherFaceProcess::getUserId,TeacherFaceProcess::getDepId,TeacherFaceProcess::getFacePhoto)
-                        .innerJoin(XjrUser.class,XjrUser::getId, TeacherFaceProcess::getUserId)
-                        .leftJoin(File.class,File::getFolderId,TeacherFaceProcess::getFacePhoto)
-                        .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,TeacherFaceProcess::getGender, ext->ext.selectAs(DictionaryDetail::getName, TeacherFaceProcessPageVo::getGender))
-                        .selectAs(XjrUser::getName,TeacherFaceProcessPageVo::getName)
-                        .select("t2.file_url AS face_photo_url,t1.user_name AS user_name,t1.mobile")
-        );
+
+        MPJLambdaWrapper<TeacherFaceProcess> queryWrapper =MPJWrappers.<TeacherFaceProcess>lambdaJoin()
+                .orderByDesc(TeacherFaceProcess::getId)
+                .disableSubLogicDel()
+                .like(StrUtil.isNotBlank(dto.getName()),XjrUser::getName,dto.getName())
+                .like(StrUtil.isNotBlank(dto.getUserName()),XjrUser::getUserName,dto.getUserName())
+                .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
+                .eq(TeacherFaceProcess::getExamStatus,dto.getStatus())
+                .select(TeacherFaceProcess::getId,TeacherFaceProcess::getUserId,TeacherFaceProcess::getDepId,TeacherFaceProcess::getFacePhoto)
+                .innerJoin(XjrUser.class,XjrUser::getId, TeacherFaceProcess::getUserId)
+                .leftJoin(File.class,File::getFolderId,TeacherFaceProcess::getFacePhoto)
+                .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,TeacherFaceProcess::getGender, ext->ext.selectAs(DictionaryDetail::getName, TeacherFaceProcessPageVo::getGender))
+                .selectAs(XjrUser::getName,TeacherFaceProcessPageVo::getName)
+                .select("t2.file_url AS face_photo_url,t1.user_name AS user_name,t1.mobile")
+                ;
+
+        if(ObjectUtil.isNotNull(dto.getDepId())&&dto.getDepId()!=0) { // 要用用户关联部门查询
+            queryWrapper.leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, TeacherFaceProcess::getUserId)
+                    .eq(UserDeptRelation::getDeptId, dto.getDepId());
+        }
+
+        IPage<TeacherFaceProcessPageVo> page=teacherFaceProcessService.selectJoinListPage(ConventPage.getPage(dto),TeacherFaceProcessPageVo.class,queryWrapper);
 
         PageOutput<TeacherFaceProcessPageVo> pageOutput = ConventPage.getPageOutput(page, TeacherFaceProcessPageVo.class);
         return RT.ok(pageOutput);