Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -49,13 +49,12 @@ public class AmsPurchaseOrderController extends BaseRESTfulController {
             con = null;
         }
         if (con != null) {
-            mapValue.put("con", "%" + con + "%");
+            mapValue.put("con", con);
         }
-        List<Map<String, Object>> list = amsPurchaseOrderService.getPurchaseOrderList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsPurchaseOrderService.getPurchaseOrderList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -29,7 +29,7 @@ public class ColumnDataUtil {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         for (Map<String, Object> columnData : columnDataList) {
             //每个表头字段的过滤条件
-            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
+            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
         }
         PageListAdd pageList = new PageListAdd(data);
         pageList.setColumnData(columnDataList);

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

@@ -486,15 +486,12 @@
         ${orderType}
       </if>
     </if>
-    <if test="orderField == null  ">
-      order by "insertTime" desc
-    </if>
   </sql>
   <select id="getPurchaseOrderList" parameterType="java.util.Map" resultType="java.util.Map">
     SELECT
     *
     FROM(
-    SELECT DISTINCT
+    SELECT
     apo.INSERT_TIME as "insertTime",
     apo.PURCHASE_ORDER_NO as "purchaseOrderNo",
     apo.PURCHASE_ORDER_DATE as "purchaseOrderDate",
@@ -520,12 +517,11 @@
     LEFT JOIN RMS_SHIPPER rsr
     ON apo.RECEIVE_UNIT_ID = rsr.SHIPPER_ID
     <if test="con != null" >
-      WHERE apo.PURCHASE_ORDER_NO like #{con}
+      WHERE instr(apo.PURCHASE_ORDER_NO, #{con}) > 0 or instr(rsu.SUPPLIER_NAME, #{con}) > 0
     </if>
     )
     <where>
       <if test="purchaseOrderNo!= null">
-        and
         <foreach collection="purchaseOrderNo" item="item" open="(" separator="," close=")">
           "purchaseOrderNo" in  #{item}
         </foreach>
@@ -592,6 +588,9 @@
       </if>
     </where>
      <include refid="orderByInsertTime"></include>
+    <if test="orderField == null  ">
+      order by "purchaseOrderNo" desc
+    </if>
   </select>
   <select id="getAppPurchaseOrderList" resultType="java.util.Map">
     select * from AMS_PURCHASE_ORDER APO