...
|
...
|
@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.context.ApplicationContext;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Propagation;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.Assert;
|
|
|
import org.springframework.util.StringUtils;
|
...
|
...
|
@@ -46,7 +47,7 @@ import java.util.stream.Collectors; |
|
|
*/
|
|
|
@Service
|
|
|
@Slf4j
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
//@Transactional(rollbackFor = Exception.class)
|
|
|
public class ProjectServiceImpl implements ProjectService {
|
|
|
|
|
|
@Autowired
|
...
|
...
|
@@ -274,6 +275,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@Transactional(propagation = Propagation.SUPPORTS)
|
|
|
public No_3_1Tall_Dto no3_1_1GetType(String id) {
|
|
|
Synthesize_no_1 byId = no_1Service.getById(id);
|
|
|
byId.setCountState("1");
|
...
|
...
|
@@ -1485,7 +1487,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
double totalAnnualTotalHotWaterRequirement = 0.0;
|
|
|
for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s) {
|
|
|
CalculateLoad calculateLoad = calculateLoadService.getById(synthesize_no_2_1.getId());
|
|
|
if (Objects.nonNull(calculateLoad.getNo44())){
|
|
|
if (Objects.nonNull(calculateLoad.getNo44())) {
|
|
|
totalAnnualTotalHotWaterRequirement += calculateLoad.getNo44();
|
|
|
}
|
|
|
}
|
...
|
...
|
|