油量表导出模板

廖磊
1 parent 4534e592
Showing 2 changed files with 5 additions and 5 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/forms/mould/list.xls
@@ -403,8 +403,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 获取车辆存油信息
 			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 指定日期YLB信息
-			List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-			List<Ylb> iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+			List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,"",nbbm,"nbbm,jcsx");
+			List<Ylb> iterator2=repository.obtainYl(rq,gsbm,fgsbm,"",nbbm,"jcsx");
 			for (int i=0;i<ylbList.size();i++) {
 				Ylb ylb = ylbList.get(i);
 				// 判断是否已经计算过
@@ -412,7 +412,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					String nbbm_eq = ylb.getNbbm();
 					Date rq_eq = ylb.getRq();
 					// 得到一天总的加油和里程（根据车，时间）
-					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm(),gsbm,fgsbm);
+					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",gsbm,fgsbm);
 					// 保存总的加油量
 					Double jzl = 0.0;
 					// 保存总的里程
@@ -1112,7 +1112,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				String nbbm_eq = ylb.getNbbm();
 				Date rq_eq = ylb.getRq();
 				// 得到一天总的加油和里程（根据车，时间）
-				List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm(),ylb.getSsgsdm(),ylb.getFgsdm());
+				List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),ylb.getFgsdm());
 				// 保存总的加油量
 				Double jzl = 0.0;
 				// 保存总的里程
@@ -1135,7 +1135,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				map.put("nbbm_eq", nbbm_eq);
 				map.put("rq_eq", rq_eq);
  
-				List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),ylb.getXlbm(),
+				List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
 						ylb.getNbbm(),"jcsx");
 				DecimalFormat df = new DecimalFormat("#.00");
 				Double zyl = 0.0;