修改查询

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

@@ -60,9 +60,13 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer resultType,
+                                              Integer materialId,
+                                              Integer supplierId,
                                               String con) {
 
         mapValue.put("resultType", resultType);
+        mapValue.put("materialId",materialId);
+        mapValue.put("supplierId",supplierId);
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> tmstrainWagonLoad1 = tmstrainLoadingResultService.getTmstrainWagonLoad(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, tmstrainWagonLoad1);

src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ spring:
 openfeign:
   #正式环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   WmshBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
 

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

@@ -1262,9 +1262,17 @@
     on r_s_arrival.ARRIVAL_ID=t_load.SEND_STATION_ID
     left join RMSTRAIN_ARRIVAL_SEND r_a_arrival
     on r_a_arrival.ARRIVAL_ID=t_load.ARRIVAL_STATION_ID
-    where t_load.DELETED = 0
+    <where>
+      t_load.DELETED = 0
       and t_load.RESULT_TYPE = 3
       and t_load.PURCHASE_ORDER_RAIL_PLAN_ID is null
+      <if test="materialId !=null ">
+      and  r_material.MATERIAL_ID=#{materialId}
+      </if>
+      <if test="supplierId !=null ">
+      and  RS.SUPPLIER_ID=#{supplierId}
+      </if>
+    </where>
     )
     <where>
       <if test="purchaseOrderNo != null">