|
@@ -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")) {
|
|
|
-
|
|
|
- String carrierName1 = amsContractTruckPriceService.getCarrierNameForDetail(userId);
|
|
|
- mapValue.put("carrierName1","%" + carrierName1 + "%");
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
List<Map<String, Object>> receiveAddress = amsContractTruckPriceService.getReceiveAddressId(mapValue);
|
|
|
|
|
@@ -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);
|
|
|
|