Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API into dev

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

@@ -91,6 +91,9 @@ public class UtilsServiceImpl implements IUtilsService {
             orderId = utilsMapper.getOrderIdByOrderNumber((String) map.get("orderNumber"));
         }
         BigDecimal segmentSqe = DataChange.dataToBigDecimal(map.get("segmentSqe"));
+        if(segmentSqe.intValue() == 0){
+            return 0;
+        }
         Map<String, Object> mesMap = new HashMap<>();
         mesMap.put("orderId", orderId);
         mesMap.put("orderLineSequence", segmentSqe);

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

@@ -578,7 +578,7 @@
                         TTR.RESULT_TOTAL_ID "resultTotalId",
                         OO.CAPACITY_ID      "capacityId",
                         RC.CAPACITY_NUMBER  "capacityNumber",
-                        TLFR.SEGMENT_SQE    "segmentsqe"
+                        TLFR.SEGMENT_SQE    "segmentSqe"
                  from OMSTRUCK_ORDER OO
                           left join TMSTRUCK_TOTAL_RESULT TTR
                                     on OO.ORDER_ID = TTR.ORDER_ID
@@ -587,7 +587,7 @@
                           left join RMS_CAPACITY RC
                                     on RC.CAPACITY_ID = OO.CAPACITY_ID
                  where OO.ORDER_NUMBER = #{orderNumber} and TLFR.RESULT_OUT_GATE_TIME is null
-                 order by "segmentsqe"
+                 order by TLFR.SEGMENT_SQE
              )
         where rownum = 1
     </select>