车辆预警

performance-api/src/main/java/com/clx/performance/param/pc/vehiclewarn/PageVehicleWarnInfoParam.java

@@ -23,6 +23,11 @@ public class PageVehicleWarnInfoParam extends PageParam {
     @ApiModelProperty(value = "处理状态：1待处理 2已处理 3暂停预警", example = "1")
     private Integer status;
 
+    @ApiModelProperty(value = "发货地址", example = "北京")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地址", example = "山西")
+    private String receiveAddress;
+
     @ApiModelProperty(value = "开始时间", example = "")
     private String beginTime;
     @ApiModelProperty(value = "结束时间", example = "")

performance-web/src/main/java/com/clx/performance/sqlProvider/vehiclewarn/VehicleWarnInfoSqlProvider.java

 package com.clx.performance.sqlProvider.vehiclewarn;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnConfigParam;
 import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnInfoParam;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -26,6 +25,9 @@ public class VehicleWarnInfoSqlProvider {
             if (Objects.nonNull(param.getWarnLevel())) {WHERE("warn_level = #{param.warnLevel}");}
             if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
 
+            if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT('%',#{param.sendAddress},'%')");}
+            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT('%',#{param.receiveAddress},'%')");}
+
             if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
             if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}