tijiao

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

@@ -663,7 +663,8 @@ public class StatisticalReportController extends BaseRESTfulController {
                                           String capacityNo,
                                           String carrierName,
                                           String consigneeName,
-                                          String saler
+                                          String saler,
+                                          String easPrimaryId
     ){
         DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
         if(carrierSsoId != null){
@@ -689,6 +690,9 @@ public class StatisticalReportController extends BaseRESTfulController {
         if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
             map.put("salers",saler);
         }
+        if (easPrimaryId != null && !"".equals(easPrimaryId) && !"null".equals(easPrimaryId)) {
+            map.put("easPrimaryId",easPrimaryId);
+        }
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getSaleSteelReport(map);
         for (Map<String, Object> stringObjectMap : report) {

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -261,7 +261,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     parem.put("turnOf","0");
                     otmsFeign.createTotalResult(parem);
                     // 调用结算
-                    bmsTruckFeign.addDetailsOrder(orderId);
+                    try {
+                        bmsTruckFeign.addDetailsOrder(orderId);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }catch (Exception ex){
                     System.out.println(ex.getMessage());
                 }
@@ -280,7 +284,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 if (closeStatus != null && DataChange.dataToBigDecimal(closeStatus).intValue() == 0) {
                     amsFeign.dispatchTruckOrderByCarrier(mapValue);
                 }
-                bmsTruckFeign.addDetailsOrder(orderId);
+                try {
+                    bmsTruckFeign.addDetailsOrder(orderId);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 break;
             case 4:
                 i += utilsService.closeOrderNormally(map);

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

@@ -2009,6 +2009,9 @@
                     <if test="salers != null">
                         and RSR.SALER_NAME = #{salers}
                     </if>
+                    <if test="easPrimaryId != null">
+                        and ASM.EAS_PRIMARY_ID = #{easPrimaryId}
+                    </if>
                     <if test="capacityNum != null">
                         and  RCA.CAPACITY_NUMBER like #{capacityNum}
                     </if>