|
@@ -108,9 +108,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
|
|
|
private final MercPlaceService mercPlaceService;
|
|
private final MercPlaceService mercPlaceService;
|
|
|
|
|
|
- @PostMapping("groupByAdminName")
|
|
|
|
|
|
+ @Override
|
|
@ApiOperation("设备按管理员分组")
|
|
@ApiOperation("设备按管理员分组")
|
|
- public R groupByAdminName(@RequestBody @Validated DeviceInfoDto.GroupByAdminNameDto dto) {
|
|
|
|
|
|
+ public R<List<DeviceInfoDto.GroupByAdminNameVo>> groupByAdminName(@RequestBody @Validated DeviceInfoDto.GroupByAdminNameDto dto) {
|
|
String noAdmin = "未分配管理员";
|
|
String noAdmin = "未分配管理员";
|
|
List<DeviceInfoDto.GroupByAdminName> deviceInfoList = baseMapper.groupByAdminName(dto);
|
|
List<DeviceInfoDto.GroupByAdminName> deviceInfoList = baseMapper.groupByAdminName(dto);
|
|
deviceInfoList.forEach(i->{
|
|
deviceInfoList.forEach(i->{
|