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

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

@@ -405,7 +405,9 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         if (con != null && !"null".equals(con)){
             mapValue.put("con","%" +con+ "%");
         }
-        PageHelper.startPage(pageNum, pageSize);
+        if(pageNum!=null&&!("".equals(pageNum))&&pageSize!=null&&!("".equals(pageSize))){
+            PageHelper.startPage(pageNum, pageSize);
+        }
         List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getSteelTruckDetailsOrder(mapValue);
         //查询多条数据
         for (Map<String, Object> objectMap : columnList) {

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

@@ -667,7 +667,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                 BigDecimal resultTime = DataChange.dataToBigDecimal(mapVal.get("Time1"));
                 //保留两位小数
                 DecimalFormat df = new DecimalFormat("0.00");
-                BigDecimal settleTime  = new BigDecimal(df.format((float)resultTime.doubleValue()/60.00));
+                BigDecimal settleTime  = new BigDecimal(String.valueOf(resultTime.divide(new BigDecimal(60), 14, BigDecimal.ROUND_HALF_UP)));
                 if(settleTime.doubleValue()<2.00){
                     BigDecimal detailsAmount = new BigDecimal(priceValue.doubleValue()*2);
                     bmstruckDetailsOrder.setDetailsAmount(new BigDecimal(df.format(detailsAmount)));

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

@@ -1491,7 +1491,7 @@
                        LEFT JOIN RMS_CAPACITY RC
                                  ON RC.CAPACITY_ID = OO.CAPACITY_ID
                        LEFT JOIN RMS_CAPACITY_TYPE RCT
-                                 ON RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
+                                 ON RCT.CAPACITY_TYPE_ID = AIR.CAPACITY_TYPE_ID
                        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
                                  ON ACTP.PRICE_ID = BDO.PRICE_ID
               WHERE OO.ORDER_TYPE in (21,11)