增加备货列表按照名称模糊收索

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java

@@ -14,6 +14,11 @@ public class StockupDTO implements Serializable {
 
 	private Integer status;//0未完成  1已完成
 
+	/**
+	 * 客户名城
+	 */
+	private String customName;
+
 	@ApiModelProperty("当前页")
 	private Integer current;
 	@ApiModelProperty("每页的数量")

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -398,16 +398,9 @@
     </select>
 
     <select id="selectHomeStockupPage" resultType="com.logpm.distribution.vo.DistributionStockupListVO">
+        select t.* from (
         select DISTINCT lds.id , lds.type_service typeService,lds.stockup_status stockupStatus,lds.stockup_area
         stockupArea,
-        <!--(
-        select GROUP_CONCAT(DISTINCT  IFNULL(ldsa.consignee_person,'') SEPARATOR ',')
-        from logpm_distribution_stockup ds
-        LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id
-        LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id = ldsi.reservation_id and ldrs.stock_article_status in (1,3)
-        LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id
-        where ds.id = lds.id
-        ) customer,-->
         (
         select GROUP_CONCAT(DISTINCT IFNULL(ldr.consignee,'') SEPARATOR ',')
         from logpm_distribution_stockup ds
@@ -474,6 +467,7 @@
             and lds.forklift_id = #{param.userId}
         </where>
         UNION
+
         select DISTINCT lds.id ,lds.type_service typeService,lds.stockup_status stockupStatus,lds.stockup_area
         stockupArea,
         (
@@ -525,6 +519,12 @@
             and lds.assign_status = 20
             and lds.forklift_id = #{param.userId}
         </where>
+        ) t
+        <where>
+            <if test="param.customName !=null and param.customName !=''">
+                t.customer like  concat('%', #{param.customName},'%')
+            </if>
+        </where>
     </select>
     <select id="selectStockupClientInfo" resultType="com.logpm.distribution.vo.DistributionStockupListVO">
         select DISTINCT ldr.consignee      customer,