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

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

@@ -125,8 +125,8 @@ public class OffSiteTransportationController extends BaseRESTfulController {
             SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
             String startTime1=simpleDateFormat.format(startDate);
             String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.replace("startTime",startTime1);
-            mapValue.replace("endTime",endTime1);
+            mapValue.put("startTime",startTime1);
+            mapValue.put("endTime",endTime1);
         }
         List<Map<String,Object>> filter= offSiteTransportationService.getInTransitTransportation(mapValue);
         PageHelper.startPage(pageNum, pageSize);
@@ -171,8 +171,8 @@ public class OffSiteTransportationController extends BaseRESTfulController {
             SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
             String startTime1=simpleDateFormat.format(startDate);
             String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.replace("startTime",startTime1);
-            mapValue.replace("endTime",endTime1);
+            mapValue.put("startTime",startTime1);
+            mapValue.put("endTime",endTime1);
         }
         //已经完成
         mapValue.put("orderStatus",2);

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

@@ -1065,11 +1065,11 @@
     on ASM1.MATERIAL_ID=RM.MATERIAL_ID
     where OO.ORDER_TYPE in (1) and TRR.INSERT_TIME IS NOT NULL
     <if test="oneDate != null">
-      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TAR.INSERT_TIME
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =  TRR.INSERT_TIME
     </if>
     <if test="startDate != null">
-      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TAR.INSERT_TIME
-      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TAR.INSERT_TIME
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  TRR.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  TRR.INSERT_TIME
     </if>
     <if test="con!=null">
       and (instr(RC.CAPACITY_NUMBER,#{con})>0 or instr(RM.MATERIAL_NAME,#{con})>0