|
@@ -845,11 +845,17 @@ public class SubstationInfo {
|
|
|
List list = new ArrayList();
|
|
|
for(int i=0;i<lastRow;i++){
|
|
|
String type = importExcel.getValue(i+1,2);
|
|
|
+ String type1 = importExcel.getValue(i+1,0);
|
|
|
list.add(type);
|
|
|
+ if(type1.equals(QT_XJ)){
|
|
|
+ d = importExcel.getDouble(i+1,10);
|
|
|
+ return d;
|
|
|
+ }
|
|
|
}
|
|
|
if(!list.contains(CS_JZ)){
|
|
|
return d;
|
|
|
}
|
|
|
+
|
|
|
for(int i=0;i<lastRow;i++){
|
|
|
String type = importExcel.getValue(i+1,1);
|
|
|
if(type.equals("")){
|