油量查询电量查询优化

廖磊
1 parent 1cb69210
Showing 6 changed files with 301 additions and 205 deletions
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/oil/list_ph.html
 package com.bsth.repository.oil;
+import java.util.Date;
 import java.util.List;
 import org.springframework.data.jpa.repository.Modifying;
@@ -41,6 +42,14 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " and s.nbbm in ?5 order by nbbm,jcsx")
 	List<Dlb> listDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	@Query(value="select s from Dlb s "
+			+ " where s.rq=?1 "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 order by nbbm,jcsx")
+	List<Dlb> listDlb_s(Date rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
 	/**
 	 * 
@@ -73,6 +82,15 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " and s.nbbm in ?5 ")
 	List<Object[]> sumDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	@Query(value="select cdl,hd,sh from Dlb s "
+			+ " where  s.rq=?1"
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 ")
+	List<Object[]> sumDlb_s(Date rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	
 	@Query(value="select ifnull(cdl,0),ifnull(hd,0),ifnull(sh,0) from bsth_c_dlb "
 			+ " where rq=?1 "
 			+ " and ssgsdm like %?2% "
@@ -133,6 +133,15 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and s.nbbm in ?5 ")
 	List<Object[]> sumYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	@Query(value="select jzl,yh,sh from Ylb s "
+			+ " where s.rq=?1  "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 ")
+	List<Object[]> sumYlb_s(Date rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	
 	@Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_c_ylb "
 			+ " where  rq=?1  "
 			+ " and ssgsdm like %?2% "
@@ -151,6 +160,14 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and s.nbbm in ?5 order by nbbm,jcsx")
 	List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	@Query(value="select s from Ylb s "
+			+ " where  s.rq=?1 "
+			+ " and s.ssgsdm =?2 "
+			+ " and s.fgsdm =?3 "
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 order by nbbm,jcsx")
+	List<Ylb> listYlb_s(Date rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
 	@Transactional
     @Modifying
@@ -662,82 +662,97 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	@Override
 	public List<Dlb> listDlb(Map<String, Object> map) {
 		// TODO Auto-generated method stub
-		List<Dlb> listDlb=new ArrayList<Dlb>();
-		List<String> stringList=new ArrayList<String>();
-		String rq=map.get("rq").toString();
-		String gsbm=map.get("ssgsdm_like").toString();
-		String fgsbm=map.get("fgsdm_like").toString();
-		String xlbm=map.get("xlbm_like").toString().trim();
-		String nbbm=map.get("nbbm_eq").toString();
-		String sxtj=map.get("sxtj").toString();
-		
-		if(nbbm.trim()!=""){
-			stringList.add(nbbm);
-			listDlb=repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
-		}else{
-			//全部
-			if(sxtj.equals("0")){
-				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-				for (int i = 0; i < objectLists.size(); i++) {
-					String clbm=objectLists.get(i)[0].toString();
-					stringList.add(clbm);
-				}
-				if(stringList.size()>0){
-					listDlb=repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
-				}
-			}else{
-				List<Object[]> objectLists;
-				if(sxtj.equals("3")){
-					//有加油没里程
-					objectLists=repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
+		List<Dlb> listDlb = new ArrayList<Dlb>();
+		List<String> stringList = new ArrayList<String>();
+		String rq = map.get("rq").toString();
+		String gsbm = map.get("ssgsdm_like").toString();
+		String fgsbm = map.get("fgsdm_like").toString();
+		String xlbm = map.get("xlbm_like").toString().trim();
+		String nbbm = map.get("nbbm_eq").toString();
+		String sxtj = map.get("sxtj").toString();
+		String type = map.get("type").toString();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			if (nbbm.trim() != "") {
+				stringList.add(nbbm);
+				if (type.equals("1"))
+					listDlb = repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
+				else
+					listDlb = repository.listDlb_s(sdf.parse(rq + " 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+
+			} else {
+				// 全部
+				if (sxtj.equals("0")) {
+					List<Object[]> objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
 					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
-						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
-						if(jzl>0 && zlc<=0){
-							stringList.add(clbm);
-						}
-						
+						String clbm = objectLists.get(i)[0].toString();
+						stringList.add(clbm);
 					}
-					
-				}else if(sxtj.equals("4")){
-					//有里程没加油
-					objectLists=repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
-						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
-						if(zlc>0 && jzl<=0){
-							stringList.add(clbm);
-						}
-						
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listDlb = repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listDlb = repository.listDlb_s(sdf.parse(rq + " 00:00:00"), gsbm, fgsbm, xlbm, stringList);
 					}
-				}else{
-					objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						int cs=Integer.parseInt(objectLists.get(i)[1].toString());
-						//一车一单
-						if(sxtj.equals("1")){
-							if(cs==1){
+				} else {
+					List<Object[]> objectLists;
+					if (sxtj.equals("3")) {
+						// 有加油没里程
+						objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (jzl > 0 && zlc <= 0) {
 								stringList.add(clbm);
 							}
-						}	
-						//一车多单
-						if(sxtj.equals("2")){
-							if(cs>1){
+
+						}
+
+					} else if (sxtj.equals("4")) {
+						// 有里程没加油
+						objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (zlc > 0 && jzl <= 0) {
 								stringList.add(clbm);
 							}
+
+						}
+					} else {
+						objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							int cs = Integer.parseInt(objectLists.get(i)[1].toString());
+							// 一车一单
+							if (sxtj.equals("1")) {
+								if (cs == 1) {
+									stringList.add(clbm);
+								}
+							}
+							// 一车多单
+							if (sxtj.equals("2")) {
+								if (cs > 1) {
+									stringList.add(clbm);
+								}
+							}
 						}
 					}
-				}
-				
-				if(stringList.size()>0){
-					listDlb=repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
+
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listDlb = repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listDlb = repository.listDlb_s(sdf.parse(rq + " 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
 				}
 			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
 		}
-
 		return listDlb;
 	}
@@ -751,86 +766,97 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		String xlbm = map.get("xlbm_like").toString().trim();
 		String nbbm = map.get("nbbm_eq").toString();
 		String sxtj = map.get("sxtj").toString();
-		if (nbbm.trim() != "") {
-			stringList.add(nbbm);
-		} else {
-			if (!sxtj.equals("0")) {
-				List<Object[]> objectLists;
-				if (sxtj.equals("3")) {
-					// 有加油没里程
-					objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm = objectLists.get(i)[0].toString();
-						double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
-						double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
-						if (jzl > 0 && zlc <= 0) {
-							stringList.add(clbm);
-						}
-
-					}
+		String type = map.get("type").toString();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<Object[]> sumYlbList = new ArrayList<Object[]>();
+		try {
+			if (nbbm.trim() != "") {
+				stringList.add(nbbm);
+			} else {
+				if (!sxtj.equals("0")) {
+					List<Object[]> objectLists;
+					if (sxtj.equals("3")) {
+						// 有加油没里程
+						objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (jzl > 0 && zlc <= 0) {
+								stringList.add(clbm);
+							}
-				} else if (sxtj.equals("4")) {
-					// 有里程没加油
-					objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm = objectLists.get(i)[0].toString();
-						double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
-						double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
-						if (zlc > 0 && jzl <= 0) {
-							stringList.add(clbm);
 						}
-					}
-				} else {
-					objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm = objectLists.get(i)[0].toString();
-						int cs = Integer.parseInt(objectLists.get(i)[1].toString());
-						// 一车一单
-
-						if (sxtj.equals("1")) {
-							if (cs == 1) {
+					} else if (sxtj.equals("4")) {
+						// 有里程没加油
+						objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (zlc > 0 && jzl <= 0) {
 								stringList.add(clbm);
 							}
+
 						}
-						// 一车多单
-						if (sxtj.equals("2")) {
-							if (cs > 1) {
-								stringList.add(clbm);
+					} else {
+						objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							int cs = Integer.parseInt(objectLists.get(i)[1].toString());
+							// 一车一单
+
+							if (sxtj.equals("1")) {
+								if (cs == 1) {
+									stringList.add(clbm);
+								}
+							}
+							// 一车多单
+							if (sxtj.equals("2")) {
+								if (cs > 1) {
+									stringList.add(clbm);
+								}
 							}
 						}
 					}
 				}
 			}
-		}
-			List<Object[]> sumYlbList = new ArrayList<Object[]>();
 			if (sxtj.equals("0")) {
 				sumYlbList = repository.sumDlb2(rq, gsbm, fgsbm, xlbm, nbbm);
 			} else {
 				if (stringList.size() > 0) {
-	
+
 					// String strings[]=new String[stringList.size()];
 					// for(int i=0;i<stringList.size();i++){
 					// strings[i]=stringList.get(i);
 					// }
-					sumYlbList = repository.sumDlb(rq, gsbm, fgsbm, xlbm, stringList);
-				} 
-//				else {
-//					sumYlbList = repository.sumDlb2(rq, gsbm, fgsbm, xlbm, nbbm);
-//				}
-			}
-			Double jzl = 0.0, yh = 0.0, sh = 0.0;
-			for (int i = 0; i < sumYlbList.size(); i++) {
-				jzl = Arith.add(jzl, Double.valueOf(sumYlbList.get(i)[0].toString()));
-				yh = Arith.add(yh, Double.valueOf(sumYlbList.get(i)[1].toString()));
-				sh = Arith.add(sh, Double.valueOf(sumYlbList.get(i)[2].toString()));
+					if (type.equals("1"))
+						sumYlbList = repository.sumDlb(rq, gsbm, fgsbm, xlbm, stringList);
+					else
+						sumYlbList = repository.sumDlb_s(sdf.parse(rq + " 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+
+				}
+				// else {
+				// sumYlbList = repository.sumDlb2(rq, gsbm, fgsbm, xlbm, nbbm);
+				// }
 			}
-		
-			Map<String, Object> sumMap = new HashMap<String, Object>();
-			sumMap.put("jzl", jzl);
-			sumMap.put("yh", yh);
-			sumMap.put("sh", sh);
-			return sumMap;
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Double jzl = 0.0, yh = 0.0, sh = 0.0;
+		for (int i = 0; i < sumYlbList.size(); i++) {
+			jzl = Arith.add(jzl, Double.valueOf(sumYlbList.get(i)[0].toString()));
+			yh = Arith.add(yh, Double.valueOf(sumYlbList.get(i)[1].toString()));
+			sh = Arith.add(sh, Double.valueOf(sumYlbList.get(i)[2].toString()));
+		}
+
+		Map<String, Object> sumMap = new HashMap<String, Object>();
+		sumMap.put("jzl", jzl);
+		sumMap.put("yh", yh);
+		sumMap.put("sh", sh);
+		return sumMap;
 	}
@@ -1108,6 +1108,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		String xlbm=map.get("xlbm_like").toString().trim();
 		String nbbm=map.get("nbbm_eq").toString();
 		String sxtj=map.get("sxtj").toString();
+		String type=map.get("type").toString();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<Object[]> sumYlbList=new ArrayList<Object[]>();
+		try {
 		if(nbbm.trim()!=""){
 			stringList.add(nbbm);
 		}else{
@@ -1160,7 +1164,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				}
 			}
 		}
-		List<Object[]> sumYlbList=new ArrayList<Object[]>();
 		if(sxtj.equals("0")){
 			sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm,nbbm);
 		}else{
@@ -1170,14 +1173,20 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //					for(int i=0;i<stringList.size();i++){
 //					strings[i]=stringList.get(i);
 //				}
-				sumYlbList=repository.sumYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				if (type.equals("1"))
+					sumYlbList=repository.sumYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				else
+					sumYlbList=repository.sumYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
 			}
 //			else{
 //				sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm, nbbm);
 //			}
 		}
-		
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		Double jzl=0.0,yh=0.0,sh=0.0; 
 		for (int i = 0; i < sumYlbList.size(); i++) {
 			jzl = Arith.add(jzl, Double.valueOf(sumYlbList.get(i)[0].toString()));
@@ -1189,6 +1198,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		sumMap.put("jzl", jzl);
 		sumMap.put("yh", yh);
 		sumMap.put("sh", sh);
+		
 //		String sql="select sum(jzl),sum(yh),sum(sh) from bsth_c_ylb "
 //				+ " where to_days('"+map.get("rq").toString()+"')=to_days(rq)  "
 //				+ " and ssgsdm like '%"+map.get("ssgsdm_like").toString()+"%' "
@@ -1206,96 +1216,118 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	@Override
 	public List<Ylb> listYlb(Map<String, Object> map) {
 		// TODO Auto-generated method stub
-		List<Ylb> listYlb=new ArrayList<Ylb>();
-		List<String> stringList=new ArrayList<String>();
-		String rq=map.get("rq").toString();
-		String gsbm=map.get("ssgsdm_like").toString();
-		String fgsbm=map.get("fgsdm_like").toString();
-		String xlbm=map.get("xlbm_like").toString().trim();
-		String nbbm=map.get("nbbm_eq").toString();
-		String sxtj=map.get("sxtj").toString();
-		if(nbbm.trim()!=""){
-			stringList.add(nbbm);
-			List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-			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);
+		List<Ylb> listYlb = new ArrayList<Ylb>();
+		try {
+			List<String> stringList = new ArrayList<String>();
+			String rq = map.get("rq").toString();
+			String gsbm = map.get("ssgsdm_like").toString();
+			String fgsbm = map.get("fgsdm_like").toString();
+			String xlbm = map.get("xlbm_like").toString().trim();
+			String nbbm = map.get("nbbm_eq").toString();
+			String sxtj = map.get("sxtj").toString();
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			String type = map.get("type").toString();
+			if (nbbm.trim() != "") {
+				stringList.add(nbbm);
+				List<Object[]> objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+				if (objectLists.size() > 0) {
+					int cs = Integer.parseInt(objectLists.get(0)[1].toString());
+					if (sxtj.equals("1")) {
+						if (cs == 1) {
+							if (type.equals("1"))
+								listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+							else
+								listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+
+						}
+					} else if (sxtj.equals("2")) {
+						if (cs > 1) {
+							if (type.equals("1"))
+								listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+							else
+								listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+						}
+					} else {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
 					}
-				}else{
-					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
-				}
-			}
-			
-		}else{
-			//全部
-			if(sxtj.equals("0")){
-				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-				for (int i = 0; i < objectLists.size(); i++) {
-					String clbm=objectLists.get(i)[0].toString();
-					stringList.add(clbm);
-				}
-				if(stringList.size()>0){
-					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
 				}
-			}else{
-				List<Object[]> objectLists;
-				if(sxtj.equals("3")){
-					//有加油没里程
-					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+
+			} else {
+				// 全部
+				if (sxtj.equals("0")) {
+					List<Object[]> objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
 					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
-						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
-						if(jzl>0 && zlc<=0){
-							stringList.add(clbm);
-						}
-						
+						String clbm = objectLists.get(i)[0].toString();
+						stringList.add(clbm);
 					}
-					
-				}else if(sxtj.equals("4")){
-					//有里程没加油
-					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
-						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
-						if(zlc>0 && jzl<=0){
-							stringList.add(clbm);
-						}
-						
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
 					}
-				}else{
-					objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						int cs=Integer.parseInt(objectLists.get(i)[1].toString());
-						//一车一单
-						if(sxtj.equals("1")){
-							if(cs==1){
+				} else {
+					List<Object[]> objectLists;
+					if (sxtj.equals("3")) {
+						// 有加油没里程
+						objectLists = repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (jzl > 0 && zlc <= 0) {
 								stringList.add(clbm);
 							}
-						}	
-						//一车多单
-						if(sxtj.equals("2")){
-							if(cs>1){
+
+						}
+
+					} else if (sxtj.equals("4")) {
+						// 有里程没加油
+						objectLists = repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (zlc > 0 && jzl <= 0) {
 								stringList.add(clbm);
 							}
+
+						}
+					} else {
+						objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							int cs = Integer.parseInt(objectLists.get(i)[1].toString());
+							// 一车一单
+							if (sxtj.equals("1")) {
+								if (cs == 1) {
+									stringList.add(clbm);
+								}
+							}
+							// 一车多单
+							if (sxtj.equals("2")) {
+								if (cs > 1) {
+									stringList.add(clbm);
+								}
+							}
 						}
 					}
-				}
-				
-				if(stringList.size()>0){
-					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
 				}
 			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
 		}
-
 		return listYlb;
 	}
@@ -554,7 +554,8 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             params['order'] = 'nbbm';
             params['page'] = page;
             params['rq'] = $("#rq").val();
-            
+            params['type'] = '2';
+
             var l = layer.load(2);
             $get('/dlb/dlbList', params, function (data) {
@@ -855,6 +856,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $("#export").on("click", function () {
             if ($("#rq").val() != "") {
 				 var params=getParamsList();
+		   		 params['type']='2';
                 $post('/dlb/listExport', params, function (result) {
                     window.open("/downloadFile/download?fileName="+$("#rq").val()+"进出场存电量" );
                 });
@@ -713,7 +713,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             params['order'] = 'nbbm';
             params['page'] = page;
             params['rq'] = $("#rq").val();
-   		 	
+   		 	params['type']='2';
             var l = layer.load(2);
             $get('/ylb/ylbList', params, function (data) {
             	for(var i=1;i<data.length;i++){  
@@ -1035,6 +1035,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $("#export").on("click", function () {
             if ($("#rq").val() != "") {
 				 var params=getParamsList();
+		   		 params['type']='2';
                 $post('/ylb/listExport', params, function (result) {
                     window.open("/downloadFile/download?fileName="+$("#rq").val()+"进出场存油量" );
                 });