油量表查询条件修改

廖磊
1 parent 8bde3e6c
Showing 1 changed file with 14 additions and 10 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
@@ -1016,18 +1016,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		if(nbbm.trim()!=""){
 			stringList.add(nbbm);
 			List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-			int cs=Integer.parseInt(objectLists.get(0)[1].toString());
-			if(sxtj.equals("1")){
-				if(cs==1){
+			if(objectLists.size()>0){
+				int cs=Integer.parseInt(objectLists.get(0)[1].toString());
+				if(sxtj.equals("1")){
+					if(cs==1){
+						listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+					}
+				}else if(sxtj.equals("2")){
+					if(cs>1){
+						listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+					}
+				}else{
 					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
 				}
 			}
  
-			if(sxtj.equals("2")){
-				if(cs>1){
-					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
-				}
-			}
 		}else{
 			//全部
 			if(sxtj.equals("0")){
@@ -1248,17 +1251,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							if(zlc>0){
 								long l=0l;
 								double ylxs=0.0;
-								if(i==iterator2.size()){
+								if(i==iterator2.size()-1){
 									ylxs=czyl;
 								}else{
 									l=Math.round(nextJzyl);
 									ylxs=l*100/100;
 								}
-//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
 								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
 								t.setYh(yh);
 								t.setJzyl(ylxs);
 								nextJzyl=ylxs;
+								
+								
 							}else{
 								t.setYh(yh);
 								t.setJzyl(nextJzyl);