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

Compare commits

base: qcast3:e47be823e8fb15e09501fa981c6a625d71bd0cd0
Branches Tags
qcast3:main
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/jp-0331
qcast3:feature/rjy-0430
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
..
compare: qcast3:ec27c93ee0634e7a91dd2c695d42fc8780c4cc1c
Branches Tags
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/jp-0331
qcast3:feature/rjy-0430
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
qcast3:main

No commits in common. "e47be823e8fb15e09501fa981c6a625d71bd0cd0" and "ec27c93ee0634e7a91dd2c695d42fc8780c4cc1c" have entirely different histories.
e47be823e8 ... ec27c93ee0

1 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

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

@ -1412,9 +1412,9 @@ public class EstimateService {
String classTypeName = ""; String classTypeName = "";
if ("0".equals(roofVol.getClassType())) { if ("0".equals(roofVol.getClassType())) {
classTypeName = new BigDecimal(StringUtils.defaultString(roofVol.getSlope(), "0")).stripTrailingZeros().toPlainString() + "寸"; classTypeName = String.format("%.2f", Double.parseDouble(StringUtils.defaultString(roofVol.getSlope(), "0"))) + "寸";
} else { } else {
classTypeName = new BigDecimal(StringUtils.defaultString(roofVol.getAngle(), "0")).stripTrailingZeros().toPlainString() + "º"; classTypeName = String.format("%.2f", Double.parseDouble(StringUtils.defaultString(roofVol.getAngle(), "0"))) + "º";
} }
roofVol.setClassTypeName(classTypeName); roofVol.setClassTypeName(classTypeName);
@ -1427,9 +1427,9 @@ public class EstimateService {
for (RoofResponse roof : roofList) { for (RoofResponse roof : roofList) {
String roofClassTypeName = ""; String roofClassTypeName = "";
if ("0".equals(roof.getClassType())) { if ("0".equals(roof.getClassType())) {
roofClassTypeName = new BigDecimal(StringUtils.defaultString(roof.getSlope(), "0")).stripTrailingZeros().toPlainString() + "寸"; roofClassTypeName = String.format("%.2f", Double.parseDouble(StringUtils.defaultString(roof.getSlope(), "0"))) + "寸";
} else { } else {
roofClassTypeName = new BigDecimal(StringUtils.defaultString(roof.getAngle(), "0")).stripTrailingZeros().toPlainString() + "º"; roofClassTypeName = String.format("%.2f", Double.parseDouble(StringUtils.defaultString(roof.getAngle(), "0"))) + "º";
} }
roof.setClassTypeName(roofClassTypeName); roof.setClassTypeName(roofClassTypeName);
} }