From 56ba708b25e1834eeb6c0366945b2c1fbafcfbe5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 10 八月 2022 15:38:31 +0800
Subject: [PATCH] 序列化前段修改fix

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
index 07e848a..ba3e45f 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
@@ -16,6 +16,7 @@
 import com.gkhy.safePlatform.equipment.model.dto.req.*;
 import com.gkhy.safePlatform.equipment.model.dto.resp.EquipmentInfoDto;
 import com.gkhy.safePlatform.equipment.repository.EquipmentInfoRepository;
+import com.gkhy.safePlatform.equipment.repository.EquipmentTypeMngRepository;
 import com.gkhy.safePlatform.equipment.service.*;
 import com.gkhy.safePlatform.equipment.utils.QueryHelpPlus;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -56,6 +57,9 @@
 
     @DubboReference(check = false)
     private AccountDepartmentService accountDepartmentService;
+
+    @Autowired
+    private EquipmentTypeMngRepository equipmentTypeMngRepository;
 
 	@Override
     public ResultVO queryAll(PageQuery<EquipmentInfoQueryCriteria> pageQuery) {
@@ -200,6 +204,11 @@
         takecareDetailList.forEach(info->{info.setLeadingPersonDepartmentName(depNameMap.get(info.getLeadingPersonDepartmentId()));});
         testDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
         repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
+
+        EquipmentTypeMng typeMng = equipmentTypeMngRepository.selectOne(new QueryWrapper<EquipmentTypeMng>().eq("id",infoDto.getEquipmentTypeId()));
+        if(typeMng != null){
+            infoDto.setEquipmentTypeName(typeMng.getTypeName());
+        }
         return infoDto;
     }
 

--
Gitblit v1.9.2