火车发运明细修改

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

@@ -48,7 +48,9 @@ public class OmstrainOrderController extends BaseRESTfulController {
                                                  String sendStation,
                                                  String toTheStation,
                                                  String consigneeName,
-                                                 String wagonNo){
+                                                 String wagonNo,
+                                                 String weightNoParam,
+                                                 Boolean isNullwagonNo){
         DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
         if(sendStation != null && !"null".equals(sendStation)){
             map.put("sendStation",sendStation);
@@ -62,6 +64,14 @@ public class OmstrainOrderController extends BaseRESTfulController {
         if(wagonNo != null && !"null".equals(wagonNo)){
             map.put("wagonNo",wagonNo);
         }
+        if(weightNoParam != null && weightNoParam.trim().length()>0 && !"null".equals(weightNoParam)){
+            map.put("weightNoParam",weightNoParam);
+        }
+        if(isNullwagonNo != null){
+            map.put("isNullwagonNo",isNullwagonNo);
+        }
+        System.out.println("weightNoParam:"+weightNoParam);
+        System.out.println("isNullwagonNo:"+isNullwagonNo);
         List<Map<String,Object>> mapList = omstrainOrderService.getWagonShippingDetails(map);
         return success(mapList);
     }

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

@@ -686,6 +686,12 @@
                           <if test="materialName != null">
                           and RAR.ARRIVAL_NAME  like '%${materialName}'
                           </if>
+                          <if test="weightNoParam != null">
+                          AND TWR.INSERT_UPDATE_REMARK LIKE '%${weightNoParam}%'
+                          </if>
+                          <if test="isNullwagonNo != null and isNullwagonNo == true">
+                            AND OTO.ORDER_WAGON_NO IS null
+                          </if>
                         Order By "OutStation" desc,OTO.ORDER_WAGON_NO
                           )
   </select>