1111

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

@@ -173,6 +173,7 @@ public class SubstationService {
         double[] jzgfRate = BashInfo.getJzGfRate(gf);  //获取建筑规费率
         double[] azgfRate = BashInfo.getAzGfRate(gf);  //获取安装规费率
         double[] qtFees = BashInfo.getQtFees(qt);  //获取其他费用
+
         double gcjsFee = BashInfo.getGcjsFee(total);  //获取工程结算价
 
         //变电站 结算汇总
@@ -201,12 +202,16 @@ public class SubstationService {
             double zjgcAzTotal = ExcelUtil.getDouble(azhz,SubstationInfo.QT_HJ,0,3);//安装直接工程费合计
             double csJzFee = SubstationInfo.getCsJzFee(csqd2);//建筑措施分摊费
             double csAzFee = SubstationInfo.getCsAzFee(csqd2);//安装措施分摊费
+            double tbrJzFee = BashInfo.getFbrJzFee(tbrsb); //投标人建筑费
+            double tbrAzFee = BashInfo.getFbrAzFee(tbrsb); //投标人安装费
             double zjgcTotal = zjgcAzTotal+zjgcJzTotal;
 //            double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
             double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_SGZJ,1, new int[]{3, 4});  //建筑安全文明施工费
             double[] aqwmAzFees = BashInfo.getAqwfAzFee(csqd1);  //安装安全文明施工费
-            double fbrJzFee = BashInfo.getFbrJzFee(fbrcg); //建筑发包人采购计价表合计金额
-            double fbrAzFee = BashInfo.getFbrAzFee(fbrcg);  //安装发包人采购计价表合计金额
+//            double fbrJzFee = BashInfo.getFbrJzFee(fbrcg); //建筑发包人采购计价表合计金额
+            double fbrJzFee = ExcelUtil.getDouble(jzqd,SubstationInfo.JZMX_BJZ,2,15);
+//            double fbrAzFee = BashInfo.getFbrAzFee(fbrcg);  //安装发包人采购计价表合计金额
+            double fbrAzFee = ExcelUtil.getDouble(azqd,SubstationInfo.AZMX_BDZAZ,2,15);
             double zgJz = zjgcJzTotal-aqwmJzFees[1]/aqwmJzFees[0]*100;
             double zgAz = zjgcAzTotal-aqwmAzFees[1]/aqwmAzFees[0]*100;
             double jxslJz = new BigDecimal(zgJz/(fbrJzFee-zgJz)).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); //建筑进项税率
@@ -250,7 +255,7 @@ public class SubstationService {
                  double measuresFee1 = (zjgcJzFee -(originalFbrCost/(1+jxslJz)*jxslJz))*jzcsRate; //措施费一（1）
                  double measuresFee2 = csJzFee*rateCs;   //措施费一（2）
                  double otherFee =qtFees[2]*rateQt; //其他费用
-                 double fees = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[0]+(zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[1]*0.2;  //规费
+                 double fees = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*(jzgfRate[0]+jzgfRate[1]*0.2);  //规费
                  double tax = (originalTotalCost+measuresFee1+measuresFee2+fees+otherFee-originalFbrCost)*texRate; //税金
                  double totalfee = originalTotalCost+measuresFee1+measuresFee2+fees+otherFee+tax-originalFbrCost; //合计
                  jkxlDetailFee.setMeasuresFee1(measuresFee1);
@@ -261,6 +266,11 @@ public class SubstationService {
                  jkxlDetailFee.setTotalFee(totalfee);
                  jkxlDetailFee.setId(id);
             }
+            //建筑部门求和
+            JkxlDetailFee jzDetail = jzTotal.get(0);
+            double jztotalFee =  jzDetail.getTotalFee()+tbrJzFee*(1+texRate);
+            jzDetail.setTotalFee(jztotalFee);
+            jzTotal.set(0,jzDetail);
             //安装部分基础数据
             JkxlDetailFee az = SubstationInfo.getTolalInfo(azqd,azhz,"23000000",SubstationInfo.AZMX_BDZAZ);  //安装合计
             JkxlDetailFee azsc = SubstationInfo.getBashInfo(azqd,azhz,"23100000",SubstationInfo.AZMX_ZYSCGC);  //主要生产工程
@@ -317,6 +327,12 @@ public class SubstationService {
                 jkxlDetailFee.setTotalFee(totalfee);
                 jkxlDetailFee.setId(id);
             }
+            //安装求和
+            JkxlDetailFee azDetail = jzTotal.get(0);
+            double aztotalFee =  azDetail.getTotalFee()+tbrAzFee*(1+texRate);
+            jzDetail.setTotalFee(aztotalFee);
+            jzTotal.set(0,azDetail);
+
             double tz = jzTotal.get(0).getTotalFee()+azTotal.get(0).getTotalFee();//总合计金额
             double gxFee = Math.abs(gcjsFee-tz-qtFees[0]-qtFees[1]);
             //将其他费用存入集合

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

@@ -901,21 +901,6 @@ public class SubstationInfo {
 
 
 
-    /**
-     * 获取工程结算价
-     */
-    public static double getGcjsFee(ImportExcel importExcel){
-        int lastRow = importExcel.getLastDataRowNum();
-        double gcjs = 0.00;
-        for(int i=0;i<lastRow;i++){
-            String type = importExcel.getValue(i+1,1);
-            if(type.equals(SubstationInfo.TBJG) || type.equals(SubstationInfo.GCJS)){
-                gcjs = importExcel.getDouble(i+1,2);
-            }
-        }
-        return  gcjs;
-
-    }
     /*
      获取《工程项目竣工结算汇总表》匹配数据
     */