Merge remote-tracking branch 'origin/master'

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

@@ -18,9 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * AmsContractTransportPrice RESTful接口：
@@ -64,10 +62,14 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
                                                       Integer apiId,
                                                       Integer pageNum,
                                                       Integer pageSize,
+                                                      String con,
                                                       Integer deleted){
         if(deleted != null) {
             mapValue.put("deleted", deleted);
         }
+        if(con !=null){
+            mapValue.put("con",con);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getAmsContractTransportPrice(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
@@ -247,10 +249,38 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsContractTruckPriceService.getAddressDeliveryAddress(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        int i=0;
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            columnData.put("filters", setListMap(saleOrderList, columnData.get("prop").toString()));
+            if (i==0){
+                columnData.put("min-width","78px");
+            }else if (i==2){
+                columnData.put("min-width","94px");
+            }
+            i++;
+        }
+        PageListAdd pageList = new PageListAdd(saleOrderList);
+        pageList.setColumnData(columnDataList);
+        //PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
     }
 
+    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
+        Set<Map<String, Object>> setString = new HashSet<>();
+        for (Map<String, Object> map : list) {//遍历每条数据
+            Map<String, Object> map1 = new HashMap<>();
+            //map.get(name)获取每条数据中对应表头字段的数据
+            map1.put("text", map.get(name));
+            if (map.get(name) != null) {
+                map1.put("value", map.get(name));
+                setString.add(map1);
+            }
+        }
+        return setString;
+    }
+
     /**
      * 获取货物类型
      * @param

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    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}
    ImFeign:

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

@@ -733,6 +733,12 @@
         <if test="deleted != null">
           and a_t_price.DELETED = #{deleted}
         </if>
+        <if test="con !=null and con != ''.toString()">
+          and
+          r_r_address.ADDRESS_PROVINCE || r_r_address.ADDRESS_DISTRICT  || r_r_address.ADDRESS_TOWN
+          || rrp.ADDRESS_DELIVERY_ADDRESS ||  r_carrier.CARRIER_NAME || r_c_type.CAPACITY_TYPE_NAME
+          like CONCAT('%',CONCAT(#{con},'%'))
+        </if>
     </where>
         )
 
@@ -845,13 +851,27 @@
   </select>
 
   <select id="getAddressDeliveryAddress" resultType="java.util.LinkedHashMap">
-    SELECT * FROM
-    (SELECT RRA.ADDRESS_ID "addressId",
-    CONCAT(CONCAT(CONCAT(RRA.ADDRESS_PROVINCE, RRA.ADDRESS_DISTRICT), RRA.ADDRESS_TOWN), RRA.ADDRESS_DELIVERY_ADDRESS) "address"
-    FROM RMS_RECEIVE_ADDRESS RRA) RRRA
+    SELECT *
+    FROM (SELECT
+    distinct
+    RRA.ADDRESS_ID "addressId",
+    RRA.ADDRESS_PROVINCE "province",
+    RRA.ADDRESS_DISTRICT "district",
+    RRA.ADDRESS_TOWN "town",
+    RRP.ADDRESS_DELIVERY_ADDRESS "address1",
+    RRA.ADDRESS_PROVINCE ||RRA.ADDRESS_DISTRICT|| RRA.ADDRESS_TOWN||RRP.ADDRESS_DELIVERY_ADDRESS "address",
+    ACTP.PRICE_VALUE "pricevalue",
+    ACTP.PRICE_ID  "priceid"
+    FROM RMS_RECEIVE_ADDRESS RRA
+    LEFT JOIN RMS_RECEIVE_PLACE RRP
+    ON RRP.ADDRESS_ID=RRA.ADDRESS_ID
+    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    ON ACTP.PLACE_ID=RRP.PLACE_ID
+    ) RRRA
     <if test="con != null" >
       WHERE RRRA."address" LIKE #{con}
     </if>
+    order by RRRA."pricevalue"  asc nulls last
   </select>
 
   <select id="selectByPriceId" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">

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

@@ -4544,7 +4544,7 @@
         FROM RMS_CONSIGNEE RC
         WHERE RC.CONSIGNEE_ID = #{receiveId}
   </select>
-  <select id="selectSaleAreaIdByName" resultType="java.math.BigDecimal" parameterType="decimal">
+  <select id="selectSaleAreaIdByName" resultType="java.math.BigDecimal" parameterType="string">
         SELECT RSA.AREA_ID FROM RMS_SALE_AREA RSA
         WHERE RSA.AREA_NAME = #{saleAreaName}
   </select>