工具类计算优化

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -539,7 +539,7 @@ public class N_Utils {
      * @return java.math.BigDecimal
      */
     public static double getIntegerDivideAndMulitiply(Integer linecount, Integer studentnum){
-        if (isEmptyInteger(studentnum)) {
+        if (isEmptyInteger(studentnum) || isEmptyInteger(linecount)) {
             return 0;
         }
         BigDecimal b1 = new BigDecimal(linecount.toString());
@@ -552,7 +552,7 @@ public class N_Utils {
 
     //两个数相除并乘以100.保留2位小数
     public static double getDoubleDivideAndMulitiply(Double linecount, Double studentnum){
-        if (studentnum.compareTo(new Double(0)) == 0) {
+        if (studentnum.compareTo(new Double(0)) == 0 || linecount == null) {
             return 0;
         }
         BigDecimal b1 = new BigDecimal(linecount.toString());
@@ -565,7 +565,7 @@ public class N_Utils {
 
     //两个数相除并乘以100.保留2位小数
     public static double getDoubleDivideAndMulitiply(Double linecount, Integer studentnum){
-        if (isEmptyInteger(studentnum)) {
+        if (isEmptyInteger(studentnum) || linecount == null) {
             return 0;
         }
         BigDecimal b1 = new BigDecimal(linecount.toString());
@@ -578,7 +578,7 @@ public class N_Utils {
 
     //计算比例向下取整
     public static Integer floorDiv(Integer num,Integer totalNum) {
-        if (isEmptyInteger(totalNum)) return 0;
+        if (isEmptyInteger(totalNum) || isEmptyInteger(num)) return 0;
         return Math.floorDiv(num * 100, totalNum);
     }
 
@@ -590,7 +590,7 @@ public class N_Utils {
      * @return java.lang.Integer
      **/
     public static Integer formatProportion(Integer num,Integer totalNum){
-        if (isEmptyInteger(totalNum)) return 0;
+        if (isEmptyInteger(totalNum) || isEmptyInteger(num)) return 0;
         BigDecimal countBigDecimal = new BigDecimal(num);
         BigDecimal totalCountBigDecimal = new BigDecimal(totalNum);
         BigDecimal divide = countBigDecimal.divide(totalCountBigDecimal, 20, BigDecimal.ROUND_HALF_UP);
@@ -599,7 +599,7 @@ public class N_Utils {
     }
 
     public static Integer formatAvg(Integer num,Integer totalNum){
-        if (isEmptyInteger(totalNum)) return 0;
+        if (isEmptyInteger(totalNum) || isEmptyInteger(num)) return 0;
         BigDecimal countBigDecimal = new BigDecimal(num);
         BigDecimal totalCountBigDecimal = new BigDecimal(totalNum);
         BigDecimal divide = countBigDecimal.divide(totalCountBigDecimal, 0, BigDecimal.ROUND_UP);
@@ -613,7 +613,9 @@ public class N_Utils {
      * @Date 2021/5/28 9:57
      * @return java.lang.Double
      **/
-    public static Double formatDouble(Double num,Integer decimalNum){
+    public static Double formatDouble(Double num,Integer decimalNum) {
+        if (num == null) num = 0.0;
+        if (isEmptyInteger(decimalNum)) return num;
         BigDecimal bg = new BigDecimal(num);
         double num2 = bg.setScale(decimalNum, BigDecimal.ROUND_DOWN).doubleValue();
         return num2;
@@ -965,7 +967,7 @@ public class N_Utils {
         int r = a % b;
         while(r != 0){
             a = b;
-            b = r;;
+            b = r;
             r = a % b;
         }
         return b;