Merge remote-tracking branch 'origin/v32.8_vehicle_certification_review_20241101' into test_jdk17

clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -266,7 +266,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper();
 
         if(StringUtils.isNotBlank(param.getTruckNo())){
-            query.eq(OrderChild :: getTruckNo,param.getTruckNo());
+            query.like(OrderChild :: getTruckNo,param.getTruckNo());
         }
         if(StringUtils.isNotBlank(param.getSendAddress())){
             query.like(OrderChild :: getSendAddress,param.getSendAddress());

clx-performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -103,6 +103,8 @@ public class OrderChildSqlProvider {
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address = #{param.sendAddress}");}
             if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address= #{param.receiveAddress}");}
             if (Objects.nonNull(param.getStatus())) {WHERE("pound_status = #{param.status}");}
+            // 车牌号
+            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like CONCAT('%', #{param.content}, '%')");}
 
             ORDER_BY("pound_status,unload_time");
         }}.toString();

clx-performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectLineReportSqlProvider.java

@@ -43,7 +43,7 @@ public class CollectLineReportSqlProvider {
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT(#{param.sendAddress},'%')");}
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
-            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
+            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like CONCAT('%', #{param.truckNo}, '%')");}
 
             if (param.getReportStatus() != null) {WHERE("report_status = #{param.reportStatus}");}
             if (param.getAuditStatus() != null) {WHERE("audit_status = #{param.auditStatus}");}
@@ -72,7 +72,7 @@ public class CollectLineReportSqlProvider {
             if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveAddress},'%')");}
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
-            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
+            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like CONCAT('%', #{param.truckNo}, '%')");}
 
             if (param.getReportType() != null) {WHERE("report_type = #{param.reportType}");}
             else {

clx-performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckLocationSqlProvider.java

@@ -43,7 +43,7 @@ public class CollectTruckLocationSqlProvider {
 
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
-            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
+            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like CONCAT('%', #{param.truckNo}, '%')");}
 
             if (param.getTruckOrderStatus() != null) {WHERE("truck_order_status = #{param.truckOrderStatus}");}
 

clx-performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckRefuelSqlProvider.java

@@ -47,7 +47,7 @@ public class CollectTruckRefuelSqlProvider {
             if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveAddress},'%')");}
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
-            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
+            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like CONCAT('%', #{param.truckNo}, '%')");}
 
             if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("report_time >= #{param.beginTime}");}
             if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("report_time <= #{param.endTime}");}

clx-performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckWaitSqlProvider.java

@@ -44,7 +44,7 @@ public class CollectTruckWaitSqlProvider {
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
 
-            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
+            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like CONCAT('%', #{param.truckNo}, '%')");}
             if (param.getReportType() != null) {WHERE("report_type = #{param.reportType}");}
             if (param.getWaitType() != null) {WHERE("wait_type = #{param.waitType}");}
             if (param.getAuditStatus() != null) {WHERE("audit_status = #{param.auditStatus}");}

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

@@ -44,6 +44,9 @@ public class VehicleWarnInfoSqlProvider {
             if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("warn_time >= #{param.beginTime}");}
             if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("warn_time <= #{param.endTime}");}
 
+            // 车牌号
+            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like CONCAT('%', #{param.truckNo}, '%')");}
+
             ORDER_BY("warn_time desc, id desc");
         }}.toString();
     }

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

@@ -41,4 +41,7 @@ public class PagePoundAuditParam extends PageParam {
     @Schema(description = "结束时间",example = "2020-01-01 10:10:10")
     private String endTime;
 
+    @Schema(description = "车牌号", example = "京A12345")
+    private String truckNo;
+
 }

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

@@ -35,4 +35,7 @@ public class PageVehicleWarnInfoParam extends PageParam {
     @Schema(description = "结束时间", example = "")
     private String endTime;
 
+    @Schema(description = "车牌号", example = "京A12345")
+    private String truckNo;
+
 }