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

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

@@ -67,6 +67,9 @@ 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())
+                        .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()), CarMessageApply::getName,dto.getName())
 
                         .like(StrUtil.isNotBlank(dto.getPhone()),XjrUser::getMobile,dto.getPhone())

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,4 +102,15 @@ public class CarOutInRecord implements Serializable {
 
     @ApiModelProperty("车牌号")
     private String planNo;
+
+    @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/vo/CarOutInRecordPageVo.java

@@ -119,4 +119,17 @@ 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;
+
 }