楚江ERP:补货单-移动端新增搜索条件

@@ -58,4 +58,11 @@ public class QueryReplenishmentOrderVo extends PageVo implements BaseVo, Seriali
      */
      */
     @ApiModelProperty("申请时间结束")
     @ApiModelProperty("申请时间结束")
     private LocalDate applicationDateEnd;
     private LocalDate applicationDateEnd;
-}
+
+
+    /**
+     * 补货单编号和购货单位名称模糊搜索
+     */
+    @ApiModelProperty("搜索条件")
+    private String searchKey;
+}

@@ -43,6 +43,7 @@
                tb.create_time,
                tb.create_time,
                tb.update_time
                tb.update_time
         FROM tbl_replenishment_order AS tb
         FROM tbl_replenishment_order AS tb
+        left join base_data_customer as cu on cu.id = tb.customer_id
     </sql>
     </sql>
 
 
     <select id="query" resultMap="ReplenishmentOrder">
     <select id="query" resultMap="ReplenishmentOrder">
@@ -69,6 +70,9 @@
             <if test="vo.applicationDateEnd != null">
             <if test="vo.applicationDateEnd != null">
                 AND tb.create_time &lt;= #{vo.applicationDateEnd}
                 AND tb.create_time &lt;= #{vo.applicationDateEnd}
             </if>
             </if>
+            <if test="vo.searchKey != null and vo.searchKey != ''">
+                AND (tb.code LIKE CONCAT('%', #{vo.searchKey},'%') OR cu.name LIKE CONCAT('%', #{vo.searchKey},'%'))
+            </if>
         </where>
         </where>
         order by tb.create_time desc
         order by tb.create_time desc
     </select>
     </select>