tijiao

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

@@ -203,8 +203,13 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
 
     @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
     @PostMapping("/getCapacityAllOrder")
-    public RESTfulResult getCapacityAllOrder(String capacityNumber){
+    public RESTfulResult getCapacityAllOrder(String capacityNumber,String date){
-        List<Map<String, Object>> capacityAllOrderList = omstruckOrderSeparateService.getCapacityAllOrder(capacityNumber);
+        Map<String, Object> map = new HashMap<>();
+        map.put("capacityNumber",capacityNumber);
+        if(date != null){
+            map.put("date",date);
+        }
+        List<Map<String, Object>> capacityAllOrderList = omstruckOrderSeparateService.getCapacityAllOrder(map);
         return success(capacityAllOrderList);
     }
 

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.java

@@ -75,7 +75,7 @@ public interface OmstruckOrderSeparateMapper {
 
 
     //查询当前车辆之前所有已完成的订单
-    List<Map<String, Object>> getCapacityAllOrder(String capacityNumber);
+    List<Map<String, Object>> getCapacityAllOrder(Map<String,Object> map);
 
     //查询订单发货日期（订单类型为2）
     Integer getDeliveryDate(Object orderId);

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

@@ -496,8 +496,8 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
      * @param capacityNumber 车牌号
      * @return 查询当前车辆之前所有已完成的订单号 以及 订单ID
      **/
-    public List<Map<String, Object>> getCapacityAllOrder(String capacityNumber){
+    public List<Map<String, Object>> getCapacityAllOrder(Map<String,Object>map){
-        return omstruckOrderSeparateMapper.getCapacityAllOrder(capacityNumber);
+        return omstruckOrderSeparateMapper.getCapacityAllOrder(map);
     }
 
 

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

@@ -433,12 +433,12 @@
     </select>
 
 <!--    查询当前车辆之前所有已完成的订单  -->
-    <select id="getCapacityAllOrder" parameterType="string" resultType="java.util.Map">
+    <select id="getCapacityAllOrder" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
                  select OO.ORDER_ID     "orderId",
-                        OO.ORDER_NUMBER "orderNumber"
+                        OO.ORDER_NUMBER "orderNumber",
-
+                        OO.ORDER_RECEIVE_REFUSE_TIME "orderDate"
                  from OMSTRUCK_ORDER OO
                           left join RMS_CAPACITY RC
                                     on RC.CAPACITY_ID = OO.CAPACITY_ID
@@ -446,7 +446,9 @@
                    and OO.ORDER_STATUS = 2
                  order by OO.ORDER_RECEIVE_REFUSE_TIME desc
              )
-        where rownum &lt;= 51
+        <if test="date != null">
+            Where to_char("orderDate",'YYYY-MM') = #{date}
+        </if>
     </select>
 
 <!--  查询订单发货日期 （订单类型为2） -->