|
@@ -440,18 +440,28 @@ public class BashInfo {
|
|
|
*/
|
|
|
public static double[] getJzCsFees(ImportExcel importExcel){
|
|
|
int lastRow = importExcel.getLastDataRowNum();
|
|
|
+ int jzRow = 0;
|
|
|
int azRow = 0;
|
|
|
for(int i=0;i<lastRow;i++){
|
|
|
String type = importExcel.getValue(i+1,1);
|
|
|
+ if(type.equals(CS_JZ)){
|
|
|
+ jzRow = i+1;
|
|
|
+ }
|
|
|
if(type.equals(CS_AZ)){
|
|
|
azRow = i+1;
|
|
|
- break;
|
|
|
}
|
|
|
}
|
|
|
+ if(jzRow == 0){
|
|
|
+ return new double[]{0.00,0.00};
|
|
|
+ }
|
|
|
+ if(azRow!=0){
|
|
|
+ lastRow = azRow;
|
|
|
+ }
|
|
|
+
|
|
|
double ls = 0.00;
|
|
|
double aq = 0.00;
|
|
|
double total = 0.00;
|
|
|
- for(int i=0;i<azRow+1;i++){
|
|
|
+ for(int i=jzRow;i<lastRow;i++){
|
|
|
String type = importExcel.getValue(i+1,1);
|
|
|
String type1 = importExcel.getValue(i+1,0);
|
|
|
if(type.contains(CS_LS)){
|