|
@@ -201,11 +201,11 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
|
|
}else {
|
|
}else {
|
|
mapValue.put("con","%" +"%");
|
|
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
|
|
//1.先查询出收货地址的所有收货ID
|
|
List<Map<String, Object>> receiveAddress = amsContractTruckPriceService.getReceiveAddressId(mapValue);
|
|
List<Map<String, Object>> receiveAddress = amsContractTruckPriceService.getReceiveAddressId(mapValue);
|
|
//2.查询出该收货所有的单价信息
|
|
//2.查询出该收货所有的单价信息
|