Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -198,12 +198,14 @@ 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
-           String carrierName1 = amsContractTruckPriceService.getCarrierNameForDetail(userId);
-           mapValue.put("carrierName1","%" + carrierName1 + "%");
-        }
+//        if (userId != null && !userId.equals("undefined")) {
+//            //查询承运商ID
+//           String carrierName1 = amsContractTruckPriceService.getCarrierNameForDetail(userId);
+//           mapValue.put("carrierName1","%" + carrierName1 + "%");
+//        }
         //1.先查询出收货地址的所有收货ID
         List<Map<String, Object>> receiveAddress = amsContractTruckPriceService.getReceiveAddressId(mapValue);
         //2.查询出该收货所有的单价信息
@@ -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

@@ -988,6 +988,8 @@
     WHERE RRA.ADDRESS_PROVINCE ||
           RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
           RRP.ADDRESS_DELIVERY_ADDRESS like #{con}
+      AND RRP.PLACE_ID IN (select ACTP.PLACE_ID FROM AMS_CONTRACT_TRANSPORT_PRICE ACTP
+                           WHERE  ACTP.DELETED=0)
   </select>
 
   <!--获取全部承运商的信息-->
@@ -1276,7 +1278,7 @@
     on rs.SHIPPER_ID = a_t_price.SHIPPER_ID
     <where>
       TYPE=1
-      --and a_t_price.ISSTANDARD is null
+      and a_t_price.ISSTANDARD is null
       --and a_t_price.DELETED = 0
       <if test="carrierName1!=null and carrierName1 != ''.toString() ">
         and (r_carrier.CARRIER_NAME like CONCAT('%',CONCAT(#{carrierName1},'%'))
@@ -1286,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