'合并冲突'

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

@@ -1157,6 +1157,12 @@ public class OmstruckOrderController extends BaseRESTfulController {
         int result = omstruckOrderService.addAppTruckOrder(dispatchId, orderType, capacityNumber,carrierId);
         return success(result);
     }
+    @ApiOperation(value = "关闭订单")
+    @PostMapping("/CloseOrder")
+    public  RESTfulResult CloseOrder(@RequestBody(required = false)Map<String,Object> map){
+      int result=omstruckOrderService.closeOrder(map);
+      return success(result);
+    }
 
     @ApiOperation(value = " 查询所有车牌号和司机")
     @ApiImplicitParams({

src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -150,4 +150,6 @@ public interface IOmstruckOrderService {
 
     // 查询所有车牌号和司机
     List<Map<String, Object>> getCapacityAndDriverList(Map<String, Object> mapValue);
+    //关闭运输订单
+    int closeOrder(Map<String,Object> map);
 }

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

@@ -1119,5 +1119,15 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return omstruckOrderMapper.getCapacityAndDriver(mapValue);
     }
 
+    @Override
+    public int closeOrder(Map<String, Object> map) {
+        Integer orderId =(Integer) map.get("orderId");
+        OmstruckOrder omstruckOrder=new OmstruckOrder();
+        omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
+        omstruckOrder.setOrderStatus(new BigDecimal(8));
+        omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+        return 1;
+    }
+
 
 }

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

@@ -666,10 +666,10 @@
         OO.INSERT_USERNAME "insertUsername",
         OO.INSERT_TIME "insertTime",
         OO.ORDER_NUMBER "orderNumber",
-        RW.WAREHOUSE_NAME "warehouseName", --卸货点
-        OO.ORDER_ENTRY_TIME "orderEntryTime", --进厂时间
-        RS.SUPPLIER_NAME "supplierName", --发货单位
-        RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName" --收货单位
+        RW.WAREHOUSE_NAME "warehouseName",
+        OO.ORDER_ENTRY_TIME "orderEntryTime",
+        RS.SUPPLIER_NAME "supplierName",
+        RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
 
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
@@ -1430,6 +1430,28 @@
         WHERE oo.ORDER_ISSUE_TIME IS NOT NULL
           AND oo.ORDER_RECEIVE_STATUS = 1
           AND oo.ORDER_TYPE = #{orderType}
+    <where>
+        <if test="saleNumber != null">
+            <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                "saleNumber" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="orderNumber != null">
+            <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                "orderNumber" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="insertUsername != null">
+            <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">
+                "insertUsername" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="capacityNumber != null">
+            <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                "capacityNumber" like '%${item}%'
+            </foreach>
+        </if>
+    </where>
     </select>
 
     <!--查询司机排班信息-->