1111

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

@@ -141,16 +141,16 @@ public class SubstationService {
             //建筑部分基础数据
             JkxlDetailFee jz = SubstationInfo.getTolalInfo(jzqd,jzhz,"21000000",SubstationInfo.JZMX_BJZ);  //建筑合计
             JkxlDetailFee jzsc = SubstationInfo.getBashInfo(jzqd,jzhz,"21100000",SubstationInfo.JZMX_ZYGC);  //主要生产工程
-            List<JkxlDetailFee> scjz = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.ZYSCWBS,SubstationInfo.ZYSCJZSTR); //主要生产建筑
+            List<JkxlDetailFee> scjz = SubstationInfo.getBashInfoss(jzqd,jzhz,SubstationInfo.ZYSCWBS,SubstationInfo.ZYSCJZSTR); //主要生产建筑
             List<JkxlDetailFee> pdzz = SubstationInfo.getPdzzjz(jzqd,jzhz);    //配电装置
             List<JkxlDetailFee> gsxt  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.GSXTWBS,SubstationInfo.GSXTSTR); //供水系统建筑
-            List<JkxlDetailFee> xfxt  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.XFXTWBS,SubstationInfo.XFXTSTR); //消防系统
+            List<JkxlDetailFee> xfxt  = SubstationInfo.getBashInfoxf(jzqd,jzhz,SubstationInfo.XFXTWBS,SubstationInfo.XFXTSTR); //消防系统
             JkxlDetailFee jzfz = SubstationInfo.getBashInfo(jzqd,jzhz,"21200000",SubstationInfo.JZMX_FZSCGC);  //辅助生产工程
             List<JkxlDetailFee> fzscjz  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.FZSCWBS,SubstationInfo.FZSCSTR); //辅助生产建筑
-            List<JkxlDetailFee> zqxjz  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.ZQXWBS,SubstationInfo.ZQXSTR); //站区性建筑
+            List<JkxlDetailFee> zqxjz  = SubstationInfo.getBashInfozq(jzqd,jzhz,SubstationInfo.ZQXWBS,SubstationInfo.ZQXSTR); //站区性建筑
             List<JkxlDetailFee> tsgzw  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.TXGJWWBS,SubstationInfo.TXGJWSTR); //特殊构筑物
             JkxlDetailFee zqlh = SubstationInfo.getBashInfo(jzqd,jzhz,"21240000",SubstationInfo.JZMX_ZQLH);  //站区绿化
-            List<JkxlDetailFee> dxgc  = SubstationInfo.getBashInfo(jzqd,jzhz,SubstationInfo.YDZYGWBS,SubstationInfo.YDZYGSTR); //与站址有关的单项工程
+            List<JkxlDetailFee> dxgc  = SubstationInfo.getBashInfozqjz(jzqd,jzhz,SubstationInfo.YDZYGWBS,SubstationInfo.YDZYGSTR); //与站址有关的单项工程
             List<JkxlDetailFee> jzTotal = new ArrayList<>();
             jzTotal.add(jz);
             jzTotal.add(jzsc);
@@ -455,16 +455,16 @@ public class SubstationService {
             //建筑部分基础数据
             JkxlDetailFee jz = SubstationInfo.getTolalInfo(jzqd,jzhz,"21000000",SubstationInfo.JZMX_BJZ);  //建筑合计
             JkxlDetailFee jzsc = SubstationInfo.getBashInfo(jzqd,jzhz,"21100000",SubstationInfo.JZMX_ZYGC);  //主要生产工程
-            List<JkxlDetailFee> scjz = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.ZYSCWBS,SubstationInfo.ZYSCJZSTR); //主要生产建筑
+            List<JkxlDetailFee> scjz = SubstationInfo.getBashInfoss(jzqd,jzhz,SubstationInfo.ZYSCWBS,SubstationInfo.ZYSCJZSTR); //主要生产建筑
             List<JkxlDetailFee> pdzz = SubstationInfo.getPdzzjz(jzqd,jzhz);    //配电装置
             List<JkxlDetailFee> gsxt  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.GSXTWBS,SubstationInfo.GSXTSTR); //供水系统建筑
-            List<JkxlDetailFee> xfxt  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.XFXTWBS,SubstationInfo.XFXTSTR); //消防系统
+            List<JkxlDetailFee> xfxt  = SubstationInfo.getBashInfoxf(jzqd,jzhz,SubstationInfo.XFXTWBS,SubstationInfo.XFXTSTR); //消防系统
             JkxlDetailFee jzfz = SubstationInfo.getBashInfo(jzqd,jzhz,"21200000",SubstationInfo.JZMX_FZSCGC);  //辅助生产工程
             List<JkxlDetailFee> fzscjz  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.FZSCWBS,SubstationInfo.FZSCSTR); //辅助生产建筑
-            List<JkxlDetailFee> zqxjz  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.ZQXWBS,SubstationInfo.ZQXSTR); //站区性建筑
+            List<JkxlDetailFee> zqxjz  = SubstationInfo.getBashInfozq(jzqd,jzhz,SubstationInfo.ZQXWBS,SubstationInfo.ZQXSTR); //站区性建筑
             List<JkxlDetailFee> tsgzw  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.TXGJWWBS,SubstationInfo.TXGJWSTR); //特殊构筑物
             JkxlDetailFee zqlh = SubstationInfo.getBashInfo(jzqd,jzhz,"21240000",SubstationInfo.JZMX_ZQLH);  //站区绿化
-            List<JkxlDetailFee> dxgc  = SubstationInfo.getBashInfo(jzqd,jzhz,SubstationInfo.YDZYGWBS,SubstationInfo.YDZYGSTR); //与站址有关的单项工程
+            List<JkxlDetailFee> dxgc  = SubstationInfo.getBashInfozqjz(jzqd,jzhz,SubstationInfo.YDZYGWBS,SubstationInfo.YDZYGSTR); //与站址有关的单项工程
             List<JkxlDetailFee> jzTotal = new ArrayList<>();
             jzTotal.add(jz);
             jzTotal.add(jzsc);

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

@@ -23,24 +23,32 @@ public class SubstationInfo {
     public static final String JZMX_500JDS = "500kV继电器室#1";
     public static final String JZMX_330JDS = "330kV继电器室";
     public static final String JZMX_220JDS = "220kV继电器室";
-    public static final String JZMX_110JDS = "110kV继电器室";
+    public static final String JZMX_110JDS = " 110kV继电器室";
     public static final String JZMX_66JDS = "66kV继电器室";
     public static final String JZMX_35JDS = "35kV继电器室";
-    public static final String JZMX_10JDS = "10kV继电器室";
+    public static final String JZMX_10JDS = " 10kV继电器室";
     public static final String JZMX_ZYPDZZS = "站用配电装置室";
     public static final String JZMX_1000PDZZS = "1000kV配电装置室";
     public static final String JZMX_750PDZZS = "750kV配电装置室";
     public static final String JZMX_500PDZZS = "500kV配电装置室";
     public static final String JZMX_330PDZZS = "330kV配电装置室";
     public static final String JZMX_220PDZZS = "220kV配电装置室";
-    public static final String JZMX_110PDZZS = "110kV配电装置室";
+    public static final String JZMX_110PDZZS = " 110kV配电装置室";
     public static final String JZMX_66PDZZS = "66kV配电装置室";
     public static final String JZMX_35PDZZS = "35kV配电装置室";
-    public static final String JZMX_10PDZZS = "10kV配电装置室";
+    public static final String JZMX_10PDZZS = " 10kV配电装置室";
     public static final String JZMX_GDCLBC = "固定串联补偿装置控制室";
     public static final String JZMX_KKGYDKQ = "可控高压电抗器晶闸管阀室";
     public static final String JZMX_KKCLBCZZ= "可控串联补偿装置控制室";
     public static final String JZMX_JZWGBCZZ= "静止无功补偿装置晶闸管阀室";
+    public static final String JZMX_BW110KV = "110kV配电装置室（标外）";
+    public static final String JZMX_SXS = "上下水";
+    public static final String JZMX_LTZM = "暖通照明";
+    public static final String JZMX_SDBW = "水电（标外）";
+    public static final String JZMX_RDYM = "弱电预埋（标外）";
+    public static final String JZMX_DLGDBW = "电缆沟道（标外）";
+
+    public static final String[] JZMX_OTH = {JZMX_BW110KV ,JZMX_SXS ,JZMX_LTZM,JZMX_SDBW,JZMX_RDYM};
 
     public static final String JZMX_PDZZJZ = "配电装置建筑";
     public static final String JZMX_ZBYQXT = "主变压器系统";
@@ -67,8 +75,8 @@ public class SubstationInfo {
     public static final String JZMX_66SBZJ = "66kV设备支架及基础";
     public static final String JZMX_35JGJC = "35kV构架及基础";
     public static final String JZMX_35SBZJ = "35kV设备支架及基础";
-    public static final String JZMX_10JGJC = "10kV构架及基础";
-    public static final String JZMX_10SBZJ = "10kV设备支架及基础";
+    public static final String JZMX_10JGJC = " 10kV构架及基础";
+    public static final String JZMX_10SBZJ = " 10kV设备支架及基础";
     public static final String JZMX_GYDKQXT = "高压电抗器系统";
     public static final String JZMX_GYDKQ = "高压电抗器设备基础";
     public static final String JZMX_GYYCJLS = "高抗油池及卵石";
@@ -98,11 +106,16 @@ public class SubstationInfo {
 
     public static final String JZMX_XFXT= "消防系统";
     public static final String JZMX_XFSBF= "消防水泵房";
+    public static final String JZMX_XFSBFBW= "消防水泵房(标外)";
+    public static final String JZMX_XFSBFSD= "消防泵房水电（标外）";
     public static final String JZMX_YLFS= "雨淋阀室";
     public static final String JZMX_ZQXFGD= "站区消防管道";
+    public static final String JZMX_ZQXFGDBW= "站区消防管道（标外）";
     public static final String JZMX_XFQC= "消防器材";
+    public static final String JZMX_XFQCBW= "消防器材（标外）";
     public static final String JZMX_TSXFXT= "特殊消防系统";
     public static final String JZMX_XFSC= "消防水池";
+    public static final String JZMX_XFSCBW= "消防水池标外";
 
     public static final String JZMX_FZSCGC= "辅助生产工程";
     public static final String JZMX_FZSCJZ= "辅助生产建筑";
@@ -113,8 +126,10 @@ public class SubstationInfo {
     public static final String JZMX_ZQXJZ= "站区性建筑";
     public static final String JZMX_CDPZ= "场地平整";
     public static final String JZMX_ZQDLJGC= "站区道路及广场";
+    public static final String JZMX_ZWDLBW= "站区道路（标外）";
     public static final String JZMX_ZQPS= "站区排水";
     public static final String JZMX_WQJDM= "围墙及大门";
+    public static final String JZMX_WQJDMBW= "围墙大门（标外）";
 
     public static final String JZMX_TSGZW= "特殊构筑物";
     public static final String JZMX_DTQJDSQ= "挡土墙及挡水墙";
@@ -125,7 +140,10 @@ public class SubstationInfo {
 
     public static final String JZMX_ZZDXGC= "与站址有关的单项工程";
     public static final String JZMX_DJCL= "地基处理";
+    public static final String JZMX_DJCLBW= "地基处理（标外）";
     public static final String JZMX_ZWDL= "站外道路";
+    public static final String JZMX_ZWDLBW1= "站外道路（标外）";
+    public static final String JZMX_ZWDLTJ= "土建新增签证及确认单";
     public static final String JZMX_ZWSY= "站外水源";
     public static final String JZMX_ZWPS= "站外排水";
     public static final String JZMX_SGJS= "施工降水";
@@ -607,6 +625,193 @@ public class SubstationInfo {
          return jkxlDetailFees;
     }
 
+    public static List<JkxlDetailFee> getBashInfoss(ImportExcel importExcel,ImportExcel importExcel1,String[] wbs,String[] str){
+        double[][] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
+        double[][] doubless = ExcelUtil.getBashArray(importExcel,JZMX_OTH ,2,new int[]{12,13, 14, 15, 17});
+        double d = ExcelUtil.getDouble(importExcel1,str[0],1,3);  //直接工程费
+        double e = ExcelUtil.getDouble(importExcel1,str[0],1,2);  //合计
+        doubles[2][0] =  doubles[2][0] + doubless[0][0]+ doubless[1][0]+ doubless[2][0]+ doubless[3][0]+ doubless[4][0];
+        doubles[2][1] =  doubles[2][1] + doubless[0][1]+ doubless[1][1]+ doubless[2][1]+ doubless[3][1]+ doubless[4][1];
+        doubles[2][2] =  doubles[2][2] + doubless[0][2]+ doubless[1][2]+ doubless[2][2]+ doubless[3][2]+ doubless[4][2];
+        doubles[2][3] =  doubles[2][3] + doubless[0][3]+ doubless[1][3]+ doubless[2][3]+ doubless[3][3]+ doubless[4][3];
+        doubles[2][4] =  doubles[2][4] + doubless[0][4]+ doubless[1][4]+ doubless[2][4]+ doubless[3][4]+ doubless[4][4];
+        double total = doubles[0][0];
+        int len = str.length;
+        double[] zjgc = new double[len];
+        zjgc[0] = d;
+        for(int i=1;i<len;i++){
+            double rate = 0.00;
+            if(total != 0.00){
+                rate = doubles[i][0]/total;
+            }
+            zjgc[i] = d*rate;
+        }
+//         doubles[0][0] = e;
+        List<JkxlDetailFee> jkxlDetailFees = new ArrayList<>();
+        JkxlDetailFee jkxlDetailFee = null;
+        for(int j=0;j<str.length;j++){
+            jkxlDetailFee = new JkxlDetailFee();
+            jkxlDetailFee.setOriginalTotalCost(doubles[j][0]);
+//             jkxlDetailFee.setOriginalTotalCost(e);
+            jkxlDetailFee.setZjgcFee(zjgc[j]);
+            jkxlDetailFee.setOriginalRgCost(doubles[j][1]);
+            jkxlDetailFee.setOriginalFbrCost(doubles[j][3]);
+            jkxlDetailFee.setOriginalCbrCost(doubles[j][2]);
+            jkxlDetailFee.setOriginalJxCost(doubles[j][4]);
+            jkxlDetailFee.setWbsCode(wbs[j]);
+            jkxlDetailFees.add(jkxlDetailFee);
+        }
+        return jkxlDetailFees;
+    }
+
+    //消防
+    public static List<JkxlDetailFee> getBashInfoxf(ImportExcel importExcel,ImportExcel importExcel1,String[] wbs,String[] str){
+        double[][] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
+        double[] doubles1 = ExcelUtil.getBashArray(importExcel,JZMX_XFSBFBW ,2,new int[]{12,13, 14, 15, 17});
+        double[] doubles2 = ExcelUtil.getBashArray(importExcel,JZMX_XFSBFSD ,2,new int[]{12,13, 14, 15, 17});
+//        double[] doubles3 = ExcelUtil.getBashArray(importExcel,JZMX_ZQXFGDBW,2,new int[]{12,13, 14, 15, 17});
+        double[] doubles4 = ExcelUtil.getBashArray(importExcel,JZMX_XFQCBW,2,new int[]{12,13, 14, 15, 17});
+        double[] doubles5 = ExcelUtil.getBashArray(importExcel,JZMX_XFSCBW ,2,new int[]{12,13, 14, 15, 17});
+        double d = ExcelUtil.getDouble(importExcel1,str[0],1,3);  //直接工程费
+        double e = ExcelUtil.getDouble(importExcel1,str[0],1,2);  //合计
+        doubles[1][0] =  doubles[1][0]+ doubles1[0]+ doubles2[0]+ doubles4[0]+ doubles5[0];
+        doubles[1][1] =  doubles[1][1]+ doubles1[1]+ doubles2[1]+ doubles4[1]+ doubles5[1];
+        doubles[1][2] =  doubles[1][2]+ doubles1[2]+ doubles2[2]+ doubles4[2]+ doubles5[2];
+        doubles[1][3] =  doubles[1][3]+ doubles1[3]+ doubles2[3]+ doubles4[3]+ doubles5[3];
+        doubles[1][4] =  doubles[1][4]+ doubles1[4]+ doubles2[4]+ doubles4[4]+ doubles5[4];
+//        doubles[3][0] =  doubles[3][0]+ doubles3[0];
+//        doubles[3][1] =  doubles[3][1]+ doubles3[1];
+//        doubles[3][2] =  doubles[3][2]+ doubles3[2];
+//        doubles[3][3] =  doubles[3][3]+ doubles3[3];
+//        doubles[3][4] =  doubles[3][4]+ doubles3[4];
+//        doubles[4][0] =  doubles[4][0]+ doubles4[0];
+//        doubles[4][1] =  doubles[4][1]+ doubles4[1];
+//        doubles[4][2] =  doubles[4][2]+ doubles4[2];
+//        doubles[4][3] =  doubles[4][3]+ doubles4[3];
+//        doubles[4][4] =  doubles[4][4]+ doubles4[4];
+//        doubles[6][0] =  doubles[6][0]+ doubles5[0];
+//        doubles[6][1] =  doubles[6][1]+ doubles5[1];
+//        doubles[6][2] =  doubles[6][2]+ doubles5[2];
+//        doubles[6][3] =  doubles[6][3]+ doubles5[3];
+//        doubles[6][4] =  doubles[6][4]+ doubles5[4];
+
+        double total = doubles[0][0];
+        int len = str.length;
+        double[] zjgc = new double[len];
+        zjgc[0] = d;
+        for(int i=1;i<len;i++){
+            double rate = 0.00;
+            if(total != 0.00){
+                rate = doubles[i][0]/total;
+            }
+            zjgc[i] = d*rate;
+        }
+//         doubles[0][0] = e;
+        List<JkxlDetailFee> jkxlDetailFees = new ArrayList<>();
+        JkxlDetailFee jkxlDetailFee = null;
+        for(int j=0;j<str.length;j++){
+            jkxlDetailFee = new JkxlDetailFee();
+            jkxlDetailFee.setOriginalTotalCost(doubles[j][0]);
+//             jkxlDetailFee.setOriginalTotalCost(e);
+            jkxlDetailFee.setZjgcFee(zjgc[j]);
+            jkxlDetailFee.setOriginalRgCost(doubles[j][1]);
+            jkxlDetailFee.setOriginalFbrCost(doubles[j][3]);
+            jkxlDetailFee.setOriginalCbrCost(doubles[j][2]);
+            jkxlDetailFee.setOriginalJxCost(doubles[j][4]);
+            jkxlDetailFee.setWbsCode(wbs[j]);
+            jkxlDetailFees.add(jkxlDetailFee);
+        }
+        return jkxlDetailFees;
+    }
+
+    //战区建筑
+    public static List<JkxlDetailFee> getBashInfozq(ImportExcel importExcel,ImportExcel importExcel1,String[] wbs,String[] str){
+        double[][] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
+        double[] doubles1 = ExcelUtil.getBashArray(importExcel,JZMX_ZWDLBW,2,new int[]{12,13, 14, 15, 17});
+        double[] doubles2 = ExcelUtil.getBashArray(importExcel,JZMX_WQJDMBW ,2,new int[]{12,13, 14, 15, 17});
+        double d = ExcelUtil.getDouble(importExcel1,str[0],1,3);  //直接工程费
+        double e = ExcelUtil.getDouble(importExcel1,str[0],1,2);  //合计
+        doubles[1][0] =  doubles[1][0]+ doubles1[0]+ doubles2[0];
+        doubles[1][1] =  doubles[1][1]+ doubles1[1]+ doubles2[1];
+        doubles[1][2] =  doubles[1][2]+ doubles1[2]+ doubles2[2];
+        doubles[1][3] =  doubles[1][3]+ doubles1[3]+ doubles2[3];
+        doubles[1][4] =  doubles[1][4]+ doubles1[4]+ doubles2[4];
+
+        double total = doubles[0][0];
+        int len = str.length;
+        double[] zjgc = new double[len];
+        zjgc[0] = d;
+        for(int i=1;i<len;i++){
+            double rate = 0.00;
+            if(total != 0.00){
+                rate = doubles[i][0]/total;
+            }
+            zjgc[i] = d*rate;
+        }
+//         doubles[0][0] = e;
+        List<JkxlDetailFee> jkxlDetailFees = new ArrayList<>();
+        JkxlDetailFee jkxlDetailFee = null;
+        for(int j=0;j<str.length;j++){
+            jkxlDetailFee = new JkxlDetailFee();
+            jkxlDetailFee.setOriginalTotalCost(doubles[j][0]);
+//             jkxlDetailFee.setOriginalTotalCost(e);
+            jkxlDetailFee.setZjgcFee(zjgc[j]);
+            jkxlDetailFee.setOriginalRgCost(doubles[j][1]);
+            jkxlDetailFee.setOriginalFbrCost(doubles[j][3]);
+            jkxlDetailFee.setOriginalCbrCost(doubles[j][2]);
+            jkxlDetailFee.setOriginalJxCost(doubles[j][4]);
+            jkxlDetailFee.setWbsCode(wbs[j]);
+            jkxlDetailFees.add(jkxlDetailFee);
+        }
+        return jkxlDetailFees;
+    }
+
+
+    //战区建筑
+    public static List<JkxlDetailFee> getBashInfozqjz(ImportExcel importExcel,ImportExcel importExcel1,String[] wbs,String[] str){
+        double[][] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
+        double[] doubles1 = ExcelUtil.getBashArray(importExcel,JZMX_DJCLBW,2,new int[]{12,13, 14, 15, 17});
+        double[] doubles2 = ExcelUtil.getBashArray(importExcel,JZMX_ZWDLBW1,2,new int[]{12,13, 14, 15, 17});
+        double[] doubles3 = ExcelUtil.getBashArray(importExcel,JZMX_ZWDLTJ,2,new int[]{12,13, 14, 15, 17});
+        double d = ExcelUtil.getDouble(importExcel1,str[0],1,3);  //直接工程费
+        double e = ExcelUtil.getDouble(importExcel1,str[0],1,2);  //合计
+        doubles[1][0] =  doubles[1][0]+ doubles1[0]+ doubles2[0]+ doubles3[0];
+        doubles[1][1] =  doubles[1][1]+ doubles1[1]+ doubles2[1]+ doubles3[1];
+        doubles[1][2] =  doubles[1][2]+ doubles1[2]+ doubles2[2]+ doubles3[2];
+        doubles[1][3] =  doubles[1][3]+ doubles1[3]+ doubles2[3]+ doubles3[3];
+        doubles[1][4] =  doubles[1][4]+ doubles1[4]+ doubles2[4]+ doubles3[4];
+
+        double total = doubles[0][0];
+        int len = str.length;
+        double[] zjgc = new double[len];
+        zjgc[0] = d;
+        for(int i=1;i<len;i++){
+            double rate = 0.00;
+            if(total != 0.00){
+                rate = doubles[i][0]/total;
+            }
+            zjgc[i] = d*rate;
+        }
+//         doubles[0][0] = e;
+        List<JkxlDetailFee> jkxlDetailFees = new ArrayList<>();
+        JkxlDetailFee jkxlDetailFee = null;
+        for(int j=0;j<str.length;j++){
+            jkxlDetailFee = new JkxlDetailFee();
+            jkxlDetailFee.setOriginalTotalCost(doubles[j][0]);
+//             jkxlDetailFee.setOriginalTotalCost(e);
+            jkxlDetailFee.setZjgcFee(zjgc[j]);
+            jkxlDetailFee.setOriginalRgCost(doubles[j][1]);
+            jkxlDetailFee.setOriginalFbrCost(doubles[j][3]);
+            jkxlDetailFee.setOriginalCbrCost(doubles[j][2]);
+            jkxlDetailFee.setOriginalJxCost(doubles[j][4]);
+            jkxlDetailFee.setWbsCode(wbs[j]);
+            jkxlDetailFees.add(jkxlDetailFee);
+        }
+        return jkxlDetailFees;
+    }
+
+
+
 
     /**
      * 建筑安装基础数据
@@ -632,6 +837,16 @@ public class SubstationInfo {
     public static List<JkxlDetailFee> getPdzzjz(ImportExcel importExcel,ImportExcel importExcel1){
         JkxlDetailFee total = getBashInfo(importExcel,importExcel1,"21120000",JZMX_PDZZJZ);//配电装置
         List<JkxlDetailFee> total1 = getBashInfo(importExcel,importExcel1,PDZZJZWBS,PDZZJZSTR);
+        double[] doubles = ExcelUtil.getBashArray(importExcel,JZMX_DLGDBW ,2,new int[]{12,13, 14, 15, 17});
+        for(JkxlDetailFee jkxlDetailFee2 : total1){
+            if(jkxlDetailFee2.getWbsCode().equals("2112K000")){
+                jkxlDetailFee2.setOriginalTotalCost(jkxlDetailFee2.getOriginalTotalCost()+doubles[0]);
+                jkxlDetailFee2.setOriginalRgCost(jkxlDetailFee2.getOriginalRgCost()+doubles[1]);
+                jkxlDetailFee2.setOriginalFbrCost(jkxlDetailFee2.getOriginalFbrCost()+doubles[2]);
+                jkxlDetailFee2.setOriginalCbrCost(jkxlDetailFee2.getOriginalCbrCost()+doubles[3]);
+                jkxlDetailFee2.setOriginalJxCost(jkxlDetailFee2.getOriginalJxCost()+doubles[4]);
+            }
+        }
         List<JkxlDetailFee> kvjg = getBashInfo(importExcel,importExcel1,KFJGSBWBS,KFJGSBSTR);//构架及设备基础无3级表头
         List<JkxlDetailFee> kvtotal = new ArrayList<>(); //构架及设备基础
         for(int i=0;i<kvjg.size()/2;i++){