修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentServiceImpl.java

@@ -341,7 +341,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
         equipmentApp.setEquipmentBase(equipmentBaseApp);
         //技术文档
         QueryWrapper<UploadFile> excelQueryWrapper = new QueryWrapper<>();
-        excelQueryWrapper.eq("object_id", equipmentBaseApp.getEquipId());
+        excelQueryWrapper.eq("object_id", equipmentBaseApp.getEquipDetailId());
         excelQueryWrapper.eq("file_type", "instruction");
         List<UploadFile> uploadFiles1 = uploadFileMapper.selectList(excelQueryWrapper);
         for (UploadFile s : uploadFiles1) {

amos-boot-system-equip/src/main/resources/mapper/EquipmentMapper.xml

@@ -109,11 +109,12 @@
 
     <select id="getEquipmentAppMessage" resultMap="EquipmentAppMessage">
 		SELECT DISTINCT
+            /*bug 4678 设备详情装备编码错误显示为装备定义的编码 修改原有代码  wled.code as equip_code 为wleq.code as equip_code*/
 		    wle.id as equip_id,
 		    wleq.id as equipmentSpecificId,
 		    wleq.equipment_detail_id,
 		    wled.name as equip_name,
-		    wled.code as equip_code,
+            wleq.code as equip_code,
 		    wled.expiry_date,
 			wled.standard,
 			wlsd.name AS country,