计量

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

@@ -873,15 +873,15 @@ public class ExecutorMeter extends FormulaExecutor {
                        List<MaterialsArrival> data = pages.get(i);
                        data.forEach(ma->{
                            /*排序*/
-                           isLast.set(sn.get() == list.size());
                            ma.setSn( String.valueOf( sn.getAndIncrement()));
                        });
+                       isLast.set(sn.get()-1 == list.size());
                        tmp.addAll(data);
                        int over= rowSize-data.size();
-                       if(i==pages.size()-1){
-                           /*最后一页合计*/
+                      /* if(i==pages.size()-1){
+                           *//*最后一页合计*//*
                            over--;
-                       }
+                       }*/
                        if(isLast.get()){
                            over--;
                        }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -3681,7 +3681,7 @@ public class TaskController extends BladeController {
                     rawDataMap.put("D",rs.getData());
                     rawListMap.put(rs.getInitTableName(),rawDataMap);
                     /*动态隐藏行*/
-                    if (rs.getInitTableName().equals("m_20240325154016_1772166597482381312")||rs.getInitTableName().equals("m_20240710170847_1810964374177710080")) {
+                    if ("m_20240325154016_1772166597482381312".equals(rs.getInitTableName())|| "m_20240710170847_1810964374177710080".equals(rs.getInitTableName())) {
                         List<Map.Entry<String,Object>> entries=rs.getData().get(0).entrySet().stream().filter(e->Integer.parseInt(e.getKey().split("_")[1])==1).sorted(Comparator.comparingInt(e->Integer.parseInt(e.getKey().split("_")[0]))).collect(Collectors.toList());
                         List<String> list =entries.stream().map(e->e.getValue().toString()).collect(Collectors.toList());
                         int index= list.indexOf("小计");