|
|
@@ -189,10 +189,12 @@ public class SubstationService {
|
|
|
ImportExcel azhz = new ImportExcel(file, 1, SubstationInfo.SHEET_HZHZB); //安装工程费用汇总表
|
|
|
//变电站结算汇总
|
|
|
int[] comlumn2 = {12,15};//定义所要数组
|
|
|
- double built1Total = ExcelUtil.getDouble(jzqd,SubstationInfo.JZMX_BJZ,2,0);//建筑分部分项工程量清单计价表合计
|
|
|
- double[] builtTotal={built1Total,0.0};
|
|
|
- double[] division1total=ExcelUtil.getDoubleArray(azqd,SubstationInfo.AZMX_BDZAZ,1,comlumn2);//安装分部分项比对数据清单合计
|
|
|
- double[] division = {division1total[0],division1total[1],0.00,0.00};
|
|
|
+ double built1Total = ExcelUtil.getDouble(jzhz,BashInfo.QT_HJ,0,2);//变电站建筑
|
|
|
+ double built2Total = ExcelUtil.getDouble(azhz,BashInfo.QT_HJ,0,2);//变电站安装
|
|
|
+ double[] builtTotal={built1Total,built2Total};
|
|
|
+ double[] division1total=ExcelUtil.getDoubleArray(jzqd,SubstationInfo.JZMX_BJZ,2,comlumn2);//建筑分部分项比对数据清单合计
|
|
|
+ double[] division2total=ExcelUtil.getDoubleArray(azqd,SubstationInfo.AZMX_BDZAZ,2,comlumn2);//安装分部分项比对数据清单合计
|
|
|
+ double[] division = {division1total[0],division1total[1],division2total[0],division2total[1]};
|
|
|
List<Settlement> settlementBdzs = SettementUtil.getDLComparison(settlementsBdz,builtTotal,division,word1total,word2total,otherBdzTotal,feesBdzCount,cbperson);
|
|
|
settlementService.save(settlementBdzs,id);
|
|
|
double zjgcJzTotal = ExcelUtil.getDouble(jzhz,SubstationInfo.QT_HJ,0,3);//建筑直接工程费合计
|
xs