|
@@ -33,6 +33,7 @@ import com.xjrsoft.module.personnel.dto.StundentFaceProcessPageDto;
|
|
|
import com.xjrsoft.module.personnel.dto.UpdateStundentFaceProcessDto;
|
|
|
import com.xjrsoft.module.personnel.entity.FaceManagement;
|
|
|
import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
|
|
|
+import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
|
|
|
import com.xjrsoft.module.personnel.service.IFaceManagementService;
|
|
|
import com.xjrsoft.module.personnel.service.IStundentFaceProcessService;
|
|
|
import com.xjrsoft.module.personnel.vo.StundentFaceProcessPageVo;
|
|
@@ -113,6 +114,7 @@ public class StundentFaceProcessController {
|
|
|
.select(StundentFaceProcess::getId,StundentFaceProcess::getUserId,StundentFaceProcess::getClassId,StundentFaceProcess::getFacePhoto)
|
|
|
.innerJoin(XjrUser.class,XjrUser::getId, StundentFaceProcess::getUserId)
|
|
|
.leftJoin(File.class,File::getFolderId,StundentFaceProcess::getFacePhoto)
|
|
|
+ .leftJoin(FaceManagement.class,FaceManagement::getFileId, StundentFaceProcess::getFacePhoto)
|
|
|
.leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,StundentFaceProcess::getGender, ext->ext.selectAs(DictionaryDetail::getName, StundentFaceProcessPageVo::getGender))
|
|
|
.leftJoin(BaseStudentSchoolRoll.class,BaseStudentSchoolRoll::getUserId,StundentFaceProcess::getUserId)
|
|
|
.leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseStudentSchoolRoll::getStduyStatus, ext->ext.selectAs(DictionaryDetail::getName, StundentFaceProcessPageVo::getStduyStatus))
|