3254194295 vor 2 Jahren
Ursprung
Commit
882664e631

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/mapper/sb/SbInfoMapper.java

@@ -132,7 +132,7 @@ public interface SbInfoMapper extends MyMapper<SbInfo> {
 
     SbTreeVO getSbTree(SbInfoDTO sbInfoDTO);
 
-    List<String> getSubSb(SbInfoDTO sbInfoDTO);
+    List<SbInfoVO> getSubSb(SbInfoDTO sbInfoDTO);
 
 
 

+ 2 - 2
platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -732,7 +732,7 @@ user.real_name as saveUserName
     </select>
 
     <select id="getSubSb" parameterType="com.platform.dao.dto.sb.SbInfoDTO"
-            resultType="String">
-            select id from t_sb_info where parent_id=#{id}
+            resultType="com.platform.dao.vo.sb.SbInfoVO">
+            select id,name from t_sb_info where parent_id=#{id}
     </select>
 </mapper>

+ 7 - 3
platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -599,13 +599,16 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
 
 @Override
     public SbTreeVO getSbVOById(SbInfoDTO sbInfoDTO) {
-        List<String> ids=sbInfoMapper.getSubSb(sbInfoDTO);
+        SbInfoVO sbInfoVO=sbInfoMapper.getById(sbInfoDTO.getId());
+        List<SbInfoVO> ids=sbInfoMapper.getSubSb(sbInfoDTO);
         SbTreeVO sbTreeVO = new SbTreeVO();
+        sbTreeVO.setName(sbInfoVO.getName());
         List<SbTreeVO> subSbTreeList=new ArrayList<>();
         if(ids!=null&&ids.size()>0){
-            for(String id: ids){
+            for(SbInfoVO id: ids){
                 SbInfoDTO infoDTO=new SbInfoDTO();
-                SbTreeVO subSbTreeVO= getSbVOById(infoDTO.setId(id));
+                SbTreeVO subSbTreeVO= getSbVOById(infoDTO.setId(id.getId()));
+                subSbTreeVO.setName(id.getName());
                 subSbTreeList.add(subSbTreeVO);
 
             }
@@ -631,6 +634,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             }
             info.setSparePartInfoVOList(spareList2);
         }
+
         sbTreeVO.setId(sbInfoDTO.getId());
         sbTreeVO.setPartInfoList(partInfoList);
         sbTreeVO.setSbModelSpareBomVOList(spareList);