...
|
...
|
@@ -4863,7 +4863,9 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
Assert.notEmpty(synthesize_no_2_1List, "建筑类型出错了!");
|
|
|
for (Synthesize_no_2_1 synthesize_no_2_ : synthesize_no_2_1List) {
|
|
|
CalculateLoad calculateLoad = calculateLoadService.getById(synthesize_no_2_.getId());
|
|
|
if (Objects.nonNull(calculateLoad.getNo22())) {
|
|
|
annualHeatSupply += calculateLoad.getNo22();
|
|
|
}
|
|
|
heatingArea += synthesize_no_2_.getHeatArea();
|
|
|
CityDict dict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, synthesize_no_1.getProjectSite()));//城市
|
|
|
Sort sort = sortMapper.selectById(synthesize_no_2_.getBuildingTypeId());
|
...
|
...
|
@@ -4931,7 +4933,9 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
for (Synthesize_no_2_1 synthesize_no_2_ : synthesize_no_2_1List) {
|
|
|
CalculateLoad calculateLoad = calculateLoadService.getById(synthesize_no_2_.getId());
|
|
|
annualCoolingCapacity += calculateLoad.getNo22();
|
|
|
if (Objects.nonNull(synthesize_no_2_.getHeatArea())) {
|
|
|
coolingArea += synthesize_no_2_.getHeatArea();
|
|
|
}
|
|
|
CityDict dict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, synthesize_no_1.getProjectSite()));//城市
|
|
|
Sort sort = sortMapper.selectById(synthesize_no_2_.getBuildingTypeId());
|
|
|
Assert.notNull(synthesize_no_2_.getHeatEnd(), "末端形式选择出错了");
|
...
|
...
|
|