|
@@ -1,19 +1,18 @@
|
|
|
-package com.jeeplus.modules.sg.util;
|
|
|
+package com.jeeplus.modules.sg.overheadline.util;
|
|
|
|
|
|
import com.jeeplus.common.utils.excel.ImportExcel;
|
|
|
-import com.jeeplus.modules.sg.entity.JkxlData;
|
|
|
+import com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee;
|
|
|
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
public class JkxlExcel {
|
|
|
- public static List<JkxlData> getData(String file) throws IOException, InvalidFormatException {
|
|
|
+ public static List<JkxlDetailFee> getData(String file) throws IOException, InvalidFormatException {
|
|
|
|
|
|
ImportExcel importExcel = new ImportExcel(file,1,"分部分项工程量清单计价表");
|
|
|
- List<JkxlData> list = new ArrayList<>();
|
|
|
+ List<JkxlDetailFee> list = new ArrayList<>();
|
|
|
int lastRow = importExcel.getLastDataRowNum();
|
|
|
int[] row = new int[6];
|
|
|
double totalFee = 0.00;
|
|
@@ -48,7 +47,7 @@ public class JkxlExcel {
|
|
|
}
|
|
|
}
|
|
|
for(int i=0;i<6;i++){
|
|
|
- JkxlData jkxlData = new JkxlData();
|
|
|
+ JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
|
|
|
Double originalRgCost = importExcel.getDouble(row[i],13);
|
|
|
// Double rgCost = originalRgCost/(1+rate[0]);
|
|
|
Double originalCbrCost = importExcel.getDouble(row[i],14);
|
|
@@ -57,16 +56,16 @@ public class JkxlExcel {
|
|
|
// Double fbrCost = originalFbrCost/(1+0.17);
|
|
|
Double originalJxrCost = importExcel.getDouble(row[i],17);
|
|
|
// Double jxCost = originalJxrCost/(1+rate[2]);
|
|
|
- jkxlData.setOriginalTotalCost(importExcel.getDouble(row[i],12));
|
|
|
- jkxlData.setOriginalRgCost(originalRgCost);
|
|
|
+ jkxlDetailFee.setOriginalTotalCost(importExcel.getDouble(row[i],12));
|
|
|
+ jkxlDetailFee.setOriginalRgCost(originalRgCost);
|
|
|
// jkxlData.setRgCost(rgCost);
|
|
|
- jkxlData.setOriginalCbrCost(originalCbrCost);
|
|
|
+ jkxlDetailFee.setOriginalCbrCost(originalCbrCost);
|
|
|
// jkxlData.setCbrCost(cbrCost);
|
|
|
- jkxlData.setOriginalFbrCost(originalFbrCost);
|
|
|
+ jkxlDetailFee.setOriginalFbrCost(originalFbrCost);
|
|
|
// jkxlData.setFbrCost(fbrCost);
|
|
|
- jkxlData.setOriginalJxCost(originalJxrCost);
|
|
|
+ jkxlDetailFee.setOriginalJxCost(originalJxrCost);
|
|
|
// jkxlData.setJxCost(jxCost);
|
|
|
- list.add(jkxlData);
|
|
|
+ list.add(jkxlDetailFee);
|
|
|
}
|
|
|
return list;
|
|
|
}
|