Bläddra i källkod

水平测量表空白页bug

yangyj 1 år sedan
förälder
incheckning
f25150ab0d

+ 3 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/FormulaTurnPoint.java

@@ -121,8 +121,9 @@ public class FormulaTurnPoint implements FormulaStrategy {
         List<Object> data = new ArrayList<>();
         for(List<TurnPoint> turnPoints:result){
             data.addAll(turnPoints2ListObj(turnPoints,configMap));
-            int dummyRow=rowSize-turnPoints.size()%rowSize;
-            if(dummyRow!=0) {
+            int index=turnPoints.size()%rowSize;
+            int dummyRow=rowSize-index;
+            if(index!=0&&dummyRow!=0) {
                 data.addAll(Collections.nCopies(configMap.size() * dummyRow, StringPool.EMPTY));
             }
         }

+ 0 - 14
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/TurnPointCalculator.java

@@ -1,20 +1,6 @@
 package org.springblade.manager.formula.impl;
 
-import com.mixsmart.utils.CustomFunction;
-import com.mixsmart.utils.ListUtils;
-import com.mixsmart.utils.StringUtils;
 import org.springblade.manager.formula.ITurnPointCalculator;
-import org.springblade.manager.formula.LevelInfo;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-import static java.math.BigDecimal.ROUND_HALF_UP;
-
 /**
  * @author yangyj
  * @Date 2022/9/6 11:51