2019-09-05 17:00

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -6,6 +6,10 @@ import com.jeeplus.common.utils.sg.ExcelUtil;
 import com.jeeplus.modules.sg.overheadline.entity.Settlement;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.math.BigDecimal;
+import java.text.FieldPosition;
+import java.text.NumberFormat;
+import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -295,6 +299,8 @@ public class SettementUtil {
      * @return  电缆/变电站 项目 导入后 校验规则  list集合
      */
     public static List<Settlement> getDLComparison(List<Settlement> settlements, double builtTotal[], double[] divisiontotal, double wordtotal1,double wordtotal2, double otherTotal, double feescount,double cbperson){
+        NumberFormat nf = NumberFormat.getInstance();
+        nf.setGroupingUsed(false);
         double wordtotal=wordtotal1+wordtotal2;//措施费相加
         String name;//获取当前汇总表名称
         double money;//获取当前汇总表金额
@@ -320,7 +326,7 @@ public class SettementUtil {
                     if (money==built&&money==division){
                         settlement.setStatus("0");
                     }
-                    settlement.setTheAmount(String.valueOf(built+","+division+","+builtTotal[0]+","+builtTotal[1]+","+divisiontotal[0]+","+divisiontotal[2]));
+                    settlement.setTheAmount(String.valueOf(nf.format(built)+","+nf.format(division)+","+nf.format(builtTotal[0])+","+nf.format(builtTotal[1])+","+nf.format(divisiontotal[0])+","+nf.format(divisiontotal[2])));
                     break;
                 case  BashInfo.JS_CBRF:
                     if(money==cbperson){