采购内转运输订单查询

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

@@ -1104,7 +1104,8 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                Integer orderStatus,
                                                String carrierId,
                                                String con,
-                                               Integer planEnableStatus) {
+                                               Integer planEnableStatus,
+                                               String userId) {
 
         if (mapValue == null) {
             mapValue = new HashMap<>();
@@ -1115,6 +1116,12 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (planEnableStatus != null && !"undefined".equals(planEnableStatus)) {
             mapValue.put("planEnableStatus",planEnableStatus);
         }
+        if(con!=null && !"".equals(con) && !"undefined".equals(con) && !"null".equals(con)){
+            mapValue.put("con",con);
+        }
+        if(userId!=null && !"".equals(userId) && !"undefined".equals(userId)){
+            mapValue.put("userId",userId);
+        }
         mapValue.put("orderStatus",orderStatus);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = omstruckOrderService.getPurInwardOrderList(mapValue);

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

@@ -3538,6 +3538,12 @@
         <if test="planEnableStatus !=null">
             AND AIP.PLAN_EABLE_STATUS = 1
         </if>
+        <if test="con!=null and con!=''.toString()">
+            AND APO.PURCHASE_ORDER_NO || RC.CAPACITY_NUMBER LIKE CONCAT('%',CONCAT(#{con},'%'))
+        </if>
+        <if test="userId!=null">
+            AND OO.OPTIONER_CODE LIKE CONCAT('%',CONCAT(#{userId},'%'))
+        </if>
         ORDER BY OO.INSERT_TIME DESC
         )