Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/outint/controller/CarOutInRecordController.java

@@ -19,9 +19,11 @@ import com.xjrsoft.module.outint.entity.StudentOutInRecord;
 import com.xjrsoft.module.outint.service.ICarOutInRecordService;
 import com.xjrsoft.module.outint.vo.CarOutInRecordPageVo;
 import com.xjrsoft.module.outint.vo.CarOutInRecordVo;
+import com.xjrsoft.module.personnel.entity.CarManagement;
 import com.xjrsoft.module.personnel.entity.CarMessageApply;
 import com.xjrsoft.module.personnel.entity.ReservationSchoolPeople;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -65,15 +67,21 @@ public class CarOutInRecordController {
                         .eq(ObjectUtil.isNotNull(dto.getCategory()), CarOutInRecord::getCategory, dto.getCategory())
                         .eq(ObjectUtil.isNotNull(dto.getStatus()), CarOutInRecord::getStatus, dto.getStatus())
                         .eq(ObjectUtil.isNotNull(dto.getVehicleType()), CarMessageApply::getVehicleType, dto.getVehicleType())
-                        .like(StrUtil.isNotBlank(dto.getName()), ReservationSchoolPeople::getName,dto.getName())
-                        .like(StrUtil.isNotBlank(dto.getPhone()),ReservationSchoolPeople::getPhone,dto.getPhone())
+                        .like(StrUtil.isNotBlank(dto.getName()), CarMessageApply::getName,dto.getName())
+
+                        .like(StrUtil.isNotBlank(dto.getPhone()),XjrUser::getMobile,dto.getPhone())
                         .select(CarOutInRecord::getId)
-                        .select(ReservationSchoolPeople::getPhone,ReservationSchoolPeople::getGender,ReservationSchoolPeople::getName,ReservationSchoolPeople::getIdentityCard,ReservationSchoolPeople::getPlateNumber)
+
                         .select(CarOutInRecord.class,x -> VoToColumnUtil.fieldsToColumns(CarOutInRecordPageVo.class).contains(x.getProperty()))
+                        .selectAs(CarOutInRecord::getPlanNo,CarOutInRecordPageVo::getPlateNumber)
+
                         .select(CarMessageApply::getVehicleType)
-                        .leftJoin(ReservationSchoolPeople.class,ReservationSchoolPeople::getId,CarOutInRecord::getReservationSchoolPeopleId)
-                        .leftJoin(CarMessageApply.class,CarMessageApply::getId,CarOutInRecord::getCarMessageApplyId)
-                        .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, ReservationSchoolPeople::getGender, ext->ext.selectAs(DictionaryDetail::getName, CarOutInRecordPageVo::getGender))
+                        .leftJoin(CarMessageApply.class,CarMessageApply::getId,CarOutInRecord::getCarMessageApplyId,ext->ext
+                                .select(CarMessageApply::getName))
+                        .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, CarMessageApply::getGender, ext->ext.selectAs(DictionaryDetail::getName, CarOutInRecordPageVo::getGender))
+                        .leftJoin(XjrUser.class,XjrUser::getId,CarMessageApply::getUserId,ext->ext.selectAs(XjrUser::getMobile,CarOutInRecordPageVo::getPhone)
+                                .selectAs(XjrUser::getCredentialNumber,CarOutInRecordPageVo::getIdentityCard))
+
                 );
 
         PageOutput<CarOutInRecordPageVo> pageOutput = ConventPage.getPageOutput(page, CarOutInRecordPageVo.class);

src/main/java/com/xjrsoft/module/outint/entity/CarOutInRecord.java

@@ -89,11 +89,7 @@ public class CarOutInRecord implements Serializable {
     */
     @ApiModelProperty("进出状态(0:进 1:出)")
     private Integer status;
-    /**
-    * 访客车辆(reservation_school_people),临时车辆使用
-    */
-    @ApiModelProperty("访客车辆(reservation_school_people),临时车辆使用")
-    private Long reservationSchoolPeopleId;
+
     /**
     * 车辆分类(0:固定车辆 1:临时车辆)
     */
@@ -102,4 +98,8 @@ public class CarOutInRecord implements Serializable {
 
     @ApiModelProperty("考勤状态")
     private String attendanceStatus;
+
+
+    @ApiModelProperty("车牌号")
+    private String planNo;
 }