Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/utils/sg/ExcelUtil.java

@@ -56,6 +56,26 @@ public class ExcelUtil {
     }
 
 
+    public static double[] getDoubleArray(ImportExcel importExcel,String st,int column1,int[] column2){
+        int lastRow = importExcel.getLastDataRowNum();
+        int len = column2.length;
+        double[] d = new double[len];
+        for(int i=0;i<lastRow;i++){
+            String type = importExcel.getValue(i+1,column1);
+            if(type.equals("")){
+                continue;
+            }
+            if(type.equals(st)){
+                for(int j=0;j<len;j++) {
+                    d[j] = importExcel.getDouble(i + 1, column2[j]);
+                }
+            }
+
+        }
+        return d;
+    }
+
+
     /**
      * 根据字段读取数据
      * @param importExcel 文件对象

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -115,6 +115,7 @@ public class OverheadLineController extends BaseController {
       double total = 0.00;
       try {
         List<JkxlDetailFee> jkxl = overheadLineService.getList(id);
+        //获取本体部分费用明细
         List<JkxlDetailFee> jkxlDetailFees = new ArrayList<>();
         for(JkxlDetailFee jkxlDetailFee : jkxl){
           if(jkxlDetailFee.getOriginalTotalCost() != null){