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

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

@@ -251,7 +251,11 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
         if (orderType!=null&&!orderType.equals("undifined")&&!orderType.equals("")){
             mapValue.put("orderType",orderType);
         }
-        PageHelper.startPage(pageNum,pageSize);
+        if (pageNum==null||pageSize==null){
+
+        }else {
+            PageHelper.startPage(pageNum,pageSize);
+        }
         //分页数据
         List<Map<String, Object>> result = tmstruckTimeTaskResultService.getAllTimeTaskResult(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,result);

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

@@ -722,9 +722,9 @@
     select * from (select RC.CAPACITY_NUMBER "capacityNumber",
     OO.ORDER_ID "orderId",
     OO.ORDER_NUMBER "orderNumber",
-    CONCAT(TTTR.RESULT_VALUE,RUOM.UNIT_OF_MEASURE_NAME) AS "resultTime",
+    TTTR.RESULT_VALUE AS "resultTime",
     RCT.CAPACITY_TYPE_NAME "capacityTypeName",
-    TTTR.RESULT_ABOUT_TIME "aboutTime",
+    TTTR.result_balance_time   "aboutTime",
     TTTR.INSERT_TIME "insertTime",
     RP.PERSONNEL_NAME  "personName",
     (