|
|
@@ -19,6 +19,7 @@ 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.StundentFaceProcess;
|
|
|
import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
|
|
|
import com.xjrsoft.module.personnel.service.ITeacherFaceProcessService;
|
|
|
import com.xjrsoft.module.personnel.vo.TeacherFaceProcessPageVo;
|
|
|
@@ -58,6 +59,9 @@ public class TeacherFaceProcessController {
|
|
|
@SaCheckPermission("teacherfaceprocess:detail")
|
|
|
public RT<PageOutput<TeacherFaceProcessPageVo>> page(@Valid TeacherFaceProcessPageDto dto){
|
|
|
|
|
|
+ if(ObjectUtil.isNull(dto.getStatus())){
|
|
|
+ dto.setStatus(1);
|
|
|
+ }
|
|
|
IPage<TeacherFaceProcessPageVo> page=teacherFaceProcessService.selectJoinListPage(ConventPage.getPage(dto),TeacherFaceProcessPageVo.class,
|
|
|
MPJWrappers.<TeacherFaceProcess>lambdaJoin()
|
|
|
.orderByDesc(TeacherFaceProcess::getId)
|
|
|
@@ -66,6 +70,7 @@ public class TeacherFaceProcessController {
|
|
|
.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::getStatus,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)
|