Commit f9d47b4e13a347bd0027ce6dcefe8303a1f25744
1 parent
7c2841d8
重新统计方法给每个方法加返回标识。
Showing
1 changed file
with
7 additions
and
1 deletions
src/main/java/com/bsth/controller/calc/CalcWaybillController.java
| ... | ... | @@ -51,11 +51,17 @@ public class CalcWaybillController extends BaseController<CalcWaybill, Integer> |
| 51 | 51 | |
| 52 | 52 | if(key.length() == 0){ |
| 53 | 53 | resMap = calcWaybillService.generateNew(date, line); |
| 54 | - resMap.put("status", calcWaybillService.calcDaily(date, line)); | |
| 54 | + resMap.put("status_daily", calcWaybillService.calcDaily(date, line)); | |
| 55 | + resMap.put("status_lineMileage", generateLineMileage(map).get("status")); | |
| 56 | + resMap.put("status_busMileage", generateBusMileage(map).get("status")); | |
| 55 | 57 | } else if("1".equals(key)){ |
| 56 | 58 | resMap = calcWaybillService.generateNew(date, line); |
| 57 | 59 | } else if("2".equals(key)){ |
| 58 | 60 | resMap.put("status", calcWaybillService.calcDaily(date, line)); |
| 61 | + } else if("3".equals(key)){ | |
| 62 | + resMap = generateLineMileage(map); | |
| 63 | + } else if("2".equals(key)){ | |
| 64 | + resMap = generateBusMileage(map); | |
| 59 | 65 | } |
| 60 | 66 | |
| 61 | 67 | } catch (Exception e) { | ... | ... |