Merge branch 'pre'

src/main/java/com/xjrsoft/module/liteflow/node/CarMessageApplyNode.java

@@ -29,6 +29,7 @@ public class CarMessageApplyNode extends NodeComponent {
             // 数据处理
             CarMessageApply carMessageApply = carMessageApplyService.getById(formId);
             carMessageApply.setStatus(1);
+            carMessageApply.setExamStatus(1);
 
             carMessageApplyService.updateById(carMessageApply);
         }

src/main/java/com/xjrsoft/module/liteflow/node/ImportStudentFaceNode.java

@@ -27,6 +27,7 @@ public class ImportStudentFaceNode extends NodeComponent {
             // 数据处理
             StundentFaceProcess dataObj = stundentFaceProcessService.getById(formId);
             dataObj.setStatus(1);
+            dataObj.setExamStatus(1);
 
             stundentFaceProcessService.updateById(dataObj);
 

src/main/java/com/xjrsoft/module/liteflow/node/ImportTeacherFaceNode.java

@@ -29,6 +29,7 @@ public class ImportTeacherFaceNode extends NodeComponent {
             // 数据处理
             TeacherFaceProcess dataObj = teacherFaceProcessService.getById(formId);
             dataObj.setStatus(1);
+            dataObj.setExamStatus(1);
 
             teacherFaceProcessService.updateById(dataObj);
 

src/main/java/com/xjrsoft/module/liteflow/node/ReservationSchoolNode.java

@@ -30,7 +30,7 @@ public class ReservationSchoolNode extends NodeComponent {
             // 数据处理
             ReservationSchool dataObj = reservationSchoolService.getById(formId);
             dataObj.setStatus(1);
-
+            dataObj.setExamStatus(1);
             reservationSchoolService.updateById(dataObj);
         }
     }

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)

src/main/java/com/xjrsoft/module/personnel/entity/CarMessageApply.java

@@ -133,4 +133,7 @@ public class CarMessageApply implements Serializable {
      */
     @ApiModelProperty("用户ID")
     private  Long userId;
+
+    @ApiModelProperty("审批状态(0:未通过 1:通过)")
+    private Integer examStatus;
 }

src/main/java/com/xjrsoft/module/personnel/entity/ReservationSchool.java

@@ -122,4 +122,6 @@ public class ReservationSchool implements Serializable {
     @EntityMapping(thisField = "id", joinField = "reservationSchooId")
     private List<ReservationSchoolPeople> reservationSchoolPeopleList;
 
+    @ApiModelProperty("审批状态(0:未通过 1:通过)")
+    private Integer examStatus;
 }

src/main/java/com/xjrsoft/module/personnel/entity/StundentFaceProcess.java

@@ -119,5 +119,6 @@ public class StundentFaceProcess implements Serializable {
     @ApiModelProperty("班主任id")
     private Long teacherId;
 
-
+    @ApiModelProperty("审批状态(0:未通过 1:通过)")
+    private Integer examStatus;
 }

src/main/java/com/xjrsoft/module/personnel/entity/TeacherFaceProcess.java

@@ -119,5 +119,6 @@ public class TeacherFaceProcess implements Serializable {
     @ApiModelProperty("部门主任id")
     private Long depUserId;
 
-
+    @ApiModelProperty("审批状态(0:未通过 1:通过)")
+    private Integer examStatus;
 }