修改

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

@@ -290,7 +290,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                           Integer orderType,
                                           Integer fuelOrder,
                                           String con,
-                                          String carrierSSOId) {
+                                          String carrierSSOId,
+                                          String startTime,
+                                          String endTime) {
+
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
         }
@@ -311,6 +314,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
                 mapValue.put("carrierSSOId", carrierSSOId);
             }
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> truckOrder = omstruckOrderService.getAllTruckOrder(mapValue);
@@ -762,11 +766,16 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                               Integer orderStatus,
                                               Integer fuelOrder,
                                               String carrierSSOId,
-                                              String con
+                                              String con,
+                                              String startTime,
+                                              String endTime
     ) {
         if (orderType != null) {
             mapValue.put("orderTypee", orderType);
         }
+        if (con != null||"null".equals(con)) {
+            mapValue.put("con", con);
+        }
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
         }
@@ -778,6 +787,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
                 mapValue.put("carrierSSOId", carrierSSOId);
             }
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> order = omstruckOrderService.getTransportDispatch(mapValue);

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:

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

@@ -896,9 +896,16 @@
             <if test="carrierSSOId != null">
                 and RCA.CARRIER_SSO_ID = #{carrierSSOId}
             </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =   OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OO.ORDER_ISSUE_TIME
+            </if>
             <if test="con!=null">
-                and (instr(RCSE.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
-                 or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0)
+                and ((instr(RCSE.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
+                 or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0))
             </if>
         </where>
         )
@@ -1530,6 +1537,17 @@
             <if test="carrierSSOId != null">
                 and RCA.CARRIER_SSO_ID = #{carrierSSOId}
             </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=   OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="con!=null">
+                and ((instr(RCON.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
+                or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0))
+            </if>
         </where>
         )
         <where>