Compare commits

..

No commits in common. "b572cf4b4eb1c3db51250382443a4fdf6c376d5a" and "17b2ce711c69616ab41befc2d62535b7bb5a1373" have entirely different histories.

3 changed files with 2 additions and 11 deletions

View File

@ -1424,15 +1424,6 @@ public class EstimateService {
roofInfoResponse.setModuleTotAmount(String.valueOf(moduleTotAmount)); roofInfoResponse.setModuleTotAmount(String.valueOf(moduleTotAmount));
roofInfoResponse.setModuleTotVolKw(String.valueOf(moduleTotVolKw)); roofInfoResponse.setModuleTotVolKw(String.valueOf(moduleTotVolKw));
for (RoofResponse roof : roofList) {
String roofClassTypeName = "";
if ("0".equals(roof.getClassType())) {
roofClassTypeName = roof.getSlope() + "";
} else {
roofClassTypeName = roof.getAngle() + "º";
}
roof.setClassTypeName(roofClassTypeName);
}
roofInfoResponse.setRoofList(roofList); roofInfoResponse.setRoofList(roofList);
roofInfoResponse.setCircuitItemList(circuitItemList); roofInfoResponse.setCircuitItemList(circuitItemList);
roofInfoResponse.setRoofVolList(roofVolList); roofInfoResponse.setRoofVolList(roofVolList);
@ -2606,7 +2597,7 @@ public class EstimateService {
sb.append("<td>" + StringUtils.defaultString(roofResponse.getRoofSurface()) + "</td>"); sb.append("<td>" + StringUtils.defaultString(roofResponse.getRoofSurface()) + "</td>");
sb.append("<td style='text-align:left;'>" sb.append("<td style='text-align:left;'>"
+ StringUtils.defaultString(roofResponse.getRoofMaterialName()) + "</td>"); + StringUtils.defaultString(roofResponse.getRoofMaterialName()) + "</td>");
sb.append("<td>" + StringUtils.defaultString(roofResponse.getClassTypeName()) + "</td>"); sb.append("<td>" + StringUtils.defaultString(roofResponse.getSlope()) + "</td>");
sb.append("<td>" + StringUtils.defaultString(roofResponse.getConstructSpecificationName()) sb.append("<td>" + StringUtils.defaultString(roofResponse.getConstructSpecificationName())
+ "</td>"); + "</td>");
sb.append("<td style='text-align:left;'>" sb.append("<td style='text-align:left;'>"
@ -2686,7 +2677,7 @@ public class EstimateService {
sb.append("<td>" + StringUtils.defaultString(roofResponse.getRoofSurface()) + "</td>"); sb.append("<td>" + StringUtils.defaultString(roofResponse.getRoofSurface()) + "</td>");
sb.append("<td style='text-align:left;'>" sb.append("<td style='text-align:left;'>"
+ StringUtils.defaultString(roofResponse.getRoofMaterialName()) + "</td>"); + StringUtils.defaultString(roofResponse.getRoofMaterialName()) + "</td>");
sb.append("<td>" + StringUtils.defaultString(roofResponse.getClassTypeName()) + "</td>"); sb.append("<td>" + StringUtils.defaultString(roofResponse.getSlope()) + "</td>");
sb.append("<td>" + StringUtils.defaultString(roofResponse.getConstructSpecificationName()) sb.append("<td>" + StringUtils.defaultString(roofResponse.getConstructSpecificationName())
+ "</td>"); + "</td>");
sb.append("<td style='text-align:left;'>" sb.append("<td style='text-align:left;'>"