|
@@ -26,13 +26,16 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
import com.xjrsoft.module.personnel.dto.ReservationSchoolPageDto;
|
|
import com.xjrsoft.module.personnel.dto.ReservationSchoolPageDto;
|
|
import com.xjrsoft.module.personnel.entity.ReservationSchool;
|
|
import com.xjrsoft.module.personnel.entity.ReservationSchool;
|
|
import com.xjrsoft.module.personnel.entity.ReservationSchoolPeople;
|
|
import com.xjrsoft.module.personnel.entity.ReservationSchoolPeople;
|
|
|
|
+import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
|
|
import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
|
|
import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
|
|
import com.xjrsoft.module.personnel.service.IReservationSchoolService;
|
|
import com.xjrsoft.module.personnel.service.IReservationSchoolService;
|
|
import com.xjrsoft.module.personnel.vo.ReservationSchoolPageVo;
|
|
import com.xjrsoft.module.personnel.vo.ReservationSchoolPageVo;
|
|
|
|
|
|
import com.xjrsoft.module.personnel.vo.ReservationSchoolVisitorPageVo;
|
|
import com.xjrsoft.module.personnel.vo.ReservationSchoolVisitorPageVo;
|
|
import com.xjrsoft.module.personnel.vo.ReservationSchoolVo;
|
|
import com.xjrsoft.module.personnel.vo.ReservationSchoolVo;
|
|
|
|
+import com.xjrsoft.module.personnel.vo.StundentFaceProcessPageVo;
|
|
import com.xjrsoft.module.room.entity.RoomValueWeek;
|
|
import com.xjrsoft.module.room.entity.RoomValueWeek;
|
|
|
|
+import com.xjrsoft.module.system.entity.DictionaryDetail;
|
|
import com.xjrsoft.module.teacher.entity.XjrUser;
|
|
import com.xjrsoft.module.teacher.entity.XjrUser;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -131,6 +134,7 @@ public class ReservationSchoolController {
|
|
.leftJoin(Department.class,Department::getId,ReservationSchool::getDeptId,ext->ext.selectAs(Department::getName,ReservationSchoolVisitorPageVo::getDeptCn))
|
|
.leftJoin(Department.class,Department::getId,ReservationSchool::getDeptId,ext->ext.selectAs(Department::getName,ReservationSchoolVisitorPageVo::getDeptCn))
|
|
.leftJoin(XjrUser.class,XjrUser::getId,ReservationSchool::getRespondentUserId,ext->ext.selectAs(XjrUser::getName,ReservationSchoolVisitorPageVo::getRespondentUserCn))
|
|
.leftJoin(XjrUser.class,XjrUser::getId,ReservationSchool::getRespondentUserId,ext->ext.selectAs(XjrUser::getName,ReservationSchoolVisitorPageVo::getRespondentUserCn))
|
|
.select(ReservationSchoolPeople.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
|
|
.select(ReservationSchoolPeople.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
|
|
|
|
+ .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, ReservationSchoolPeople::getGender, ext->ext.selectAs(DictionaryDetail::getName, ReservationSchoolVisitorPageVo::getGender))
|
|
);
|
|
);
|
|
PageOutput<ReservationSchoolVisitorPageVo> pageOutput = ConventPage.getPageOutput(page, ReservationSchoolVisitorPageVo.class);
|
|
PageOutput<ReservationSchoolVisitorPageVo> pageOutput = ConventPage.getPageOutput(page, ReservationSchoolVisitorPageVo.class);
|
|
return RT.ok(pageOutput);
|
|
return RT.ok(pageOutput);
|