提交代码

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

@@ -698,9 +698,15 @@ public class StatisticalReportController extends BaseRESTfulController {
             if (shippingAddressIds !=null && !("".equals(shippingAddressIds))){
                 String[] split = shippingAddressIds.split(",");
                 String address="";
+                int i=0;
                 for (String s : split) {
+                    i++;
                     String getaddress = statisticalReportService.getaddress(DataChange.dataToBigDecimal(s));
-                    address+=getaddress+",";
+                    if (i==1){
+                        address+="旧地址:"+getaddress+",";
+                    }else if (i==2){
+                        address+="新地址:"+getaddress;
+                    }
                 }
                 stringObjectMap.put("addressPlace",address);
             }
@@ -708,9 +714,16 @@ public class StatisticalReportController extends BaseRESTfulController {
             if (capacityNumbers!=null &&!("".equals(capacityNumbers))){
                 String[] split = capacityNumbers.split(",");
                 String capacityNumber="";
+                int flag=0;
                 for (String s : split) {
+                    flag++;
                     String s1 = statisticalReportService.getcapacityNumber(DataChange.dataToBigDecimal(s));
-                    capacityNumber+=s1+",";
+                    if (flag==1){
+                        capacityNumber+="旧车号:"+s1+",";
+                    }else if (flag==2){
+                        capacityNumber+="新车号:"+s1;
+                        break;
+                    }
                 }
                 stringObjectMap.put("capacityNo",capacityNumber);
             }