|
@@ -527,6 +527,13 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
|
|
|
|
|
|
@Override
|
|
|
public List<SbInfoTypeReportVO2> getSbNumReport(SbTypeDTO model) {
|
|
|
+ List<SbInfoTypeReportVO2> sbInfoTypeReportVO2s = new ArrayList<>();
|
|
|
+ if ("特种设备".equals(model.getId())){
|
|
|
+ SbInfoDTO dto = new SbInfoDTO();
|
|
|
+ dto.setUseType(5);
|
|
|
+ sbInfoTypeReportVO2s = mapper.getsbNumsByType(dto);
|
|
|
+ return sbInfoTypeReportVO2s;
|
|
|
+ }
|
|
|
String id = model.getId();
|
|
|
model = new SbTypeDTO();
|
|
|
model.setParentId(id);
|
|
@@ -540,7 +547,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
|
|
|
}
|
|
|
SbType sbType = sbTypeMapper.selectById(model.getParentId());
|
|
|
//如果是父设备是机械,则需要将动设备,静设备和特种设备手动挂在机械下面
|
|
|
- List<SbInfoTypeReportVO2> sbInfoTypeReportVO2s = new ArrayList<>();
|
|
|
+
|
|
|
if (id==null||sbType.getName().equals("机械")){
|
|
|
//二级菜单,需将动设备,静设备加进来
|
|
|
List<String> list = new ArrayList<>();
|