导入修改

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmMaterialDao.xml

@@ -12,6 +12,7 @@
             m.material_spec,
             m.unit,
             m.unit_price,
+            m.supplier_name,
             m.storage_location,
             m.min_stock,
             m.max_stock,
@@ -42,6 +43,47 @@
         ORDER BY m.order_no ASC, m.create_time DESC
     </select>
 
+    <!-- 查询列表 -->
+    <select id="findList" parameterType="map" resultType="map">
+        SELECT
+        m.id,
+        m.category_id,
+        m.material_code,
+        m.material_name,
+        m.material_spec,
+        m.unit,
+        m.unit_price,
+        m.supplier_name,
+        m.storage_location,
+        m.min_stock,
+        m.max_stock,
+        m.status,
+        m.can_borrow,
+        m.material_desc,
+        m.is_used,
+        m.create_by,
+        m.create_time,
+        m.update_by,
+        m.update_time,
+        m.order_no,
+        c.category_Name AS category_name
+        FROM jl_key_dm_material m
+        LEFT JOIN jl_key_dm_material_category c ON c.Id = m.category_id
+        <where>
+            AND m.is_used = 1
+            <if test="material_name != null and material_name != ''">
+                AND m.material_name LIKE CONCAT('%', #{material_name}, '%')
+            </if>
+            <if test="material_code != null and material_code != ''">
+                AND m.material_code LIKE CONCAT('%', #{material_code}, '%')
+            </if>
+            <if test="category_id != null and category_id != ''">
+                AND m.category_id = #{category_id}
+            </if>
+        </where>
+        ORDER BY m.order_no ASC, m.create_time DESC
+    </select>
+
     <!-- 新增 -->
     <insert id="insert" parameterType="map">
         INSERT INTO jl_key_dm_material(
@@ -52,6 +94,7 @@
             material_spec,
             unit,
             unit_price,
+            supplier_name,
             storage_location,
             min_stock,
             max_stock,
@@ -70,6 +113,7 @@
             #{material_spec},
             #{unit},
             #{unit_price},
+            #{supplier_name},
             #{storage_location},
             #{min_stock},
             #{max_stock},
@@ -93,6 +137,7 @@
             material_spec = #{material_spec},
             unit = #{unit},
             unit_price = #{unit_price},
+            supplier_name = #{supplier_name},
             storage_location = #{storage_location},
             min_stock = #{min_stock},
             max_stock = #{max_stock},