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

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

@@ -61,26 +61,27 @@ public class CarOutInRecordController {
 
         IPage<CarOutInRecordPageVo> page = carOutInRecordService.selectJoinListPage(ConventPage.getPage(dto),CarOutInRecordPageVo.class,
                 MPJWrappers.<CarOutInRecord>lambdaJoin()
-                        .orderByDesc(CarOutInRecord::getId)
+                        .orderByDesc(CarOutInRecord::getRecordTime)
                         .disableSubLogicDel()
-                        .between((ObjectUtil.isNotNull(dto.getStartTime()) && ObjectUtil.isNotNull(dto.getStartTime())), StudentOutInRecord::getRecordTime, LocalDateTimeUtil.format(dto.getStartTime(),"yyyy-MM-dd")+" 00:00:00", LocalDateTimeUtil.format(dto.getEndTime(),"yyyy-MM-dd")+" 23:59:59")
+                        .between((ObjectUtil.isNotNull(dto.getStartTime()) && ObjectUtil.isNotNull(dto.getStartTime())), CarOutInRecord::getRecordTime, LocalDateTimeUtil.format(dto.getStartTime(),"yyyy-MM-dd HH:mm:ss"), LocalDateTimeUtil.format(dto.getEndTime(),"yyyy-MM-dd HH:mm:ss"))
                         .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()), CarMessageApply::getName,dto.getName())
 
-                        .like(StrUtil.isNotBlank(dto.getPhone()),XjrUser::getMobile,dto.getPhone())
+                        .eq(ObjectUtil.isNotNull(dto.getVehicleType()), CarOutInRecord::getVehicleType, dto.getVehicleType())
+                        .eq(ObjectUtil.isNotNull(dto.getReleaseReason()), CarOutInRecord::getReleaseReason, dto.getReleaseReason())
+                        .eq(ObjectUtil.isNotNull(dto.getReleaseWay()), CarOutInRecord::getReleaseWay, dto.getReleaseWay())
+                        .eq(ObjectUtil.isNotNull(dto.getReleaseResult()), CarOutInRecord::getReleaseResult, dto.getReleaseResult())
+                        .like(StrUtil.isNotBlank(dto.getName()), CarOutInRecord::getName,dto.getName())
+                        .like(StrUtil.isNotBlank(dto.getPhone()),CarOutInRecord::getPhone,dto.getPhone())
+
+
                         .select(CarOutInRecord::getId)
 
-                        .select(CarOutInRecord.class,x -> VoToColumnUtil.fieldsToColumns(CarOutInRecordPageVo.class).contains(x.getProperty()))
                         .selectAs(CarOutInRecord::getPlanNo,CarOutInRecordPageVo::getPlateNumber)
 
-                        .select(CarMessageApply::getVehicleType)
-                        .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))
+                        .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, CarOutInRecord::getReleaseReason, ext->ext.selectAs(DictionaryDetail::getName, CarOutInRecordPageVo::getReleaseReasonCn))
+
+                        .select(CarOutInRecord.class,x -> VoToColumnUtil.fieldsToColumns(CarOutInRecordPageVo.class).contains(x.getProperty()))
 
                 );
 

src/main/java/com/xjrsoft/module/outint/dto/CarOutInRecordPageDto.java

@@ -58,4 +58,16 @@ public class CarOutInRecordPageDto extends PageInput {
     @ApiModelProperty("手机号码")
     private String phone;
 
+    @ApiModelProperty("放行结果")
+    private String releaseResult;
+
+    @ApiModelProperty("放行方式")
+    private String releaseWay;
+
+    /**
+     * 放行原因 100-固定车放行 101-临时车自动放行 102-预约车自动放行 103-一户多车自动放行
+     */
+    @ApiModelProperty(" 放行原因 100-固定车放行 101-临时车自动放行 102-预约车自动放行 103-一户多车自动放行")
+    private String releaseReason;
+
 }

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

@@ -102,12 +102,32 @@ public class CarOutInRecord implements Serializable {
     @ApiModelProperty("车牌号")
     private String planNo;
 
-    @ApiModelProperty("放行原因")
-    private Integer releaseReason;
+    @ApiModelProperty("放行方式")
+    private String releaseWay;
+    /**
+     * 100-固定车放行 101-临时车自动放行 102-预约车自动放行 103-一户多车自动放行
+     */
+    @ApiModelProperty("100-固定车放行 101-临时车自动放行 102-预约车自动放行 103-一户多车自动放行")
+    private String releaseReason;
 
     @ApiModelProperty("放行结果")
-    private Integer releaseResult;
+    private String releaseResult;
 
-    @ApiModelProperty("放行方式")
-    private Integer releaseWay;
+    /**
+     * 车辆类型
+     */
+    @ApiModelProperty("车辆类型")
+    private String vehicleType;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String name;
 }

src/main/java/com/xjrsoft/module/outint/vo/CarOutInRecordPageVo.java

@@ -119,4 +119,20 @@ public class CarOutInRecordPageVo {
     @ApiModelProperty("人脸照片地址")
     private String facePhotoUrl;
 
+
+    @ApiModelProperty("放行结果")
+    private String releaseResult;
+
+    @ApiModelProperty("放行方式")
+    private String releaseWay;
+
+    /**
+     * 放行原因 100-固定车放行 101-临时车自动放行 102-预约车自动放行 103-一户多车自动放行
+     */
+    @ApiModelProperty(" 放行原因 100-固定车放行 101-临时车自动放行 102-预约车自动放行 103-一户多车自动放行")
+    private String releaseReason;
+
+    @ApiModelProperty(" 放行原因 100-固定车放行 101-临时车自动放行 102-预约车自动放行 103-一户多车自动放行")
+    private String releaseReasonCn;
+
 }