一车多趟修改

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

@@ -54,6 +54,7 @@ public class AmsContractOtherPriceController extends BaseRESTfulController {
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractOtherPriceService.getLoadUnloadPriceList(mapValue);
+
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }

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

@@ -251,6 +251,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             case 12:
             case 13:
             case 14:
+            case 19:
                 addSporadicOrdersForCoke(map);
 
         }
@@ -338,6 +339,9 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             if (type.intValue() == 14) {
                 orderType += "中转";
             }
+            if (type.intValue() == 19) {
+                orderType += "退货";
+            }
             map.put("orderType", orderType);
         }
         return mapList;

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

@@ -459,7 +459,9 @@
   RCA.CARRIER_NAME AS "carrierName",
   ASO.INSERT_TIME AS "insertTime",
   OO.ORDER_TYPE AS "type",
-  ASO.TRANS_STATUS "transStatus"
+  ASO.TRANS_STATUS "transStatus",
+  ASO.SPORADIC_ORDER_TIMES "orderTimes",
+  ASO.SPORADIC_TRANS_TIMES "transTimes"
   FROM AMSTRUCK_SPORADIC_ORDER ASO
   LEFT JOIN RMS_CONSIGNEE RCO
   ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID
@@ -469,7 +471,7 @@
   ON RCA.CARRIER_ID = ASO.CARRIER_ID
   LEFT JOIN OMSTRUCK_ORDER OO
   ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
-  WHERE OO.ORDER_TYPE in (12,13,14)
+  WHERE OO.ORDER_TYPE in (12,13,14,19)
   AND ASO.ISSUE_STATUS = #{issueStatus}
   AND ASO.DELETED = 0
   <if test="userId!=null">

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

@@ -536,7 +536,7 @@
         ON RCA.CARRIER_ID = ASO.CARRIER_ID
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
-        WHERE OO.ORDER_TYPE in (12,13,14)
+        WHERE OO.ORDER_TYPE in (12,13,14,19)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
         <if test="userId!=null">