Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -513,6 +513,11 @@
         <if test="categoryId != null">
             AND tmgs.category_id = #{categoryId}::uuid
         </if>
+        <if  test="searchText != null">
+            AND (tmgs.sku_model  like concat('%', my_ex.likequery(#{searchText}) , '%')
+            OR  tmgs.sku_name like concat('%', my_ex.likequery(#{searchText}) , '%')
+            )
+        </if>
     </select>
 
     <!-- 获取商品个数 -->
@@ -528,6 +533,11 @@
         <if test="skuName != null">
             AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
         </if>
+        <if  test="searchText != null">
+            AND (tmgs.sku_model  like concat('%', my_ex.likequery(#{searchText}) , '%')
+            OR  tmgs.sku_name like concat('%', my_ex.likequery(#{searchText}) , '%')
+            )
+        </if>
     </select>
 
     <!-- 获取商品(采购) -->

src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.xml

@@ -124,7 +124,7 @@
                 AND tmgs.brand_id = #{brandId}::UUID
             </if>
             <if  test="searchText != null">
-                AND (tmgs.sku_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                AND (tmgs.sku_model  like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  tmgs.sku_name like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  tpi.non_std_code like concat('%', my_ex.likequery(#{searchText}) , '%')
                 )

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -226,6 +226,12 @@
             <if test="addressFull != null and addressFull != ''">
                 AND  tmc.address_full  LIKE concat('%',my_ex.likequery(#{addressFull}),'%')
             </if>
+            <if test="staffIds != null and staffIds.size()>0">
+                AND t.staff_id = any(#{staffIds, typeHandler=uuidListTypeHandler})
+            </if>
+            <if test="orgIds != null and orgIds.size()>0">
+                AND t.org_id = any(#{orgIds, typeHandler=uuidListTypeHandler})
+            </if>
             <if test="supName != null and supName != ''">
                 AND tmp.sup_name LIKE concat('%',my_ex.likequery(#{supName}),'%')
             </if>

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -450,6 +450,8 @@
             <if test="searchText !=null">
                 AND (  t.order_no LIKE concat('%', my_ex.likequery(#{searchText}), '%')
                 OR   t.contact_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+                OR   tmc.cus_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+                OR   tmc.cus_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%')
                 OR   t.address_full LIKE concat('%', my_ex.likequery(#{searchText}), '%')
                 OR   t.remarks LIKE concat('%', my_ex.likequery(#{searchText}), '%')
                 )

src/main/java/com/dk/mdm/model/query/ivt/OutboundQuery.java

@@ -246,10 +246,10 @@ public class OutboundQuery extends PageInfo<OutboundQuery> {
     private String staffName;
 
     @ApiModelProperty(value = "部门List")
-    private List<String> orgIdList;
+    private List<String> orgIds;
 
     @ApiModelProperty(value = "业务员List")
-    private List<String> staffIdList;
+    private List<String> staffIds;
 
     @ApiModelProperty(value = "出库状态List")
     private List<String> outStatusList;