src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java

@@ -1412,9 +1412,9 @@ public class EstimateService {
 
         String classTypeName = "";
         if ("0".equals(roofVol.getClassType())) {
-          classTypeName = new BigDecimal(StringUtils.defaultString(roofVol.getSlope(), "0")).stripTrailingZeros().toPlainString() + "寸";
+          classTypeName = roofVol.getSlope() + "寸";
         } else {
-          classTypeName = new BigDecimal(StringUtils.defaultString(roofVol.getAngle(), "0")).stripTrailingZeros().toPlainString() + "º";
+          classTypeName = roofVol.getAngle() + "º";
         }
         roofVol.setClassTypeName(classTypeName);
 
@@ -1424,15 +1424,6 @@ public class EstimateService {
       roofInfoResponse.setModuleTotAmount(String.valueOf(moduleTotAmount));
       roofInfoResponse.setModuleTotVolKw(String.valueOf(moduleTotVolKw));
 
-      for (RoofResponse roof : roofList) {
-        String roofClassTypeName = "";
-        if ("0".equals(roof.getClassType())) {
-          roofClassTypeName = new BigDecimal(StringUtils.defaultString(roof.getSlope(), "0")).stripTrailingZeros().toPlainString() + "寸";
-        } else {
-          roofClassTypeName = new BigDecimal(StringUtils.defaultString(roof.getAngle(), "0")).stripTrailingZeros().toPlainString() + "º";
-        }
-        roof.setClassTypeName(roofClassTypeName);
-      }
       roofInfoResponse.setRoofList(roofList);
       roofInfoResponse.setCircuitItemList(circuitItemList);
       roofInfoResponse.setRoofVolList(roofVolList);
@@ -2606,7 +2597,7 @@ public class EstimateService {
         sb.append("<td>" + StringUtils.defaultString(roofResponse.getRoofSurface()) + "</td>");
         sb.append("<td style='text-align:left;'>"
                 + 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())
                 + "</td>");
         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 style='text-align:left;'>"
                 + 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())
                 + "</td>");
         sb.append("<td style='text-align:left;'>"