设备类型报表

platform-dao/src/main/java/com/platform/dao/vo/sb/SbTypeVO.java

@@ -19,6 +19,7 @@ import java.util.List;
 @Table(name = "t_sb_type")
 @Data
 public class SbTypeVO implements Serializable {
+    private Integer useType;
 
     /**
      * 类型id

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

@@ -541,7 +541,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         SbType sbType = sbTypeMapper.selectById(model.getParentId());
         //如果是父设备是机械，则需要将动设备，静设备和特种设备手动挂在机械下面
         List<SbInfoTypeReportVO2> sbInfoTypeReportVO2s = new ArrayList<>();
-        if (sbType.getName().equals("机械")){
+        if (id==null||sbType.getName().equals("机械")){
             //二级菜单，需将动设备，静设备加进来
             List<String> list = new ArrayList<>();
             list.add("机械-动设备");
@@ -568,6 +568,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                         break;
                     }
                 } while (true);
+                types.add(vo.getId());
                 if (types.size()>0) {
                     typeMap.put(vo.getName(), types);
                 }
@@ -578,6 +579,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                 model = new SbTypeDTO();
                 model.setIdList(typeMap.get(name));
                 SbInfoTypeReportVO2 reportVO2s = sbTypeMapper.getSbNums(model);
+                reportVO2s.setTypeName(name);
                 sbInfoTypeReportVO2s.add(reportVO2s);
             }
             //再将特种设备加进来
@@ -604,6 +606,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                         break;
                     }
                 } while (true);
+                types.add(vo.getId());
                 if (types.size()>0) {
                     typeMap.put(vo.getName(), types);
                 }
@@ -613,6 +616,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                 model = new SbTypeDTO();
                 model.setIdList(typeMap.get(name));
                 SbInfoTypeReportVO2 reportVO2s = sbTypeMapper.getSbNums(model);
+                reportVO2s.setTypeName(name);
                 sbInfoTypeReportVO2s.add(reportVO2s);
             }
         }

platform-service/src/main/java/com/platform/service/sb/impl/SbTypeServiceImpl.java

@@ -79,10 +79,13 @@ public class SbTypeServiceImpl extends BaseServiceImpl<SbTypeMapper, SbType, SbT
             list.add("机械-静设备");
             model = new SbTypeDTO();
             model.setNameList(list);
-            List result2 = mapper.selectVOList(model);
+            List<SbTypeVO> result2 = mapper.selectVOList(model);
+            SbTypeVO vo = new SbTypeVO();
+            vo.setName("特种设备");
+            vo.setUseType(5);
+            result.add(vo);
             result.addAll(result2);
         }
-
         return result;
     }