Commit dd9f6345e1acde2516f6960a2483138cd0c6a6bc
1 parent
4534e592
油量表导出模板
Showing
2 changed files
with
5 additions
and
5 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
| @@ -403,8 +403,8 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -403,8 +403,8 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 403 | // 获取车辆存油信息 | 403 | // 获取车辆存油信息 |
| 404 | List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm); | 404 | List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm); |
| 405 | // 指定日期YLB信息 | 405 | // 指定日期YLB信息 |
| 406 | - List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx"); | ||
| 407 | - List<Ylb> iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx"); | 406 | + List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,"",nbbm,"nbbm,jcsx"); |
| 407 | + List<Ylb> iterator2=repository.obtainYl(rq,gsbm,fgsbm,"",nbbm,"jcsx"); | ||
| 408 | for (int i=0;i<ylbList.size();i++) { | 408 | for (int i=0;i<ylbList.size();i++) { |
| 409 | Ylb ylb = ylbList.get(i); | 409 | Ylb ylb = ylbList.get(i); |
| 410 | // 判断是否已经计算过 | 410 | // 判断是否已经计算过 |
| @@ -412,7 +412,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -412,7 +412,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 412 | String nbbm_eq = ylb.getNbbm(); | 412 | String nbbm_eq = ylb.getNbbm(); |
| 413 | Date rq_eq = ylb.getRq(); | 413 | Date rq_eq = ylb.getRq(); |
| 414 | // 得到一天总的加油和里程(根据车,时间) | 414 | // 得到一天总的加油和里程(根据车,时间) |
| 415 | - List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm(),gsbm,fgsbm); | 415 | + List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",gsbm,fgsbm); |
| 416 | // 保存总的加油量 | 416 | // 保存总的加油量 |
| 417 | Double jzl = 0.0; | 417 | Double jzl = 0.0; |
| 418 | // 保存总的里程 | 418 | // 保存总的里程 |
| @@ -1112,7 +1112,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -1112,7 +1112,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 1112 | String nbbm_eq = ylb.getNbbm(); | 1112 | String nbbm_eq = ylb.getNbbm(); |
| 1113 | Date rq_eq = ylb.getRq(); | 1113 | Date rq_eq = ylb.getRq(); |
| 1114 | // 得到一天总的加油和里程(根据车,时间) | 1114 | // 得到一天总的加油和里程(根据车,时间) |
| 1115 | - List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm(),ylb.getSsgsdm(),ylb.getFgsdm()); | 1115 | + List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),ylb.getFgsdm()); |
| 1116 | // 保存总的加油量 | 1116 | // 保存总的加油量 |
| 1117 | Double jzl = 0.0; | 1117 | Double jzl = 0.0; |
| 1118 | // 保存总的里程 | 1118 | // 保存总的里程 |
| @@ -1135,7 +1135,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -1135,7 +1135,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 1135 | map.put("nbbm_eq", nbbm_eq); | 1135 | map.put("nbbm_eq", nbbm_eq); |
| 1136 | map.put("rq_eq", rq_eq); | 1136 | map.put("rq_eq", rq_eq); |
| 1137 | 1137 | ||
| 1138 | - List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),ylb.getXlbm(), | 1138 | + List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"", |
| 1139 | ylb.getNbbm(),"jcsx"); | 1139 | ylb.getNbbm(),"jcsx"); |
| 1140 | DecimalFormat df = new DecimalFormat("#.00"); | 1140 | DecimalFormat df = new DecimalFormat("#.00"); |
| 1141 | Double zyl = 0.0; | 1141 | Double zyl = 0.0; |
src/main/resources/static/pages/forms/mould/list.xls
No preview for this file type