Merge branch 'dev'

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

@@ -2,20 +2,16 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -809,44 +805,22 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                               String con,
                                               String carrierSsoId
     ) {
-        int count = 0;
         if (orderType != null) {
             mapValue.put("orderTypee", orderType);
-            count++;
         }
 
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
-            count++;
         }
-        mapValue.put("carrierSsoId",carrierSsoId);
-        count++;
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_driverinfo_for_sale";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
+        if (con != null && (con.equals("") || con.equals("undefined"))) {
+            con = null;
         }
-        //不分页筛选数据
-        List<Map<String, Object>> DiverInfoForSale = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            DiverInfoForSale = omstruckOrderService.selectTransportOrderForSale(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_driverinfo_for_sale");
-            //添加id
-            map.put("indexId", "driverInfoId");
-            DiverInfoForSale.add(map);
-            //新建索引
-            esFeign.insertIndex(DiverInfoForSale);
-            //删除
-            DiverInfoForSale.remove(DiverInfoForSale.size() - 1);
+        if (con != null && con.length() != 0) {
+            mapValue.put("con", "%" + con + "%");
         }
-        if (DiverInfoForSale == null)
-            DiverInfoForSale = omstruckOrderService.selectTransportOrderForSale(mapValue);
+        mapValue.put("carrierSsoId",carrierSsoId);
+        //不分页筛选数据
+        List<Map<String, Object>> DiverInfoForSale = omstruckOrderService.selectTransportOrderForSale(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> diverInfoForSaleorder = omstruckOrderService.selectTransportOrderForSale(mapValue);

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

@@ -834,11 +834,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         BigDecimal carrierId = omstruckOrderMapper.getCarrierIdBySSO(carrierSsoId);
         map.put("carrierId",carrierId);
         List<Map<String, Object>> mapList = omstruckOrderMapper.selectTransportOrderForSale(map);
-        int count = 1;
-        for (Map<String, Object> stringObjectMap : mapList) {
-            stringObjectMap.put("ROW_ID",count);
-            count ++;
-        }
+//        int count = 1;
+//        for (Map<String, Object> stringObjectMap : mapList) {
+//            stringObjectMap.put("ROW_ID",count);
+//            count ++;
+//        }
         return mapList;
     }
 

src/main/resources/application-dev.yml

@@ -11,13 +11,13 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8018}
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
 
 server:
   port: 8016

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

@@ -1662,8 +1662,8 @@
     </select>
     <!--销售，查看运输订单(钢材销售订单)并根据司机接受或者拒绝时间进行排序  -->
     <select id="selectTransportOrderForSale" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT *
-        from(
+        SELECT * FROM (
+        SELECT *from(
         select
         OO.ORDER_NUMBER "orderNumber",
         ASO.SALE_NUMBER "saleNumber",
@@ -1698,6 +1698,10 @@
                 and OO.ORDER_TYPE in (1, 2)
             </if>
         </where>
+        ) RRC
+        <if test="con != null">
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con}
+        </if>
         )
         <where>
             <if test="orderNumber != null">

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

@@ -505,7 +505,7 @@
         join AMS_SALE_ORDER_MATERIAL ASOM
             on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         where OO.ORDER_ID = #{orderId}
-          and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
+          and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD') >= TO_CHAR(SYSDATE, 'YYYY-MM-DD')
     </select>
 
  <!--    修改运输订单趟次-->