提交代码

src/main/java/com/steerinfo/dil/controller/AmsContractTruckPriceController.java

@@ -198,6 +198,8 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
                                                       String con,String userId) throws ParseException {
         if (con != null && !con.equals("undefined")) {
             mapValue.put("con","%" + con + "%");
+        }else {
+            mapValue.put("con","%" +"%");
         }
         if (userId != null && !userId.equals("undefined")) {
             //查询承运商ID
@@ -224,6 +226,9 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
                 String address2 = (String) stringObjectMap.get("address");
                 //单价的执行日期
                 Date priceDate = (Date) stringObjectMap.get("priceDate");
+                if (address2 ==null||priceDate==null){
+                    continue;
+                }
                 String format = simpleDateFormat.format(priceDate);
                 Date parse = simpleDateFormat.parse(format);
                 //Date parse1 = simpleDateFormat.parse("2022-12-10")

src/main/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

@@ -1288,7 +1288,7 @@
         and
         r_r_address.ADDRESS_PROVINCE || r_r_address.ADDRESS_DISTRICT  || r_r_address.ADDRESS_TOWN
         || rrp.ADDRESS_DELIVERY_ADDRESS ||  r_carrier.CARRIER_NAME || r_c_type.CAPACITY_TYPE_NAME
-        like CONCAT('%',CONCAT(#{con},'%'))
+        like #{con}
       </if>
     </where>
         order by a_t_price.INSERT_TIME desc