|
|
@ -56,7 +56,7 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf |
|
|
|
if(CollectionUtils.isEmpty(icFormItemEntityList)){ |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
Set<String> groupIds = icFormItemEntityList.stream().filter(item-> !"0".equals(item.getItemGroupId())).map(item->item.getItemGroupId()).collect(Collectors.toSet()); |
|
|
|
Set<String> groupIds = icFormItemEntityList.stream().filter(item-> !"0".equals(item.getItemGroupId())).map(IcFormItemEntity::getItemGroupId).collect(Collectors.toSet()); |
|
|
|
List<IcFormItemGroupEntity> icFormItemGroupEntityList = new ArrayList<>(); |
|
|
|
if(!CollectionUtils.isEmpty(groupIds)){ |
|
|
|
icFormItemGroupEntityList.addAll(icFormItemGroupDao.selectList(new QueryWrapper<IcFormItemGroupEntity>().lambda().eq(IcFormItemGroupEntity::getCustomerId,customerId).in(IcFormItemGroupEntity::getId, groupIds))); |
|
|
@ -149,15 +149,11 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf |
|
|
|
} |
|
|
|
|
|
|
|
//4.返回数据
|
|
|
|
List<IcResiCategoryStatsConfigResultDTO> result = icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel()); |
|
|
|
|
|
|
|
return result; |
|
|
|
return icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel()); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public IcResiCategoryStatsConfigResultDTO info(String id,String customerId) { |
|
|
|
IcResiCategoryStatsConfigResultDTO result =new IcResiCategoryStatsConfigResultDTO(); |
|
|
|
return icResiCategoryStatsConfigDao.info(id,customerId); |
|
|
|
} |
|
|
|
|
|
|
@ -228,7 +224,5 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf |
|
|
|
warnConfigEntity.setSort(collect.get(0).getSort()); |
|
|
|
} |
|
|
|
icResiCategoryWarnConfigService.updateBatchById(warnConfigEntityList); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|