feat：车辆拉黑与违规登记搜索条件

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

@@ -1,6 +1,7 @@
 package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -23,6 +24,14 @@ public class VehicleBlackPageQry extends PageQuery {
      * - `le`: 小于等于比较查询
      * - `ne`: 不等比较查询，对应SQL的!=操作符
      */
-    private Long likeVehicleId;
+    @ApiModelProperty(value = "车牌号", name = "licenceNo")
+    private String licenceNo;
+    @ApiModelProperty(value = "employeeVehicleUserName", name = "车辆归属人")
+    private String employeeVehicleUserName;
+    @ApiModelProperty(value = "vehicleDepartmentId", name = "车辆归属部门")
+    private Long vehicleDepartmentId;
+    @ApiModelProperty(value = "vehicleType", name = "车辆类型")
+    private String vehicleType;
+
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java

@@ -1,9 +1,14 @@
 package com.zcloud.primeport.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO;
 import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Map;
+
 /**
  * web-infrastructure
  *
@@ -14,5 +19,7 @@ import org.apache.ibatis.annotations.Mapper;
 public interface VehicleBlackMapper extends BaseMapper<VehicleBlackDO> {
 
     VehicleBlackDO getInfoById(Long id);
+
+    IPage<VehicleApplyDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas);
 }
 

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

@@ -3,8 +3,11 @@ package com.zcloud.primeport.persistence.repository.impl;
 import com.alibaba.cola.dto.PageResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
+import com.zcloud.primeport.domain.enums.MenuEnum;
+import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO;
 import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO;
 import com.zcloud.primeport.persistence.mapper.VehicleBlackMapper;
 import com.zcloud.primeport.persistence.repository.VehicleBlackRepository;
@@ -28,11 +31,9 @@ public class VehicleBlackRepositoryImpl extends BaseRepositoryImpl<VehicleBlackM
 
     @Override
     public PageResponse<VehicleBlackDO> listPage(Map<String, Object> parmas) {
-        IPage<VehicleBlackDO> iPage = new Query<VehicleBlackDO>().getPage(parmas);
+        Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
-        QueryWrapper<VehicleBlackDO> queryWrapper = new QueryWrapper<>();
+                Integer.parseInt(parmas.get("pageSize").toString()));
-        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
+        IPage<VehicleApplyDO> result = vehicleBlackMapper.listPage(page, parmas);
-        queryWrapper.orderByDesc("create_time");
-        IPage<VehicleBlackDO> result = vehicleBlackMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

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

@@ -35,5 +35,48 @@
         WHERE
             b.id = #{id}
     </select>
+    <select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.VehicleApplyDO">
+        SELECT
+            a.licence_type,
+            a.licence_type_name,
+            a.licence_no,
+            a.vehicle_type,
+            a.vehicle_type_name,
+            a.vehicle_belong_type,
+            a.gate_level_auth_area,
+            a.vehicle_corp_id,
+            a.vehicle_corp_name,
+            a.vehicle_department_id,
+            a.vehicle_department_name,
+            a.employee_vehicle_user_id,
+            a.employee_vehicle_user_name,
+            a.emission_standards,
+            a.emission_standards_name,
+            a.driving_license_id,
+            a.attachment_id,
+            a.inform_sign_id,
+            a.project_id,
+            a.project_name,
+            a.ls_user_idcard,
+            a.ls_user_phone,
+            a.mkmj_id
+        FROM
+            vehicle_black AS b
+                LEFT JOIN vehicle_apply AS a ON b.licence_no = a.licence_no
+        WHERE
+            b.delete_enum = 'FALSE'
+        <if test="parmas.licenceNo != null and parmas.licenceNo != ''">
+            AND b.licence_no LIKE CONCAT('%', #{parmas.licenceNo}, '%')
+        </if>
+        <if test="parmas.employeeVehicleUserName != null and parmas.employeeVehicleUserName != ''">
+            AND a.employee_vehicle_user_name LIKE CONCAT('%', #{parmas.employeeVehicleUserName}, '%')
+        </if>
+        <if test="parmas.vehicleDepartmentId != null">
+            AND a.vehicle_department_id = #{parmas.vehicleDepartmentId}
+        </if>
+        <if test="parmas.vehicleType != null and parmas.vehicleType != ''">
+            AND a.vehicleType LIKE CONCAT('%', #{parmas.vehicleType}, '%')
+        </if>
+    </select>
 </mapper>