对接修改

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/change/ChangeRecordVO.java

@@ -41,6 +41,10 @@ public class ChangeRecordVO extends BaseBean
     @Excel(name = "原物资id")
     private Long oldMaterialsId;
 
+    @ApiModelProperty(value = "原物资id")
+    @Excel(name = "原物资id")
+    private String oldMaterialsName;
+
     @ApiModelProperty(value = "原物资rfid")
     @Excel(name = "原物资rfid")
     private String oldMaterialsRfid;
@@ -49,6 +53,10 @@ public class ChangeRecordVO extends BaseBean
     @Excel(name = "新物资id")
     private Long newMaterialsId;
 
+    @ApiModelProperty(value = "新物资id")
+    @Excel(name = "新物资id")
+    private String newMaterialsName;
+
     @ApiModelProperty(value = "新物资rfid")
     @Excel(name = "新物资rfid")
     private String newMaterialsRfid;

ktg-iscs/src/main/resources/mapper/IsMaterialsChangeRecordMapper.xml

@@ -12,10 +12,13 @@
             t.materials_type_picture,
             u.nick_name as change_user_name,
             mc.cabinet_id,
-            mc.cabinet_name
+            mc.cabinet_name,
+            m.materials_name as new_materials_name,
+            m2.materials_name as old_materials_name
         FROM
             is_materials_change_record c
             LEFT JOIN is_materials m ON m.materials_id = c.new_materials_id
+            LEFT JOIN is_materials m2 ON m2.materials_id = c.old_materials_id
             LEFT JOIN is_materials_cabinet mc ON mc.cabinet_id = m.materials_cabinet_id
             LEFT JOIN is_materials_type t ON t.materials_type_id = m.materials_type_id
             LEFT JOIN sys_user u ON u.user_id = c.change_user_id