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

src/main/java/com/dk/mdm/mapper/mst/DictionaryDataMapper.xml

@@ -96,6 +96,10 @@
             <if test="flgDefault != null">
                 AND flg_default = #{flgDefault}
             </if>
+            <if test="searchText != null">
+                AND (position(#{searchText} in data_value) > 0   OR position(#{searchText} in dict_code) > 0   OR  position(#{searchText} in remarks) > 0 )
+            </if>
+
         </where>
     </sql>
 

src/main/java/com/dk/mdm/mapper/mst/SaleChannelMapper.xml

@@ -84,6 +84,9 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
+            <if test="searchText != null">
+                AND (position(#{searchText} in channel_name) > 0   OR position(#{searchText} in channel_code) > 0   OR  position(#{searchText} in remarks) > 0 )
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/mapper/mst/WarehouseMapper.xml

@@ -95,6 +95,9 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
+            <if test="searchText != null">
+                AND (position(#{searchText} in wh_name) > 0   OR position(#{searchText} in wh_code) > 0   OR  position(#{searchText} in remarks) > 0 )
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/model/query/mst/DictionaryDataQuery.java

@@ -174,6 +174,9 @@ public class DictionaryDataQuery extends PageInfo<DictionaryDataQuery> implement
     @ApiModelProperty(value = "")
     private Boolean flgDefault;
 
+    @ApiModelProperty(value = "查询条件")
+    private String searchText;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/query/mst/SaleChannelQuery.java

@@ -166,7 +166,8 @@ public class SaleChannelQuery extends PageInfo<SaleChannelQuery> implements Seri
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
-
+    @ApiModelProperty(value = "查询条件")
+    private String searchText;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/query/mst/WarehouseQuery.java

@@ -182,7 +182,8 @@ public class WarehouseQuery extends PageInfo<WarehouseQuery> implements Serializ
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
-
+    @ApiModelProperty(value = "查询条件")
+    private String searchText;
     /*
      * 相关属性
      * @TableField(exist = false)