增加商品导入的功能

src/main/resources/mapper_xml/MaterialMapperEx.xml

@@ -77,4 +77,22 @@
         UnitId = null
         where Id = #{id,jdbcType=BIGINT}
     </update>
+
+    <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">
+        select m.*,u.uname unitName, mc.name categoryName
+        FROM jsh_material m
+        left JOIN jsh_unit u on m.UnitId = u.id
+        left JOIN jsh_materialcategory mc on m.CategoryId = mc.id
+        where 1=1
+        <if test="name != null">
+            and m.name like '%${name}%'
+        </if>
+        <if test="model != null">
+            and m.model like '%${model}%'
+        </if>
+        <if test="categoryId != 1">
+            and m.CategoryId in (${categoryIds})
+        </if>
+        order by m.id asc
+    </select>
 </mapper>

src/main/resources/mapper_xml/SupplierMapperEx.xml

@@ -45,4 +45,25 @@
             and description like '%${description}%'
         </if>
     </select>
+
+    <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="BaseResultMap">
+        select *
+        FROM jsh_supplier
+        where 1=1
+        <if test="supplier != null">
+            and supplier like '%${supplier}%'
+        </if>
+        <if test="type != null">
+            and type='${type}'
+        </if>
+        <if test="phonenum != null">
+            and phonenum like '%${phonenum}%'
+        </if>
+        <if test="telephone != null">
+            and telephone like '%${telephone}%'
+        </if>
+        <if test="description != null">
+            and description like '%${description}%'
+        </if>
+    </select>
 </mapper>