1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -293,6 +293,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         pageView.put("compId", inOutWarehouseTask.getCompId());
         pageView.put("searchKeyWord", inOutWarehouseTask.getSearchKeyWord());
         pageView.put("searchType", inOutWarehouseTask.getSearchType());
+        pageView.put("warehouseName", inOutWarehouseTask.getWarehouseName());
+        pageView.put("publisher", inOutWarehouseTask.getPublisher());
         pageView.put("inOutType", inOutWarehouseTask.getInOutType());
         pageView.put("pageSize", inOutWarehouseTask.getPageSize());
         pageView.put("currentPage", inOutWarehouseTask.getCurrentPage());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/InOutWarehouseTaskMapper.xml

@@ -26,6 +26,9 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>
+        <if test="publisher != null and publisher != ''">
+            AND (lower(publisher) like lower(CONCAT('%',#{publisher},'%')))
+        </if>
         <if test="inOutType != null and inOutType != ''">
             AND in_out_type= #{inOutType}
         </if>
@@ -78,6 +81,9 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>
+        <if test="publisher != null and publisher != ''">
+            AND (lower(publisher) like lower(CONCAT('%',#{publisher},'%')))
+        </if>
         <if test="inOutType != null and inOutType != ''">
             AND in_out_type= #{inOutType}
         </if>
@@ -85,7 +91,7 @@
             AND (lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(in_out_task_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        ORDER BY task_status DESC , establish_date DESC
+        ORDER BY establish_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>