|
@@ -42,7 +42,7 @@ public class IEnergyItemDataServiceImpl implements IEnergyItemDataService {
|
|
|
public List<EnergyItemInfoVo> queryEnergyItemDataList(QueryEnergyItemDataDTO queryEnergyItemDataDTO) {
|
|
|
try {
|
|
|
ReportProjectVO projectVO = iSaasWebService.getReportProjectInfo(queryEnergyItemDataDTO.getProjectId());
|
|
|
- if (null == projectVO || StringUtils.isEmpty(projectVO.getFunctionType())) {
|
|
|
+ if (null == projectVO ) {
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
|
QueryFunctionDTO queryFunctionDTO = new QueryFunctionDTO();
|
|
@@ -52,7 +52,7 @@ public class IEnergyItemDataServiceImpl implements IEnergyItemDataService {
|
|
|
}
|
|
|
queryFunctionDTO.setEnergyType(queryEnergyItemDataDTO.getEnergyType());
|
|
|
queryFunctionDTO.setFunctionType(queryEnergyItemDataDTO.getFunctionType());
|
|
|
- queryFunctionDTO.setBuildingType(projectVO.getFunctionType());
|
|
|
+ queryFunctionDTO.setBuildingType("300");
|
|
|
// 查询配置的分项信息列表
|
|
|
List<Function> functionList = functionService.queryFunctionList(queryFunctionDTO);
|
|
|
if (CollectionUtils.isEmpty(functionList)) {
|
|
@@ -105,6 +105,11 @@ public class IEnergyItemDataServiceImpl implements IEnergyItemDataService {
|
|
|
@Override
|
|
|
public void saveEnergyItemData(SaveEnergyItemDataDTO saveEnergyItemDataDTO) {
|
|
|
try {
|
|
|
+ ReportProjectVO projectVO = iSaasWebService.getReportProjectInfo(saveEnergyItemDataDTO.getProjectId());
|
|
|
+ if (null == projectVO || StringUtils.isEmpty(projectVO.getFunctionType())) {
|
|
|
+ throw new Exception("获取不到项目信息");
|
|
|
+ }
|
|
|
+ saveEnergyItemDataDTO.setFunctionType(projectVO.getFunctionType());
|
|
|
List<EnergyItemInfoVo> energyItemInfoVoList = saveEnergyItemDataDTO.getDataList();
|
|
|
Map<String, String> itemId_functionIdMap = getFunctionIdMap(saveEnergyItemDataDTO);
|
|
|
for (EnergyItemInfoVo energyItemInfoVo : energyItemInfoVoList) {
|