修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -212,6 +212,11 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(exist = false)
     private Date endDate;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
 
     @Override
     protected Serializable pkVal() {

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

@@ -5529,7 +5529,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 * warehouseBaseInfo.getPageSize());
         //  公司ID
         pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
-        pageView.put("warehouseName", warehouseBaseInfo.getWarehouseName());
+        pageView.put("searchKeyWord", warehouseBaseInfo.getSearchKeyWord());
         pageView.put("startDate", warehouseBaseInfo.getStartDate());
         pageView.put("endDate", warehouseBaseInfo.getEndDate());
         pageView.put("pageSize", warehouseBaseInfo.getPageSize());

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

@@ -718,7 +718,6 @@
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(w.warehouse_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
         </if>
-        ORDER BY m.signing_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>