1111

src/main/java/com/jeeplus/common/utils/sg/ExcelUtil.java

@@ -152,19 +152,46 @@ public class ExcelUtil {
         return d;
     }
 
+//    public static double[][] getBashArray(ImportExcel importExcel,String[] sts,int column1,int[] column2){
+//        int lastRow = importExcel.getLastDataRowNum();
+//        int len = sts.length;
+//        int len1 = column2.length;
+//        double[][] d = new double[len][len1];
+//        for(int j=0;j<len;j++){
+//          for(int i=0;i<lastRow;i++){
+//            String type = importExcel.getValue(i+1,column1);
+//            if(type.equals("")){
+//                continue;
+//            }
+//
+//                if(type.contains(sts[j])){
+//                    for(int k=0;k<column2.length;k++) {
+//                        d[j][k] = importExcel.getDouble(i + 1, column2[k]);
+//                    }
+//                    break;
+//                }
+//            }
+//        }
+//        return d;
+//    }
+
     public static double[][] getBashArray(ImportExcel importExcel,String[] sts,int column1,int[] column2){
         int lastRow = importExcel.getLastDataRowNum();
         int len = sts.length;
         int len1 = column2.length;
         double[][] d = new double[len][len1];
         for(int j=0;j<len;j++){
-          for(int i=0;i<lastRow;i++){
-            String type = importExcel.getValue(i+1,column1);
-            if(type.equals("")){
-                continue;
-            }
-
-                if(type.contains(sts[j])){
+            for(int i=0;i<lastRow;i++){
+                String type = importExcel.getValue(i+1,column1);
+                if(type.equals("")){
+                    continue;
+                }
+                if(!type.contains(" ")){
+                    continue;
+                }
+                int in = type.indexOf(" ");
+                String newstr = type.substring(in,type.length()).trim();
+                if(newstr.equals(sts[j])){
                     for(int k=0;k<column2.length;k++) {
                         d[j][k] = importExcel.getDouble(i + 1, column2[k]);
                     }

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

@@ -150,6 +150,7 @@ public class SubstationService {
             List<JkxlDetailFee> zqxjz  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.ZQXWBS,SubstationInfo.ZQXSTR,"2"); //站区性建筑
             List<JkxlDetailFee> tsgzw  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.TXGJWWBS,SubstationInfo.TXGJWSTR,"2"); //特殊构筑物
             JkxlDetailFee zqlh = SubstationInfo.getBashInfo(jzqd,jzhz,"21240000",SubstationInfo.JZMX_ZQLH);  //站区绿化
+            JkxlDetailFee ydxgc = SubstationInfo.getBashInfo(jzqd,jzhz,"21300000",SubstationInfo.JZMX_ZZDXGC);  //单项工程
             List<JkxlDetailFee> dxgc  = SubstationInfo.getDxInfo(jzqd,jzhz,SubstationInfo.YDZYGWBS,SubstationInfo.YDZYGSTR); //与站址有关的单项工程
             List<JkxlDetailFee> jzTotal = new ArrayList<>();
             jzTotal.add(jz);
@@ -163,6 +164,7 @@ public class SubstationService {
             jzTotal.addAll(zqxjz);
             jzTotal.addAll(tsgzw);
             jzTotal.add(zqlh);
+            jzTotal.add(ydxgc);
             jzTotal.addAll(dxgc);
             //安装部分基础数据
             JkxlDetailFee az = SubstationInfo.getTolalInfo(azqd,azhz,"23000000",SubstationInfo.AZMX_BDZAZ);  //安装合计
@@ -464,6 +466,7 @@ public class SubstationService {
             List<JkxlDetailFee> zqxjz  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.ZQXWBS,SubstationInfo.ZQXSTR,"2"); //站区性建筑
             List<JkxlDetailFee> tsgzw  = SubstationInfo.getBashInfos(jzqd,jzhz,SubstationInfo.TXGJWWBS,SubstationInfo.TXGJWSTR,"2"); //特殊构筑物
             JkxlDetailFee zqlh = SubstationInfo.getBashInfo(jzqd,jzhz,"21240000",SubstationInfo.JZMX_ZQLH);  //站区绿化
+            JkxlDetailFee ydxgc = SubstationInfo.getBashInfo(jzqd,jzhz,"21300000",SubstationInfo.JZMX_ZZDXGC);  //单项工程
             List<JkxlDetailFee> dxgc  = SubstationInfo.getDxInfo(jzqd,jzhz,SubstationInfo.YDZYGWBS,SubstationInfo.YDZYGSTR); //与站址有关的单项工程
             List<JkxlDetailFee> jzTotal = new ArrayList<>();
             jzTotal.add(jz);
@@ -477,6 +480,7 @@ public class SubstationService {
             jzTotal.addAll(zqxjz);
             jzTotal.addAll(tsgzw);
             jzTotal.add(zqlh);
+            jzTotal.add(ydxgc);
             jzTotal.addAll(dxgc);
 //            boolean flagJz = SubstationInfo.getFlag(jzTotal);
             //结算汇总保存

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

@@ -22,7 +22,7 @@ public class SubstationInfo {
     public static final String JZMX_500JDS = "500kV继电器室";
     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继电器室";
@@ -32,10 +32,10 @@ public class SubstationInfo {
     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= "可控串联补偿装置控制室";
@@ -68,8 +68,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 = "高抗油池及卵石";
@@ -138,7 +138,7 @@ public class SubstationInfo {
     public static final String AZMX_ZYSCGC= "主要生产工程";
 
     public static final String AZMX_ZBYQXT= "主变压器系统";
-    public static final String AZMX_ZBYQ= "主变压器";
+    public static final String AZMX_ZBYQ= "主变压器系统";
 
     public static final String AZMX_PDZZ= "配电装置";
     public static final String AZMX_WLPDZZ= "屋内配电装置";
@@ -161,7 +161,7 @@ public class SubstationInfo {
     public static final String AZMX_JLXTUPS= "直流系统及不间断电源";
     public static final String AZMX_ZLFZXI= "智能辅助控制系统";
     public static final String AZMX_ZXJKXT= "在线监测系统";
-    public static final String AZMX_FZSB = " 辅助设备与设施";
+    public static final String AZMX_FZSB = "辅助设备与设施";
 
     public static final String AZMX_ZYDXT= "站用电系统";
     public static final String AZMX_ZYBYQ= "站用变压器";
@@ -303,8 +303,8 @@ public class SubstationInfo {
 
 
     //与站址有关的单项工程
-    public static String[] YDZYGWBS = {"21300000","21310000","21320000","21330000","21340000","21350000","21360000"};
-    public static String[] YDZYGSTR = {JZMX_ZZDXGC,JZMX_DJCL,JZMX_ZWDL,JZMX_ZWSY,JZMX_ZWPS,JZMX_SGJS,JZMX_LSGC};
+    public static String[] YDZYGWBS = {"21310000","21320000","21330000","21340000","21350000","21360000"};
+    public static String[] YDZYGSTR = {JZMX_DJCL,JZMX_ZWDL,JZMX_ZWSY,JZMX_ZWPS,JZMX_SGJS,JZMX_LSGC};
 
 
 
@@ -961,6 +961,8 @@ public class SubstationInfo {
 
     }
 
+
+
     /**
      * 控制直流
      */
@@ -1229,7 +1231,6 @@ public class SubstationInfo {
         int startRow = 0;
         int lastRow = importExcel.getLastDataRowNum();
         List<String> list = new ArrayList();
-        if(startRow != 0) {
             for (int i = 0; i < lastRow; i++) {
                 String type = importExcel.getValue(i + 1, 2);
                 if (type.contains(JZMX_ZZDXGC)) {
@@ -1237,20 +1238,21 @@ public class SubstationInfo {
                     break;
                 }
             }
-            for (int i = startRow; i < lastRow; i++) {
-                String type = importExcel.getValue(i + 1, 2);
-                if (type.contains(" ")) {
-                    int in = type.indexOf(" ");
-                    if (in == 1) {
-                        String s = type.substring(in, type.length()).trim();
-                        boolean b = Arrays.asList(str).contains(s);
-                        if (!b) {
-                            list.add(type);
+            if(startRow != 0) {
+                for (int i = startRow; i < lastRow; i++) {
+                    String type = importExcel.getValue(i + 1, 2);
+                    if (type.contains(" ")) {
+                        int in = type.indexOf(" ");
+                        if (in == 1) {
+                            String s = type.substring(in, type.length()).trim();
+                            boolean b = Arrays.asList(str).contains(s);
+                            if (!b) {
+                                list.add(type);
+                            }
                         }
                     }
                 }
             }
-        }
         double[][] d = new double[list.size()][5];
         for(int j=0;j<list.size();j++){
             String strs = list.get(j);