Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

@@ -237,7 +237,7 @@ public List<JkxlDetailFee> findList(String id,String type){
         ImportExcel csqd2 = new ImportExcel(file,1,BashInfo.SHEET_CSB2,false);  // 措施项目清单计价表（二）
        ImportExcel gf = new ImportExcel(file,1,BashInfo.SHEET_GFQD,true);  //规费项目清单计价表
        ImportExcel qt = new ImportExcel(file,1,BashInfo.SHEET_QTFY,true);  //其他项目清单计价表
-       ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1,BashInfo.SHEET_HZB2},true );  //工程项目竣工结算汇总表
+       ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1,BashInfo.SHEET_HZB2,BashInfo.SHEET_HZB3},true );  //工程项目竣工结算汇总表
        ImportExcel gzhz = new ImportExcel(file,1,new String[]{BashInfo.SHEET_GCHZ,BashInfo.SHEET_GCHZ1},true );   //架空线路工程费用汇总
 //       ImportExcel fbrcg = new ImportExcel(file,1,new String[]{BashInfo.SHEET_FBRCG,BashInfo.SHEET_FBRCG1,BashInfo.SHEET_FBRCG2,BashInfo.SHEET_ZBRCG,BashInfo.SHEET_ZBRCG1},true);   //发包人采购材料设备计价表
         ImportExcel cbrsb = new ImportExcel(file,1,new String[]{BashInfo.SHEET_TBRCG,BashInfo.SHEET_CBRCG},false);//承包人采购设备计价表
@@ -471,7 +471,7 @@ public List<JkxlDetailFee> findList(String id,String type){
 //        double[] tcRate = new double[3];
 //        tcRate[0] = ruleRatioService.getValueByName(BashInfo.RATIO_RGTC).getValue()/100;
         //读取表格
-        ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1,BashInfo.SHEET_HZB2},true );  //工程项目竣工结算汇总表
+        ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1,BashInfo.SHEET_HZB2,BashInfo.SHEET_HZB3},true );  //工程项目竣工结算汇总表
         ImportExcel csqd = new ImportExcel(file,1,new String[]{BashInfo.SHEET_CSB,BashInfo.SHEET_CSB1},true);  // 措施项目清单计价表（一）
         ImportExcel csqd2 = new ImportExcel(file,1,BashInfo.SHEET_CSB2,false);  // 措施项目清单计价表（二）
         ImportExcel gf = new ImportExcel(file,1,BashInfo.SHEET_GFQD,true);  //规费项目清单计价表
@@ -480,7 +480,11 @@ public List<JkxlDetailFee> findList(String id,String type){
         ImportExcel cbrsb = new ImportExcel(file,1,new String[]{BashInfo.SHEET_TBRCG,BashInfo.SHEET_CBRCG},false);//承包人采购设备计价表
         List<Settlement> settlementList =  SettementUtil.getComparison(total);
         double cbperson = 0.0;
-        double word1total =  ExcelUtil.getDouble(csqd,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
+        //措施费合计
+        double jzcs = BashInfo.getJzCs(csqd);
+        double azcs = BashInfo.getAzCs(csqd);
+//        double word1total =  ExcelUtil.getDouble(csqd,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
+        double word1total = jzcs+azcs;//获取措施费清单计价表一
         double word2total=0.0;
         double csFees2 = ExcelUtil.getDouble(total,BashInfo.CSXM2,1,2);//措施费二
         double otherDlTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计

src/main/java/com/jeeplus/modules/sg/overheadline/util/BashInfo.java

@@ -16,6 +16,7 @@ public class BashInfo {
     public static final String SHEET_HZB = "工程项目竣工结算汇总表";
     public static final String SHEET_HZB1 = "工程项目投标报价汇总表";
     public static final String SHEET_HZB2 = "工程项目最高投标限价汇总表";
+    public static final String SHEET_HZB3 = "工程项目结算价汇总表";
     public static final String SHEET_CSB = "措施项目清单计价表（一）";
     public static final String SHEET_CSB1 = "措施项目清单计价表一";
     public static final String SHEET_CSB2 = "措施项目清单计价表（二）";
@@ -492,6 +493,62 @@ public class BashInfo {
     }
 
     /**
+     * 电缆建筑措施费合计
+     * @param importExcel
+     * @return
+     */
+    public static double getJzCs(ImportExcel importExcel){
+        int lastRow = importExcel.getLastDataRowNum();
+        double d = 0.00;
+        List list = new ArrayList();
+        for(int i=0;i<lastRow;i++){
+            String type = importExcel.getValue(i+1,1);
+            list.add(type);
+        }
+        if(!list.contains(CS_JZ)){
+            return d;
+        }
+        for(int i=0;i<lastRow;i++){
+            String type = importExcel.getValue(i+1,0);
+            if(type.equals("")){
+                continue;
+            }
+            if(type.equals(QT_XJ)){
+                d = importExcel.getDouble(i+1,4);
+                break;
+            }
+        }
+        return d;
+    }
+
+    /**
+     *电缆安装措施费合计
+     */
+    public static double getAzCs(ImportExcel importExcel) {
+        int lastRow = importExcel.getLastDataRowNum();
+        int azRow = 0;
+        for(int i=0;i<lastRow;i++){
+            String type = importExcel.getValue(i+1,1);
+            if(type.equals(CS_AZ)){
+                azRow = i+1;
+                break;
+            }
+        }
+        if(azRow == 0){
+            return 0.00;
+        }
+        double totalRate = 0.00;
+        for (int i = azRow; i < lastRow; i++) {
+            String type = importExcel.getValue(i + 1, 0);
+            if (type.equals(QT_XJ)) {
+                totalRate = importExcel.getDouble(i + 1, 4);
+            }
+        }
+
+        return totalRate;
+    }
+
+    /**
      * 获取其他费用
      */
     public static double[] getQtFees(ImportExcel importExcel) {

src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -73,7 +73,7 @@ public class SubstationService {
 
 
         //读取表格
-        ImportExcel total = new ImportExcel(file,1,new String[]{SubstationInfo.SHEET_HZB,SubstationInfo.SHEET_HZB1,BashInfo.SHEET_HZB2},true );  //工程项目竣工结算汇总表
+        ImportExcel total = new ImportExcel(file,1,new String[]{SubstationInfo.SHEET_HZB,SubstationInfo.SHEET_HZB1,BashInfo.SHEET_HZB2,BashInfo.SHEET_HZB3},true );  //工程项目竣工结算汇总表
         ImportExcel csqd1 = new ImportExcel(file,1,new String[]{SubstationInfo.SHEET_CSB,SubstationInfo.SHEET_CSB1},true);  // 措施项目清单计价表（一）
         ImportExcel csqd2 = new ImportExcel(file,1,SubstationInfo.SHEET_CSB2,false);  // 措施项目清单计价表（二）
         ImportExcel gf = new ImportExcel(file,1,SubstationInfo.SHEET_GFQD,true);  //规费项目清单计价表
@@ -116,7 +116,10 @@ public class SubstationService {
         //变电站 结算汇总
         List<Settlement> settlementsBdz =  SettementUtil.getComparison(total);
 //        double cbperson = ExcelUtil.getDouble(tbrsb,BashInfo.QT_HJ,0,6);//获取投标人设备表合计
-        double word1total =  ExcelUtil.getDouble(csqd1,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
+        double jzcs = BashInfo.getJzCs(csqd1);
+        double azcs = BashInfo.getAzCs(csqd1);
+//        double word1total =  ExcelUtil.getDouble(csqd1,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
+        double word1total =  jzcs+azcs;//获取措施费清单计价表一
 //        double word2total=ExcelUtil.getDouble(csqd2,SubstationInfo.CS_JZ,0,10);//获取措施费二表措施项目合计金额
         double otherBdzTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计
        //规费