diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index d96c4628..01e65cba 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1424,6 +1424,15 @@ 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 = roof.getSlope() + "寸"; + } else { + roofClassTypeName = roof.getAngle() + "º"; + } + roof.setClassTypeName(roofClassTypeName); + } roofInfoResponse.setRoofList(roofList); roofInfoResponse.setCircuitItemList(circuitItemList); roofInfoResponse.setRoofVolList(roofVolList); @@ -2597,7 +2606,7 @@ public class EstimateService { sb.append("" + StringUtils.defaultString(roofResponse.getRoofSurface()) + ""); sb.append("" + StringUtils.defaultString(roofResponse.getRoofMaterialName()) + ""); - sb.append("" + StringUtils.defaultString(roofResponse.getSlope()) + "寸"); + sb.append("" + StringUtils.defaultString(roofResponse.getClassTypeName()) + ""); sb.append("" + StringUtils.defaultString(roofResponse.getConstructSpecificationName()) + ""); sb.append("" @@ -2677,7 +2686,7 @@ public class EstimateService { sb.append("" + StringUtils.defaultString(roofResponse.getRoofSurface()) + ""); sb.append("" + StringUtils.defaultString(roofResponse.getRoofMaterialName()) + ""); - sb.append("" + StringUtils.defaultString(roofResponse.getSlope()) + "寸"); + sb.append("" + StringUtils.defaultString(roofResponse.getClassTypeName()) + ""); sb.append("" + StringUtils.defaultString(roofResponse.getConstructSpecificationName()) + ""); sb.append("" diff --git a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx b/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx index b59d813e..b0b9ace1 100644 Binary files a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx and b/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx differ diff --git a/src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx b/src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx index 5e1bd538..c9f5ae2d 100644 Binary files a/src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx and b/src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx differ