qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev #465

Merged
ysCha merged 186 commits from dev into prd-deploy 2026-04-08 10:22:57 +09:00
Conversation 0 Commits 186 Files Changed 8 +11 -2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3e64d8a2fc - Show all commits

13
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -1424,6 +1424,15 @@ 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);
@ -2597,7 +2606,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.getSlope()) + "寸</td>"); sb.append("<td>" + StringUtils.defaultString(roofResponse.getClassTypeName()) + "</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;'>"
@ -2677,7 +2686,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.getSlope()) + "寸</td>"); sb.append("<td>" + StringUtils.defaultString(roofResponse.getClassTypeName()) + "</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;'>"

BIN
src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx
View File

Binary file not shown.

BIN
src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx
View File

Binary file not shown.