feat：车辆申请与审批完善搜索条件

web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyAddCmd.java

@@ -24,10 +24,10 @@ import java.util.Date;
 public class PersonApplyAddCmd extends Command {
     @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true)
     @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空")
-    private Object personBelongType;
+    private Integer personBelongType;
     @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true)
     @NotEmpty(message = "授权范围港区与区域不能为空")
-    private Object gateLevelAuthArea;
+    private String gateLevelAuthArea;
     @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)", name = "auditFlag", required = true)
     @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)不能为空")
     private Integer auditFlag;
@@ -36,10 +36,10 @@ public class PersonApplyAddCmd extends Command {
     private Integer mkmjPermission;
     @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "访问起始时间不能为空")
-    private Date visitStartTime;
+    private String visitStartTime;
     @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true)
     @NotEmpty(message = "访问结束时间不能为空")
-    private Date visitEndTime;
+    private String visitEndTime;
     @ApiModelProperty(value = "待审批人员所属企业ID", name = "personCorpId", required = true)
     @NotNull(message = "待审批人员所属企业ID不能为空")
     private Long personCorpId;

web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyUpdateCmd.java

@@ -39,10 +39,10 @@ public class PersonApplyUpdateCmd extends Command {
     private Integer mkmjPermission;
     @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "访问起始时间不能为空")
-    private Date visitStartTime;
+    private String visitStartTime;
     @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true)
     @NotEmpty(message = "访问结束时间不能为空")
-    private Date visitEndTime;
+    private String visitEndTime;
     @ApiModelProperty(value = "待审批人员所属企业ID", name = "personCorpId", required = true)
     @NotNull(message = "待审批人员所属企业ID不能为空")
     private Long personCorpId;

web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageAddCmd.java

@@ -39,10 +39,10 @@ public class PersonMessageAddCmd extends Command {
     private String gateLevelAuthArea;
     @ApiModelProperty(value = "授权访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "授权访问起始时间不能为空")
-    private Date visitStartTime;
+    private String visitStartTime;
     @ApiModelProperty(value = "授权访问结束时间", name = "visitEndTime", required = true)
     @NotEmpty(message = "授权访问结束时间不能为空")
-    private Date visitEndTime;
+    private String visitEndTime;
     @ApiModelProperty(value = "备注", name = "remarks", required = true)
     @NotEmpty(message = "备注不能为空")
     private String remarks;

web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageUpdateCmd.java

@@ -42,10 +42,10 @@ public class PersonMessageUpdateCmd extends Command {
     private Object gateLevelAuthArea;
     @ApiModelProperty(value = "授权访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "授权访问起始时间不能为空")
-    private Date visitStartTime;
+    private String visitStartTime;
     @ApiModelProperty(value = "授权访问结束时间", name = "visitEndTime", required = true)
     @NotEmpty(message = "授权访问结束时间不能为空")
-    private Date visitEndTime;
+    private String visitEndTime;
     @ApiModelProperty(value = "备注", name = "remarks", required = true)
     @NotEmpty(message = "备注不能为空")
     private String remarks;

web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java

@@ -53,10 +53,10 @@ public class VehicleApplyAddCmd extends Command {
     private Integer mkmjPermission;
     @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "访问起始时间不能为空")
-    private Date visitStartTime;
+    private String visitStartTime;
     @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true)
     @NotEmpty(message = "访问结束时间不能为空")
-    private Date visitEndTime;
+    private String visitEndTime;
     @ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true)
     private String emissionStandards;
     @ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true)

web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java

@@ -32,9 +32,9 @@ public class VehicleApplyPageQry extends PageQuery {
     @ApiModelProperty(value = "auditFlag", name = "审核状态")
     private Integer auditFlag;
     @ApiModelProperty(value = "visitStartTime ", name = "访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     @ApiModelProperty(value = "visitEndTime", name = "访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     @ApiModelProperty(value = "gateLevelAuthAreaId", name = "授权范围港区与区域")
     private String gateLevelAuthAreaId;
 }

web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java

@@ -45,10 +45,10 @@ public class VehicleApplyUpdateCmd extends Command {
     private Object gateLevelAuthArea;
     @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
     @NotNull(message = "访问起始时间不能为空")
-    private Date visitStartTime;
+    private String visitStartTime;
     @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true)
     @NotNull(message = "访问结束时间不能为空")
-    private Date visitEndTime;
+    private String visitEndTime;
     @ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId", required = true)
     @NotNull(message = "车辆所属企业ID不能为空")
     private Long vehicleCorpId;

web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java

@@ -1,8 +1,11 @@
 package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 
 /**
  * web-client
@@ -25,5 +28,21 @@ public class VehicleAuditPageQry extends PageQuery {
      */
     private Long vehicleApplyId;
 
+    @ApiModelProperty(value = "employeeVehicleUserName ", name = "车辆归属人")
+    private String employeeVehicleUserName;
+    @ApiModelProperty(value = "licenceNo ", name = "车牌号")
+    private String licenceNo;
+    @ApiModelProperty(value = "visitStartTime ", name = "访问起始时间")
+    private String visitStartTime;
+    @ApiModelProperty(value = "visitEndTime", name = "访问结束时间")
+    private String visitEndTime;
+    @ApiModelProperty(value = "vehicleDepartmentId ", name = "车辆归属部门")
+    private Long vehicleDepartmentId;
+    @ApiModelProperty(value = "gateLevelAuthAreaId", name = "授权范围港区与区域")
+    private String gateLevelAuthAreaId;
+    @ApiModelProperty(value = "vehicleBelongTypeArr", name = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆")
+    private String vehicleBelongTypeArr;
+    @ApiModelProperty(value = "vehicleBelongType", name = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆")
+    private String vehicleBelongType;
 }
 

web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java

@@ -45,10 +45,10 @@ public class VehicleMessageAddCmd extends Command {
     private Object gateLevelAuthArea;
     @ApiModelProperty(value = "授权访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "授权访问起始时间不能为空")
-    private Date visitStartTime;
+    private String visitStartTime;
     @ApiModelProperty(value = "授权访问结束时间", name = "visitEndTime", required = true)
     @NotEmpty(message = "授权访问结束时间不能为空")
-    private Date visitEndTime;
+    private String visitEndTime;
     @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true)
     @NotNull(message = "车辆申请id不能为空")
     private Long vehicleApplyId;

web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java

@@ -48,10 +48,10 @@ public class VehicleMessageUpdateCmd extends Command {
     private Object gateLevelAuthArea;
     @ApiModelProperty(value = "授权访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "授权访问起始时间不能为空")
-    private Date visitStartTime;
+    private String visitStartTime;
     @ApiModelProperty(value = "授权访问结束时间", name = "visitEndTime", required = true)
     @NotEmpty(message = "授权访问结束时间不能为空")
-    private Date visitEndTime;
+    private String visitEndTime;
     @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true)
     @NotNull(message = "车辆申请id不能为空")
     private Long vehicleApplyId;

web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java

@@ -33,6 +33,8 @@ public class VideoAddCmd extends Command {
     @ApiModelProperty(value = "摄像头名称", name = "videoResourceName", required = true)
     @NotEmpty(message = "摄像头名称不能为空")
     private String videoResourceName;
+    @ApiModelProperty(value = "摄像头编码", name = "videoResourceCode", required = true)
+    private String videoResourceCode;
     @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）", name = "videoType", required = true)
     @NotNull(message = "摄像头类型（1-移动 2-平台）不能为空")
     private Integer videoType;

web-client/src/main/java/com/zcloud/primeport/dto/VideoUpdateCmd.java

@@ -36,6 +36,7 @@ public class VideoUpdateCmd extends Command {
     @ApiModelProperty(value = "摄像头名称", name = "videoResourceName", required = true)
     @NotEmpty(message = "摄像头名称不能为空")
     private String videoResourceName;
+    private String videoResourceCode;
     @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）", name = "videoType", required = true)
     @NotNull(message = "摄像头类型（1-移动 2-平台）不能为空")
     private Integer videoType;

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java

@@ -32,10 +32,10 @@ public class PersonApplyCO extends ClientObject {
     private Integer mkmjPermission;
     //访问起始时间
     @ApiModelProperty(value = "访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     //访问结束时间
     @ApiModelProperty(value = "访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     //待审批人员所属企业ID
     @ApiModelProperty(value = "待审批人员所属企业ID")
     private Long personCorpId;

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonMessageCO.java

@@ -35,10 +35,10 @@ public class PersonMessageCO extends ClientObject {
     private Object gateLevelAuthArea;
     //授权访问起始时间
     @ApiModelProperty(value = "授权访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     //授权访问结束时间
     @ApiModelProperty(value = "授权访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     //备注
     @ApiModelProperty(value = "备注")
     private String remarks;

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java

@@ -50,10 +50,10 @@ public class VehicleApplyCO extends ClientObject {
     private Integer mkmjPermission;
     //访问起始时间
     @ApiModelProperty(value = "访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     //访问结束时间
     @ApiModelProperty(value = "访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     //车辆所属企业ID
     @ApiModelProperty(value = "车辆所属企业ID")
     private Long vehicleCorpId;

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java

@@ -54,10 +54,10 @@ public class VehicleAuditCO extends ClientObject {
 
     //访问起始时间
     @ApiModelProperty(value = "访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     //访问结束时间
     @ApiModelProperty(value = "访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     //车辆所属企业ID
     @ApiModelProperty(value = "车辆所属企业ID")
     private Long vehicleCorpId;
@@ -97,6 +97,10 @@ public class VehicleAuditCO extends ClientObject {
     //授权范围港区与区域
     @ApiModelProperty(value = "授权范围港区与区域")
     private String gateLevelAuthArea;
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
 
     @ApiModelProperty(value = "currentUserCanAudit", name = "当前用户是否能审核")
     private Integer currentUserCanAudit;

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java

@@ -41,10 +41,10 @@ public class VehicleMessageCO extends ClientObject {
     private String gateLevelAuthArea;
     //授权访问起始时间
     @ApiModelProperty(value = "授权访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     //授权访问结束时间
     @ApiModelProperty(value = "授权访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     //车辆申请id
     @ApiModelProperty(value = "车辆申请id")
     private Long vehicleApplyId;

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VideoCO.java

@@ -28,6 +28,7 @@ public class VideoCO extends ClientObject {
     //摄像头名称
     @ApiModelProperty(value = "摄像头名称")
     private String videoResourceName;
+    private String videoResourceCode;
     //摄像头类型（1-移动 2-平台）
     @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）")
     private Integer videoType;

web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonApplyE.java

@@ -28,9 +28,9 @@ public class PersonApplyE extends BaseE {
     //进出港权限(1:有 2：无)
     private Integer mkmjPermission;
     //访问起始时间
-    private Date visitStartTime;
+    private String visitStartTime;
     //访问结束时间
-    private Date visitEndTime;
+    private String visitEndTime;
     //待审批人员所属企业ID
     private Long personCorpId;
     //待审批人员所属企业名称

web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonMessageE.java

@@ -30,9 +30,9 @@ public class PersonMessageE extends BaseE {
     //授权范围港区与区域
     private String gateLevelAuthArea;
     //授权访问起始时间
-    private Date visitStartTime;
+    private String visitStartTime;
     //授权访问结束时间
-    private Date visitEndTime;
+    private String visitEndTime;
     //对接状态，1对接完成，2未对接
     private Integer syncStatus;
     //对接说明

web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java

@@ -41,9 +41,9 @@ public class VehicleApplyE extends BaseE {
     //进出港权限(1:有 2：无)
     private Integer mkmjPermission;
     //访问起始时间
-    private Date visitStartTime;
+    private String visitStartTime;
     //访问结束时间
-    private Date visitEndTime;
+    private String visitEndTime;
     //车辆所属企业ID
     private Long vehicleCorpId;
     //车辆所属企业名称

web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java

@@ -35,9 +35,9 @@ public class VehicleMessageE extends BaseE {
     //授权范围港区与区域
     private String gateLevelAuthArea;
     //授权访问起始时间
-    private Date visitStartTime;
+    private String visitStartTime;
     //授权访问结束时间
-    private Date visitEndTime;
+    private String visitEndTime;
     //车辆申请id
     private Long vehicleApplyId;
     //对接状态，1对接完成，2未对接

web-domain/src/main/java/com/zcloud/primeport/domain/model/VideoE.java

@@ -25,6 +25,7 @@ public class VideoE extends BaseE {
     private String videoResourceId;
     //摄像头名称
     private String videoResourceName;
+    private String videoResourceCode;
     //摄像头类型（1-移动 2-平台）
     private Integer videoType;
     //经度

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java

@@ -35,10 +35,10 @@ public class PersonApplyDO extends BaseDO {
     private Integer mkmjPermission;
     //访问起始时间
     @ApiModelProperty(value = "访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     //访问结束时间
     @ApiModelProperty(value = "访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     //待审批人员所属企业ID
     @ApiModelProperty(value = "待审批人员所属企业ID")
     private Long personCorpId;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonMessageDO.java

@@ -38,10 +38,10 @@ public class PersonMessageDO extends BaseDO {
     private String gateLevelAuthArea;
     //授权访问起始时间
     @ApiModelProperty(value = "授权访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     //授权访问结束时间
     @ApiModelProperty(value = "授权访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     //对接状态，1对接完成，2未对接
     @ApiModelProperty(value = "对接状态，1对接完成，2未对接")
     private Integer syncStatus;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java

@@ -53,10 +53,10 @@ public class VehicleApplyDO extends BaseDO {
     private Integer mkmjPermission;
     //访问起始时间
     @ApiModelProperty(value = "访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     //访问结束时间
     @ApiModelProperty(value = "访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     //车辆所属企业ID
     @ApiModelProperty(value = "车辆所属企业ID")
     private Long vehicleCorpId;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java

@@ -62,11 +62,11 @@ public class VehicleAuditDO extends BaseDO {
     //访问起始时间
     @ApiModelProperty(value = "访问起始时间")
     @TableField(exist = false)
-    private Date visitStartTime;
+    private String visitStartTime;
     //访问结束时间
     @ApiModelProperty(value = "访问结束时间")
     @TableField(exist = false)
-    private Date visitEndTime;
+    private String visitEndTime;
     //车辆所属企业ID
     @ApiModelProperty(value = "车辆所属企业ID")
     @TableField(exist = false)

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java

@@ -44,10 +44,10 @@ public class VehicleMessageDO extends BaseDO {
     private String gateLevelAuthArea;
     //授权访问起始时间
     @ApiModelProperty(value = "授权访问起始时间")
-    private Date visitStartTime;
+    private String visitStartTime;
     //授权访问结束时间
     @ApiModelProperty(value = "授权访问结束时间")
-    private Date visitEndTime;
+    private String visitEndTime;
     //车辆申请id
     @ApiModelProperty(value = "车辆申请id")
     private Long vehicleApplyId;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VideoDO.java

@@ -30,6 +30,7 @@ public class VideoDO extends BaseDO {
     //摄像头名称
     @ApiModelProperty(value = "摄像头名称")
     private String videoResourceName;
+    private String videoResourceCode;
     //摄像头类型（1-移动 2-平台）
     @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）")
     private Integer videoType;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateRepositoryImpl.java

@@ -56,7 +56,7 @@ public class MkmjGateRepositoryImpl extends BaseRepositoryImpl<MkmjGateMapper, M
     public Boolean checkName(String gateName, Long passageId, Long id) {
         QueryWrapper<MkmjGateDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("gate_name", gateName);
-        queryWrapper.eq("passageId", passageId);
+        queryWrapper.eq("passage_id", passageId);
         queryWrapper.eq("delete_enum", "false");
         if (id != null) {
             queryWrapper.ne("id", id);

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
+import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.primeport.domain.enums.MenuEnum;
 import com.zcloud.primeport.persistence.dataobject.PersonMessageDO;
 import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO;
@@ -37,6 +38,12 @@ public class VehicleAuditRepositoryImpl extends BaseRepositoryImpl<VehicleAuditM
         if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) {
             menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
         }
+        if (!Tools.isEmpty(parmas.get("gateLevelAuthAreaId"))) {
+            parmas.put("gateLevelAuthAreaIdList",parmas.get("gateLevelAuthAreaId").toString().split(","));
+        }
+        if (!Tools.isEmpty(parmas.get("vehicleBelongTypeArr"))) {
+            parmas.put("vehicleBelongTypeArrList",parmas.get("vehicleBelongTypeArr").toString().split(","));
+        }
         IPage<VehicleAuditDO> result = vehicleAuditMapper.listPage(page, parmas, menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }

web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml

@@ -53,6 +53,40 @@
             a.delete_enum = 'FALSE'
           AND va.delete_enum = 'FALSE'
           AND a.audit_status = 1
+        <if test="parmas.licenceNo != null and parmas.licenceNo != ''">
+            AND va.licence_no like  CONCAT('%', #{parmas.licenceNo}, '%')
+        </if>
+        <if test="parmas.employeeVehicleUserName != null and parmas.employeeVehicleUserName != ''">
+            AND va.employee_vehicle_user_name LIKE CONCAT('%', #{parmas.employeeVehicleUserName}, '%')
+        </if>
+        <if test="parmas.visitStartTime != null and parmas.visitStartTime != ''">
+            AND va.visit_start_time &gt;= #{parmas.visitStartTime}
+        </if>
+        <if test="parmas.visitEndTime != null and parmas.visitEndTime != ''">
+            AND va.visit_end_time &lt;= #{parmas.visitEndTime}
+        </if>
+        <if test="parmas.vehicleDepartmentId != null">
+            AND va.vehicle_department_id = #{parmas.vehicleDepartmentId}
+        </if>
+        <if test="parmas.vehicleBelongType != null and parmas.vehicleBelongType != ''">
+            AND va.vehicle_belong_type = #{parmas.vehicleBelongType}
+        </if>
+        <if test="vehicleBelongTypeArr != null and vehicleBelongTypeArr.size() > 0">
+            AND va.vehicle_belong_type in
+            <foreach collection="vehicleBelongTypeArr" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="gateLevelAuthAreaIdList != null and gateLevelAuthAreaIdList.size() > 0">
+            and JSON_OVERLAPS(
+            JSON_EXTRACT(va.gate_level_auth_area, '$.area[*].bianma'),
+            CONCAT('[',
+            <foreach collection="gateLevelAuthAreaIdList" item="item" separator=",">
+                #{item}
+            </foreach>
+            , ']')
+            )
+        </if>
     </select>
 </mapper>