瀏覽代碼

修改人脸加状态条件,默认查通过 状态为1

DESKTOP-USV654P\pc 1 年之前
父節點
當前提交
ab90da679a

+ 5 - 0
src/main/java/com/xjrsoft/module/personnel/controller/StundentFaceProcessController.java

@@ -60,6 +60,10 @@ public class StundentFaceProcessController {
     @SaCheckPermission("stundentfaceprocess:detail")
     public RT<PageOutput<StundentFaceProcessPageVo>> page(@Valid StundentFaceProcessPageDto dto){
 
+        if(ObjectUtil.isNull(dto.getStatus())){
+            dto.setStatus(1);
+        }
+
         IPage<StundentFaceProcessPageVo> page=stundentFaceProcessService.selectJoinListPage(ConventPage.getPage(dto),StundentFaceProcessPageVo.class,
                 MPJWrappers.<StundentFaceProcess>lambdaJoin()
                         .orderByDesc(StundentFaceProcess::getId)
@@ -69,6 +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())
                         .select(StundentFaceProcess::getId,StundentFaceProcess::getUserId,StundentFaceProcess::getClassId,StundentFaceProcess::getFacePhoto)
                         .innerJoin(XjrUser.class,XjrUser::getId, StundentFaceProcess::getUserId)
                         .leftJoin(File.class,File::getFolderId,StundentFaceProcess::getFacePhoto)

+ 5 - 0
src/main/java/com/xjrsoft/module/personnel/controller/TeacherFaceProcessController.java

@@ -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)

+ 5 - 0
src/main/java/com/xjrsoft/module/personnel/dto/StundentFaceProcessPageDto.java

@@ -47,4 +47,9 @@ public class StundentFaceProcessPageDto extends PageInput {
      */
     @ApiModelProperty("就读方式")
     private String stduyStatus;
+    /**
+     * 状态(0:未结束 1:结束)
+     */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
 }

+ 5 - 0
src/main/java/com/xjrsoft/module/personnel/dto/TeacherFaceProcessPageDto.java

@@ -42,4 +42,9 @@ public class TeacherFaceProcessPageDto extends PageInput {
      */
     @ApiModelProperty("手机号")
     private String mobile;
+    /**
+     * 状态(0:未结束 1:结束)
+     */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
 }