流程调整

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

@@ -72,7 +72,7 @@ public class CarMessageApplyController {
                         .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())
+                        .eq(ObjectUtil.isNotNull(dto.getStatus())&&dto.getStatus()!=0, CarMessageApply::getExamStatus,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))
@@ -90,7 +90,7 @@ public class CarMessageApplyController {
                 MPJWrappers.<CarMessageApply>lambdaJoin()
                         .orderByDesc(CarMessageApply::getId)
                         .eq(CarMessageApply::getUserId, StpUtil.getLoginIdAsLong())
-                        .eq(CarMessageApply::getStatus,1)
+                        .eq(CarMessageApply::getExamStatus,1)
                         .select(CarMessageApply::getId)
                         .select(CarMessageApply.class,x -> VoToColumnUtil.fieldsToColumns(CarMessageApplyPageVo.class).contains(x.getProperty())));
         return RT.ok(list);

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

@@ -73,7 +73,7 @@ public class StundentFaceProcessController {
                         .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
                         .like(StrUtil.isNotBlank(dto.getStudentId()),BaseStudent::getStudentId,dto.getStudentId())
                         .eq(ObjectUtil.isNotNull(dto.getClassId())&&dto.getClassId()!=0,StundentFaceProcess::getClassId,dto.getClassId())
-                        .eq(StundentFaceProcess::getStatus,dto.getStatus())
+                        .eq(StundentFaceProcess::getExamStatus,dto.getStatus())
                         .select(StundentFaceProcess::getId,StundentFaceProcess::getUserId,StundentFaceProcess::getClassId,StundentFaceProcess::getFacePhoto)
                         .innerJoin(XjrUser.class,XjrUser::getId, StundentFaceProcess::getUserId)
                         .leftJoin(File.class,File::getFolderId,StundentFaceProcess::getFacePhoto)

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

@@ -70,7 +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())
+                        .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)