1111

src/main/java/com/jeeplus/modules/sg/substation/util/SubstationInfo.java

@@ -576,14 +576,21 @@ public class SubstationInfo {
          double[][] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
          double d = ExcelUtil.getDouble(importExcel1,str[0],1,3);  //直接工程费
          String index = ExcelUtil.getIndex(importExcel,str[0],2);    //获取角标
+         int s = 1;
          if(StringUtils.isNotBlank(index)){
              double[][] doubles1 = getUnidentification(importExcel,index,str,types);
+             for(int m=1;m<doubles.length;m++) {
+                 if(doubles[m][0] != 0.00){
+                     s = m;
+                     break;
+                 }
+             }
              for(int k=0;k<doubles1.length;k++){
-                 doubles[1][0] = doubles[1][0] + doubles1[k][0];
-                 doubles[1][1] = doubles[1][1] + doubles1[k][1];
-                 doubles[1][2] = doubles[1][2] + doubles1[k][2];
-                 doubles[1][3] = doubles[1][3] + doubles1[k][3];
-                 doubles[1][4] = doubles[1][4] + doubles1[k][4];
+                 doubles[s][0] = doubles[s][0] + doubles1[k][0];
+                 doubles[s][1] = doubles[s][1] + doubles1[k][1];
+                 doubles[s][2] = doubles[s][2] + doubles1[k][2];
+                 doubles[s][3] = doubles[s][3] + doubles1[k][3];
+                 doubles[s][4] = doubles[s][4] + doubles1[k][4];
              }
          }
          double total = doubles[0][0];
@@ -972,14 +979,21 @@ public class SubstationInfo {
         double[][] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
         double d = ExcelUtil.getDouble(importExcel1,str[0],1,3);  //直接工程费
         String index = ExcelUtil.getIndex(importExcel,str[0],2);    //获取角标
+        int s = 1;
         if(StringUtils.isNotBlank(index)){
             double[][] doubles1 = getUnidentification(importExcel,index,str,"1");
+            for(int m=1;m<doubles.length;m++) {
+                if(doubles[m][0] != 0.00){
+                    s = m;
+                    break;
+                }
+            }
             for(int k=0;k<doubles1.length;k++){
-                doubles[1][0] = doubles[1][0] + doubles1[k][0];
-                doubles[1][1] = doubles[1][1] + doubles1[k][1];
-                doubles[1][2] = doubles[1][2] + doubles1[k][2];
-                doubles[1][3] = doubles[1][3] + doubles1[k][3];
-                doubles[1][4] = doubles[1][4] + doubles1[k][4];
+                doubles[s][0] = doubles[s][0] + doubles1[k][0];
+                doubles[s][1] = doubles[s][1] + doubles1[k][1];
+                doubles[s][2] = doubles[s][2] + doubles1[k][2];
+                doubles[s][3] = doubles[s][3] + doubles1[k][3];
+                doubles[s][4] = doubles[s][4] + doubles1[k][4];
             }
         }
         double total = doubles[0][0];
@@ -1267,12 +1281,19 @@ public class SubstationInfo {
             d2[m] = ExcelUtil.getDouble(importExcel1,list.get(m).substring(2,list.get(m).length()).trim(),1,3);
         }
         double[][] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
+        int s = 1;
+        for(int n=1;n<doubles.length;n++) {
+            if(doubles[n][0] != 0.00){
+                s = n;
+                break;
+            }
+        }
         for(int k=0;k<d.length;k++){
-            doubles[1][0] = doubles[1][0] + d[k][0];
-            doubles[1][1] = doubles[1][1] + d[k][1];
-            doubles[1][2] = doubles[1][2] + d[k][2];
-            doubles[1][3] = doubles[1][3] + d[k][3];
-            doubles[1][4] = doubles[1][4] + d[k][4];
+            doubles[s][0] = doubles[s][0] + d[k][0];
+            doubles[s][1] = doubles[s][1] + d[k][1];
+            doubles[s][2] = doubles[s][2] + d[k][2];
+            doubles[s][3] = doubles[s][3] + d[k][3];
+            doubles[s][4] = doubles[s][4] + d[k][4];
         }
         List<JkxlDetailFee> jkxlDetailFees = new ArrayList<>();
         JkxlDetailFee jkxlDetailFee = null;
@@ -1288,13 +1309,9 @@ public class SubstationInfo {
             jkxlDetailFee.setOriginalJxCost(doubles[i][4]);
             jkxlDetailFees.add(jkxlDetailFee);
         }
-        for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
-            if(jkxlDetailFee1.getWbsCode().equals("21310000")){
-                for(int n=0;n<d2.length;n++) {
-                    jkxlDetailFee1.setZjgcFee(jkxlDetailFee1.getZjgcFee() + d2[n]);
-                }
-                break;
-            }
+        JkxlDetailFee jkxlDetailFee1 = jkxlDetailFees.get(s-1);
+        for(int n1=0;n1<d2.length;n1++) {
+            jkxlDetailFee1.setZjgcFee(jkxlDetailFee1.getZjgcFee() + d2[n1]);
         }
         return jkxlDetailFees;
     }