修改六矿转换接口

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java

@@ -76,7 +76,7 @@ public class ActSuppliesDetailsController extends BaseController
     @GetMapping("/materialList")
     public TableDataInfo list2(ActSuppliesDetails actSuppliesDetails)
     {
-        List<ActSuppliesDetails> list = actSuppliesDetailsService.selectActSuppliesDetailsList(actSuppliesDetails);
+        List<ActSuppliesDetails> list = actSuppliesDetailsService.selectActSuppliesDetailsMaterialList(actSuppliesDetails);
         return getDataTable(list);
     }
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesDetailsServiceImpl.java

@@ -57,7 +57,7 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
     @Override
     public List<ActSuppliesDetails> selectActSuppliesDetailsMaterialList(ActSuppliesDetails actSuppliesDetails)
     {
-        return actSuppliesDetailsMapper.selectActSuppliesDetailsList(actSuppliesDetails);
+        return actSuppliesDetailsMapper.selectActSuppliesDetailsMaterialList(actSuppliesDetails);
     }
 
     /**

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesDetailsMapper.xml

@@ -53,6 +53,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <resultMap type="ActSuppliesDetails" id="TwoActSuppliesDetailsResult">
+        <result property="id"    column="id"    />
+        <result property="sid"    column="sid"    />
+        <result property="detailsName"    column="details_name"    />
+        <result property="codes"    column="codes"    />
+        <result property="code"    column="code"    />
+        <result property="suppliesName"    column="supplies_name"    />
+
+    </resultMap>
+
+
+
     <sql id="selectActSuppliesDetailsVo">
         select id, sid, code,details_name, sysclassify, status, create_by, create_time, update_by, update_time from act_supplies_details
     </sql>
@@ -128,9 +140,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectActSuppliesDetailsMaterialList" parameterType="ActSuppliesDetails" resultMap="OneActSuppliesDetailsResult">
-        select a.id, a.sid,a.code,b.supplies_name,b.codes,a.details_name,a.sysclassify from act_supplies_details a left join act_supplies b on a.sid = b.id where status = 0
-
+    <select id="selectActSuppliesDetailsMaterialList" parameterType="ActSuppliesDetails" resultMap="TwoActSuppliesDetailsResult">
+        SELECT a.id, a.sid, a.code, b.supplies_name, b.codes, a.details_name
+        FROM act_supplies_details a
+                 LEFT JOIN act_supplies b ON a.sid = b.id
+        WHERE a.status = 0
     </select>
     
     <select id="selectActSuppliesDetailsById" parameterType="Long" resultMap="ActSuppliesDetailsResult">