Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

pom.xml

@@ -118,7 +118,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <table>TMSTRUCK_UNLOAD_RESULT</table>-->
-                        <param>OMSTRUCK_ORDER</param>
+                        <param>AMSSHIP_DELIVERY_NOTICE</param>
                     </tables>
                 </configuration>
                 <executions>

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/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderSeparateMapper;
 import com.steerinfo.dil.model.OmstruckOrder;
@@ -18,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -41,8 +41,8 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
-    @Autowired
-    ESFeign esFeign;
+
+    private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @PostMapping("/getOrderMes")
     public RESTfulResult getMes(@RequestBody(required = false) Map<String, Object> map){
@@ -142,8 +142,11 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
                                                  String  con,
                                                  String userId,
                                                  String usersId,
-                                                 Integer type1
+                                                 Integer type1,
+                                                 String startTime,
+                                                 String endTime
                                                  ) {
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         if (orderStatus != null) {
             mapValue.put("status", orderStatus);
         }
@@ -162,6 +165,9 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         if (usersId!=null){
             mapValue.put("usersId",usersId);
         }
+        if(con != null && !"null".equals(con)){
+            mapValue.put("con","%" + con + "%");
+        }
         //框计算
         PageHelper.startPage(pageNum, pageSize);
         //分页数据

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>

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

@@ -340,7 +340,8 @@
         RC2.CONSIGNEE_COMPANY_NAME "receiveCompany",
         ASO.INSERT_TIME            "insertTime",
         RC.CAPACITY_NUMBER         "capacityNumber",
-        rce.carrier_name           "carrierName"
+        rce.carrier_name           "carrierName",
+        RC.CAPACITY_NUMBER || RC2.CONSIGNEE_COMPANY_NAME || RS.SUPPLIER_NAME "liekCon"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.ORDER_ID = OO.ORDER_ID
@@ -375,11 +376,21 @@
             <if test="usersId != null">
                 and ASO.UPDATE_USERNAME= #{usersId}
             </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.INSERT_TIME
+            </if>
         </where>
         )
         <where>
+            <if test="con != null">
+                and "liekCon" like #{con}
+            </if>
             <if test="sporadicOrderNo != null">
-                <foreach collection="sporadicOrderNo" item="item" open="(" separator="or" close=")">
+                and <foreach collection="sporadicOrderNo" item="item" open="(" separator="or" close=")">
                     "sporadicOrderNo" like '%${item}%'
                 </foreach>
             </if>