Merge remote-tracking branch 'origin/master'

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

@@ -409,7 +409,7 @@ public class BashInfo {
         double gcjs = 0.00;
         for(int i=0;i<lastRow;i++){
             String type = importExcel.getValue(i+1,1);
-            if(type.equals(BashInfo.TBJG) || type.equals(BashInfo.GCJS)){
+            if(type.equals(TBJG) || type.equals(GCJS) || type.equals(TBJG1)){
                 gcjs = importExcel.getDouble(i+1,2);
             }
         }

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

@@ -471,6 +471,98 @@ public class OverheadLineController extends BaseController {
         list2.add(jkxlDetailFee);
       }
     }
+    //变电站项目求和
+    if(type.equals("3")){
+      double[][] zFees = new double[22][2];
+       for(JkxlDetailFee jkxlDetailFee : list){
+          if(jkxlDetailFee.getWbsCode().equals("21000000")){
+            zFees[0][0] = jkxlDetailFee.getOriginalTotalCost();
+            zFees[1][0] = jkxlDetailFee.getZjgcFee();
+            zFees[2][0] = jkxlDetailFee.getOriginalRgCost();
+            zFees[3][0] = jkxlDetailFee.getOriginalCbrCost();
+            zFees[4][0] = jkxlDetailFee.getOriginalFbrCost();
+            zFees[5][0] = jkxlDetailFee.getOriginalJxCost();
+            zFees[6][0] = jkxlDetailFee.getRgCost();
+            zFees[7][0] = jkxlDetailFee.getCbrCost();
+            zFees[8][0] = jkxlDetailFee.getFbrCost();
+            zFees[9][0] = jkxlDetailFee.getJxCost();
+            zFees[10][0] = jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
+            zFees[11][0] = jkxlDetailFee.getCbrFtFee()!=null? jkxlDetailFee.getCbrFtFee():0.00;
+            zFees[12][0] = jkxlDetailFee.getFbrFtFee()!=null? jkxlDetailFee.getFbrFtFee():0.00;
+            zFees[13][0] = jkxlDetailFee.getJxFtFee()!=null? jkxlDetailFee.getJxFtFee():0.00;
+            zFees[14][0] = jkxlDetailFee.getMeasuresFee1();
+            zFees[15][0] = jkxlDetailFee.getMeasuresFee2();
+            zFees[16][0] = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
+            zFees[17][0] = jkxlDetailFee.getOtherCost();
+            zFees[18][0] = jkxlDetailFee.getFees();
+            zFees[19][0] = jkxlDetailFee.getTex();
+            zFees[21][0] = jkxlDetailFee.getTotalFee();
+          }
+         if(jkxlDetailFee.getWbsCode().equals("23000000")){
+           zFees[0][1] = jkxlDetailFee.getOriginalTotalCost();
+           zFees[1][1] = jkxlDetailFee.getZjgcFee();
+           zFees[2][1] = jkxlDetailFee.getOriginalRgCost();
+           zFees[3][1] = jkxlDetailFee.getOriginalCbrCost();
+           zFees[4][1] = jkxlDetailFee.getOriginalFbrCost();
+           zFees[5][1] = jkxlDetailFee.getOriginalJxCost();
+           zFees[6][1] = jkxlDetailFee.getRgCost();
+           zFees[7][1] = jkxlDetailFee.getCbrCost();
+           zFees[8][1] = jkxlDetailFee.getFbrCost();
+           zFees[9][1] = jkxlDetailFee.getJxCost();
+           zFees[10][1] = jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
+           zFees[11][1] = jkxlDetailFee.getCbrFtFee()!=null? jkxlDetailFee.getCbrFtFee():0.00;
+           zFees[12][1] = jkxlDetailFee.getFbrFtFee()!=null? jkxlDetailFee.getFbrFtFee():0.00;
+           zFees[13][1] = jkxlDetailFee.getJxFtFee()!=null? jkxlDetailFee.getJxFtFee():0.00;
+           zFees[14][1] = jkxlDetailFee.getMeasuresFee1();
+           zFees[15][1] = jkxlDetailFee.getMeasuresFee2();
+           zFees[16][1] = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
+           zFees[17][1] = jkxlDetailFee.getOtherCost();
+           zFees[18][1] = jkxlDetailFee.getFees();
+           zFees[19][1] = jkxlDetailFee.getTex();
+           zFees[21][1] = jkxlDetailFee.getTotalFee();
+         }
+       }
+      JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
+      jkxlDetailFee.setOriginalTotalCost(new BigDecimal(zFees[0][0]+zFees[0][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setZjgcFee(new BigDecimal(zFees[1][0]+zFees[1][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setOriginalRgCost(new BigDecimal(zFees[2][0]+zFees[2][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setOriginalCbrCost(new BigDecimal(zFees[3][0]+zFees[3][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setOriginalFbrCost(new BigDecimal(zFees[4][0]+zFees[4][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setOriginalJxCost(new BigDecimal(zFees[5][0]+zFees[5][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setRgCost(new BigDecimal(zFees[6][0]+zFees[6][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setCbrCost(new BigDecimal(zFees[7][0]+zFees[7][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setFbrCost(new BigDecimal(zFees[8][0]+zFees[8][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setJxCost(new BigDecimal(zFees[9][0]+zFees[9][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setRgFtFee(new BigDecimal(zFees[10][0]+zFees[10][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setCbrFtFee(new BigDecimal(zFees[11][0]+zFees[11][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setFbrFtFee(new BigDecimal(zFees[12][0]+zFees[12][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setJxFtFee(new BigDecimal(zFees[13][0]+zFees[13][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setMeasuresFee1(new BigDecimal(zFees[14][0]+zFees[14][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setMeasuresFee2(new BigDecimal(zFees[15][0]+zFees[15][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setMeasuresFee3(new BigDecimal(zFees[16][0]+zFees[16][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setOtherCost(new BigDecimal(zFees[17][0]+zFees[17][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setFees(new BigDecimal(zFees[18][0]+zFees[18][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setTex(new BigDecimal(zFees[19][0]+zFees[19][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+//    jkxlDetailFee.setGxFee(new BigDecimal(zFee[20]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setTotalFee(new BigDecimal(zFees[21][0]+zFees[21][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setWbsCode("合计");
+      jkxlDetailFee.setParentNode("20000000");
+      jkxlDetailFee.setFeeType("1");
+      JkxlDetailFee jkxlDetailFee1 = new JkxlDetailFee();
+      jkxlDetailFee1.setWbsCode("合计");
+      jkxlDetailFee1.setParentNode("24000000");
+      double total1 = 0.00;
+      for (JkxlDetailFee jkxlDetailFee2 :list2){
+        total1 += jkxlDetailFee2.getTotalFee();
+      }
+      jkxlDetailFee1.setFeeType("0");
+      jkxlDetailFee1.setTotalFee(total1);
+      List<JkxlDetailFee> list3 = new ArrayList<>();
+      list3.add(jkxlDetailFee);
+      list3.add(jkxlDetailFee1);
+      return list3;
+
+    }
     double total1 = 0.00;
     for (JkxlDetailFee jkxlDetailFee :list2){
       total1 += jkxlDetailFee.getTotalFee();

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

@@ -209,8 +209,8 @@ public class SubstationService {
             double fbrAzFee = BashInfo.getFbrAzFee(fbrcg);  //安装发包人采购计价表合计金额
             double zgJz = zjgcJzTotal-aqwmJzFees[1]/aqwmJzFees[0]*100;
             double zgAz = zjgcAzTotal-aqwmAzFees[1]/aqwmAzFees[0]*100;
-            double jxslJz = new BigDecimal(zgJz/(fbrJzFee-zgJz)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); //建筑进项税率
-            double jxslAz = new BigDecimal(zgAz/(fbrAzFee-zgAz)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); //安装进项税率
+            double jxslJz = new BigDecimal(zgJz/(fbrJzFee-zgJz)).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); //建筑进项税率
+            double jxslAz = new BigDecimal(zgAz/(fbrAzFee-zgAz)).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); //安装进项税率
             //建筑部分基础数据
             JkxlDetailFee jz = SubstationInfo.getTolalInfo(jzqd,jzhz,"21000000",SubstationInfo.JZMX_BJZ);  //建筑合计
             JkxlDetailFee jzsc = SubstationInfo.getBashInfo(jzqd,jzhz,"21100000",SubstationInfo.JZMX_ZYGC);  //主要生产工程