合并分支 'wyl' 到 'master'

src/main/java/com/zjty/inspect/utils/WorkLoadUtil.java

@@ -7,7 +7,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.math.RoundingMode;
+import java.text.FieldPosition;
 import java.text.NumberFormat;
+import java.text.ParsePosition;
 import java.util.List;
 import java.util.Objects;
 
@@ -231,6 +233,7 @@ public class WorkLoadUtil {
     //r:人工费
     public void result(Reform reform,AssessmentReport report,double f,double r){
         NumberFormat nf = NumberFormat.getInstance();
+        nf.setGroupingUsed(false);
         nf.setMaximumFractionDigits(3);
         //nf.setRoundingMode(RoundingMode.HALF_UP);
         double calculate = 0;//calculate(reform);
@@ -444,6 +447,15 @@ public class WorkLoadUtil {
     }
 
     public static void main(String[] args) {
+        if(true) {
+            NumberFormat nf = NumberFormat.getInstance();
+            nf.setGroupingUsed(false);
+            nf.setMaximumFractionDigits(3);
+            System.out.println(nf.format(1000));
+            System.out.println(Double.valueOf("10000"));
+            System.out.println(Double.valueOf(nf.format(10000)));
+            return;
+        }
         WorkLoadUtil workLoadUtil = new WorkLoadUtil();
         String reform = "{\n" +
                 "\t\"mode\":1,\n" +