蔡德晨 5 years ago
parent
commit
75d7bd03e1

+ 1 - 1
src/main/java/com/jeeplus/common/utils/sg/ExcelUtil.java

@@ -69,8 +69,8 @@ public class ExcelUtil {
                 for(int j=0;j<len;j++) {
                 for(int j=0;j<len;j++) {
                     d[j] = importExcel.getDouble(i + 1, column2[j]);
                     d[j] = importExcel.getDouble(i + 1, column2[j]);
                 }
                 }
+                continue;
             }
             }
-
         }
         }
         return d;
         return d;
     }
     }

+ 4 - 2
src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -503,7 +503,9 @@ public class OverheadLineController extends BaseController {
     }
     }
     JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
     JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
     JkxlDetailFee jkxlDetailFee1 = new JkxlDetailFee();
     JkxlDetailFee jkxlDetailFee1 = new JkxlDetailFee();
-    jkxlDetailFee.setOriginalTotalCost(new BigDecimal(zFee[0]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    java.text.NumberFormat NF = java.text.NumberFormat.getInstance();
+    NF.setGroupingUsed(false);//去掉科学计数法显示
+    jkxlDetailFee.setOriginalTotalCost(new BigDecimal(NF.format(zFee[0])).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setZjgcFee(new BigDecimal(zFee[1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setZjgcFee(new BigDecimal(zFee[1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setOriginalRgCost(new BigDecimal(zFee[2]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setOriginalRgCost(new BigDecimal(zFee[2]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setOriginalCbrCost(new BigDecimal(zFee[3]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setOriginalCbrCost(new BigDecimal(zFee[3]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
@@ -524,7 +526,7 @@ public class OverheadLineController extends BaseController {
     jkxlDetailFee.setFees(new BigDecimal(zFee[18]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setFees(new BigDecimal(zFee[18]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setTex(new BigDecimal(zFee[19]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setTex(new BigDecimal(zFee[19]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
 //    jkxlDetailFee.setGxFee(new BigDecimal(zFee[20]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
 //    jkxlDetailFee.setGxFee(new BigDecimal(zFee[20]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setTotalFee(new BigDecimal(zFee[21]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setTotalFee(new BigDecimal(NF.format(zFee[21])).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setWbsCode("合计");
     jkxlDetailFee.setWbsCode("合计");
     jkxlDetailFee.setParentNode("30000000");
     jkxlDetailFee.setParentNode("30000000");
     jkxlDetailFee.setFeeType("1");
     jkxlDetailFee.setFeeType("1");