Commit 43543a5dcd61de31cda707a497bf3e32b27aa6e6
1 parent
b7c579bb
调度日报加导出 行车路单实际公里减去少驶公里 LGF
Showing
3 changed files
with
221 additions
and
2 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
| @@ -429,4 +429,9 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -429,4 +429,9 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 429 | public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){ | 429 | public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){ |
| 430 | return scheduleRealInfoService.scheduleDailyQp(line,date); | 430 | return scheduleRealInfoService.scheduleDailyQp(line,date); |
| 431 | } | 431 | } |
| 432 | + | ||
| 433 | + @RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET) | ||
| 434 | + public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){ | ||
| 435 | + return scheduleRealInfoService.scheduleDailyExport(map); | ||
| 436 | + } | ||
| 432 | } | 437 | } |
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
| @@ -144,4 +144,6 @@ public interface ScheduleRealInfoService extends BaseService<ScheduleRealInfo, L | @@ -144,4 +144,6 @@ public interface ScheduleRealInfoService extends BaseService<ScheduleRealInfo, L | ||
| 144 | Map<String,Object> addRemarks(Long id, String remarks); | 144 | Map<String,Object> addRemarks(Long id, String remarks); |
| 145 | 145 | ||
| 146 | List<Map<String, Object>> scheduleDailyQp(String line ,String date); | 146 | List<Map<String, Object>> scheduleDailyQp(String line ,String date); |
| 147 | + | ||
| 148 | + List<Map<String, Object>> scheduleDailyExport(Map<String, Object> map); | ||
| 147 | } | 149 | } |
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -1393,6 +1393,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1393,6 +1393,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1393 | double jhlc = 0, tempJhlc = 0, childMileage = 0; | 1393 | double jhlc = 0, tempJhlc = 0, childMileage = 0; |
| 1394 | float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f; | 1394 | float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f; |
| 1395 | //班次 | 1395 | //班次 |
| 1396 | + int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0; | ||
| 1396 | int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60; | 1397 | int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60; |
| 1397 | int jhbc = 0, jhbc_m = 0, jhbc_a = 0; | 1398 | int jhbc = 0, jhbc_m = 0, jhbc_a = 0; |
| 1398 | int sjbc = 0, sjbc_m = 0, sjbc_a = 0; | 1399 | int sjbc = 0, sjbc_m = 0, sjbc_a = 0; |
| @@ -1406,6 +1407,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1406,6 +1407,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1406 | ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f, | 1407 | ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f, |
| 1407 | ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f; | 1408 | ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f; |
| 1408 | //班次 | 1409 | //班次 |
| 1410 | + int ssbcZ = 0, ssbc_lzZ = 0, ssbc_dmZ = 0, ssbc_gzZ = 0, ssbc_jfZ = 0, ssbc_zsZ = 0, ssbc_qrZ = 0, ssbc_qcZ = 0, ssbc_kxZ = 0, ssbc_qhZ = 0, ssbc_ywZ = 0, ssbc_otherZ = 0; | ||
| 1409 | int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0; | 1411 | int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0; |
| 1410 | int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0; | 1412 | int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0; |
| 1411 | int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0; | 1413 | int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0; |
| @@ -1431,39 +1433,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1431,39 +1433,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1431 | if (scheduleRealInfo.getStatus() == -1) { | 1433 | if (scheduleRealInfo.getStatus() == -1) { |
| 1432 | ssgl += tempJhlc; | 1434 | ssgl += tempJhlc; |
| 1433 | ssglZ += tempJhlc; | 1435 | ssglZ += tempJhlc; |
| 1436 | + ssbc++; | ||
| 1437 | + ssbcZ++; | ||
| 1434 | if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) { | 1438 | if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) { |
| 1435 | ssgl_lz += tempJhlc; | 1439 | ssgl_lz += tempJhlc; |
| 1436 | ssgl_lzZ += tempJhlc; | 1440 | ssgl_lzZ += tempJhlc; |
| 1441 | + ssbc_lz++; | ||
| 1442 | + ssbc_lzZ++; | ||
| 1437 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) { | 1443 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) { |
| 1438 | ssgl_dm += tempJhlc; | 1444 | ssgl_dm += tempJhlc; |
| 1439 | ssgl_dmZ += tempJhlc; | 1445 | ssgl_dmZ += tempJhlc; |
| 1446 | + ssbc_dm++; | ||
| 1447 | + ssbc_dmZ++; | ||
| 1440 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) { | 1448 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) { |
| 1441 | ssgl_gz += tempJhlc; | 1449 | ssgl_gz += tempJhlc; |
| 1442 | ssgl_gzZ += tempJhlc; | 1450 | ssgl_gzZ += tempJhlc; |
| 1451 | + ssbc_gz++; | ||
| 1452 | + ssbc_gzZ++; | ||
| 1443 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) { | 1453 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) { |
| 1444 | ssgl_jf += tempJhlc; | 1454 | ssgl_jf += tempJhlc; |
| 1445 | ssgl_jfZ += tempJhlc; | 1455 | ssgl_jfZ += tempJhlc; |
| 1456 | + ssbc_jf++; | ||
| 1457 | + ssbc_jfZ++; | ||
| 1446 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) { | 1458 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) { |
| 1447 | ssgl_zs += tempJhlc; | 1459 | ssgl_zs += tempJhlc; |
| 1448 | ssgl_zsZ += tempJhlc; | 1460 | ssgl_zsZ += tempJhlc; |
| 1461 | + ssbc_zs++; | ||
| 1462 | + ssbc_zsZ++; | ||
| 1449 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) { | 1463 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) { |
| 1450 | ssgl_qr += tempJhlc; | 1464 | ssgl_qr += tempJhlc; |
| 1451 | ssgl_qrZ += tempJhlc; | 1465 | ssgl_qrZ += tempJhlc; |
| 1466 | + ssbc_qr++; | ||
| 1467 | + ssbc_qrZ++; | ||
| 1452 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) { | 1468 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) { |
| 1453 | ssgl_qc += tempJhlc; | 1469 | ssgl_qc += tempJhlc; |
| 1454 | ssgl_qcZ += tempJhlc; | 1470 | ssgl_qcZ += tempJhlc; |
| 1471 | + ssbc_qc++; | ||
| 1472 | + ssbc_qcZ++; | ||
| 1455 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) { | 1473 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) { |
| 1456 | ssgl_kx += tempJhlc; | 1474 | ssgl_kx += tempJhlc; |
| 1457 | ssgl_kxZ += tempJhlc; | 1475 | ssgl_kxZ += tempJhlc; |
| 1476 | + ssbc_kx++; | ||
| 1477 | + ssbc_kxZ++; | ||
| 1458 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) { | 1478 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) { |
| 1459 | ssgl_qh += tempJhlc; | 1479 | ssgl_qh += tempJhlc; |
| 1460 | ssgl_qhZ += tempJhlc; | 1480 | ssgl_qhZ += tempJhlc; |
| 1481 | + ssbc_qh++; | ||
| 1482 | + ssbc_qhZ++; | ||
| 1461 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) { | 1483 | } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) { |
| 1462 | ssgl_yw += tempJhlc; | 1484 | ssgl_yw += tempJhlc; |
| 1463 | ssgl_ywZ += tempJhlc; | 1485 | ssgl_ywZ += tempJhlc; |
| 1486 | + ssbc_yw++; | ||
| 1487 | + ssbc_ywZ++; | ||
| 1464 | } else { | 1488 | } else { |
| 1465 | ssgl_other += tempJhlc; | 1489 | ssgl_other += tempJhlc; |
| 1466 | ssgl_otherZ += tempJhlc; | 1490 | ssgl_otherZ += tempJhlc; |
| 1491 | + ssbc_other++; | ||
| 1492 | + ssbc_otherZ++; | ||
| 1467 | } | 1493 | } |
| 1468 | }else { | 1494 | }else { |
| 1469 | sjgl += tempJhlc; | 1495 | sjgl += tempJhlc; |
| @@ -1479,39 +1505,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1479,39 +1505,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1479 | if (childTaskPlan.isDestroy()) { | 1505 | if (childTaskPlan.isDestroy()) { |
| 1480 | ssgl += childMileage; | 1506 | ssgl += childMileage; |
| 1481 | ssglZ += childMileage; | 1507 | ssglZ += childMileage; |
| 1508 | + ssbc++; | ||
| 1509 | + ssbcZ++; | ||
| 1482 | if (childTaskPlan.getDestroyReason().equals("路阻")) { | 1510 | if (childTaskPlan.getDestroyReason().equals("路阻")) { |
| 1483 | ssgl_lz += childTaskPlan.getMileage(); | 1511 | ssgl_lz += childTaskPlan.getMileage(); |
| 1484 | ssgl_lzZ += childTaskPlan.getMileage(); | 1512 | ssgl_lzZ += childTaskPlan.getMileage(); |
| 1513 | + ssbc_lzZ++; | ||
| 1514 | + ssbc_lzZ++; | ||
| 1485 | } else if (childTaskPlan.getDestroyReason().equals("吊慢")) { | 1515 | } else if (childTaskPlan.getDestroyReason().equals("吊慢")) { |
| 1486 | ssgl_dm += childTaskPlan.getMileage(); | 1516 | ssgl_dm += childTaskPlan.getMileage(); |
| 1487 | ssgl_dmZ += childTaskPlan.getMileage(); | 1517 | ssgl_dmZ += childTaskPlan.getMileage(); |
| 1518 | + ssbc_dm++; | ||
| 1519 | + ssbc_dmZ++; | ||
| 1488 | } else if (childTaskPlan.getDestroyReason().equals("故障")) { | 1520 | } else if (childTaskPlan.getDestroyReason().equals("故障")) { |
| 1489 | ssgl_gz += childTaskPlan.getMileage(); | 1521 | ssgl_gz += childTaskPlan.getMileage(); |
| 1490 | ssgl_gzZ += childTaskPlan.getMileage(); | 1522 | ssgl_gzZ += childTaskPlan.getMileage(); |
| 1523 | + ssbc_gz++; | ||
| 1524 | + ssbc_gzZ++; | ||
| 1491 | } else if (childTaskPlan.getDestroyReason().equals("纠纷")) { | 1525 | } else if (childTaskPlan.getDestroyReason().equals("纠纷")) { |
| 1492 | ssgl_jf += childTaskPlan.getMileage(); | 1526 | ssgl_jf += childTaskPlan.getMileage(); |
| 1493 | ssgl_jfZ += childTaskPlan.getMileage(); | 1527 | ssgl_jfZ += childTaskPlan.getMileage(); |
| 1528 | + ssbc_jf++; | ||
| 1529 | + ssbc_jfZ++; | ||
| 1494 | } else if (childTaskPlan.getDestroyReason().equals("肇事")) { | 1530 | } else if (childTaskPlan.getDestroyReason().equals("肇事")) { |
| 1495 | ssgl_zs += childTaskPlan.getMileage(); | 1531 | ssgl_zs += childTaskPlan.getMileage(); |
| 1496 | ssgl_zsZ += childTaskPlan.getMileage(); | 1532 | ssgl_zsZ += childTaskPlan.getMileage(); |
| 1533 | + ssbc_zs++; | ||
| 1534 | + ssbc_zsZ++; | ||
| 1497 | } else if (childTaskPlan.getDestroyReason().equals("缺人")) { | 1535 | } else if (childTaskPlan.getDestroyReason().equals("缺人")) { |
| 1498 | ssgl_qr += childTaskPlan.getMileage(); | 1536 | ssgl_qr += childTaskPlan.getMileage(); |
| 1499 | ssgl_qrZ += childTaskPlan.getMileage(); | 1537 | ssgl_qrZ += childTaskPlan.getMileage(); |
| 1538 | + ssbc_qr++; | ||
| 1539 | + ssbc_qrZ++; | ||
| 1500 | } else if (childTaskPlan.getDestroyReason().equals("缺车")) { | 1540 | } else if (childTaskPlan.getDestroyReason().equals("缺车")) { |
| 1501 | ssgl_qc += childTaskPlan.getMileage(); | 1541 | ssgl_qc += childTaskPlan.getMileage(); |
| 1502 | ssgl_qcZ += childTaskPlan.getMileage(); | 1542 | ssgl_qcZ += childTaskPlan.getMileage(); |
| 1543 | + ssbc_qc++; | ||
| 1544 | + ssbc_qcZ++; | ||
| 1503 | } else if (childTaskPlan.getDestroyReason().equals("客稀")) { | 1545 | } else if (childTaskPlan.getDestroyReason().equals("客稀")) { |
| 1504 | ssgl_kx += childTaskPlan.getMileage(); | 1546 | ssgl_kx += childTaskPlan.getMileage(); |
| 1505 | ssgl_kxZ += childTaskPlan.getMileage(); | 1547 | ssgl_kxZ += childTaskPlan.getMileage(); |
| 1548 | + ssbc_kx++; | ||
| 1549 | + ssbc_kxZ++; | ||
| 1506 | } else if (childTaskPlan.getDestroyReason().equals("气候")) { | 1550 | } else if (childTaskPlan.getDestroyReason().equals("气候")) { |
| 1507 | ssgl_qh += childTaskPlan.getMileage(); | 1551 | ssgl_qh += childTaskPlan.getMileage(); |
| 1508 | ssgl_qhZ += childTaskPlan.getMileage(); | 1552 | ssgl_qhZ += childTaskPlan.getMileage(); |
| 1553 | + ssbc_qh++; | ||
| 1554 | + ssbc_qhZ++; | ||
| 1509 | } else if (childTaskPlan.getDestroyReason().equals("援外")) { | 1555 | } else if (childTaskPlan.getDestroyReason().equals("援外")) { |
| 1510 | ssgl_yw += childTaskPlan.getMileage(); | 1556 | ssgl_yw += childTaskPlan.getMileage(); |
| 1511 | ssgl_ywZ += childTaskPlan.getMileage(); | 1557 | ssgl_ywZ += childTaskPlan.getMileage(); |
| 1558 | + ssbc_yw++; | ||
| 1559 | + ssbc_ywZ++; | ||
| 1512 | } else { | 1560 | } else { |
| 1513 | ssgl_other += childTaskPlan.getMileage(); | 1561 | ssgl_other += childTaskPlan.getMileage(); |
| 1514 | ssgl_otherZ += childTaskPlan.getMileage(); | 1562 | ssgl_otherZ += childTaskPlan.getMileage(); |
| 1563 | + ssbc_other++; | ||
| 1564 | + ssbc_otherZ++; | ||
| 1515 | } | 1565 | } |
| 1516 | } else { | 1566 | } else { |
| 1517 | sjgl += childMileage; | 1567 | sjgl += childMileage; |
| @@ -1522,6 +1572,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1522,6 +1572,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1522 | 1572 | ||
| 1523 | //班次 | 1573 | //班次 |
| 1524 | jhbc++; | 1574 | jhbc++; |
| 1575 | + jhbcZ++; | ||
| 1525 | String[] fcsj = scheduleRealInfo.getFcsj().split(":"); | 1576 | String[] fcsj = scheduleRealInfo.getFcsj().split(":"); |
| 1526 | String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":"); | 1577 | String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":"); |
| 1527 | if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) { | 1578 | if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) { |
| @@ -1584,6 +1635,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1584,6 +1635,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1584 | map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh)); | 1635 | map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh)); |
| 1585 | map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw)); | 1636 | map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw)); |
| 1586 | map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other)); | 1637 | map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other)); |
| 1638 | + map.put("ssbc", ssbc); | ||
| 1639 | + map.put("ssbc_lz", ssbc_lz); | ||
| 1640 | + map.put("ssbc_dm", ssbc_dm); | ||
| 1641 | + map.put("ssbc_gz", ssbc_gz); | ||
| 1642 | + map.put("ssbc_jf", ssbc_jf); | ||
| 1643 | + map.put("ssbc_zs", ssbc_zs); | ||
| 1644 | + map.put("ssbc_qr", ssbc_qr); | ||
| 1645 | + map.put("ssbc_qc", ssbc_qc); | ||
| 1646 | + map.put("ssbc_kx", ssbc_kx); | ||
| 1647 | + map.put("ssbc_qh", ssbc_qh); | ||
| 1648 | + map.put("ssbc_yw", ssbc_yw); | ||
| 1649 | + map.put("ssbc_other", ssbc_other); | ||
| 1587 | map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl)); | 1650 | map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl)); |
| 1588 | map.put("jhbc", jhbc); | 1651 | map.put("jhbc", jhbc); |
| 1589 | map.put("jhbc_m", jhbc_m); | 1652 | map.put("jhbc_m", jhbc_m); |
| @@ -1634,6 +1697,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1634,6 +1697,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1634 | map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh)); | 1697 | map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh)); |
| 1635 | map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw)); | 1698 | map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw)); |
| 1636 | map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other)); | 1699 | map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other)); |
| 1700 | + map.put("ssbc", ssbc); | ||
| 1701 | + map.put("ssbc_lz", ssbc_lz); | ||
| 1702 | + map.put("ssbc_dm", ssbc_dm); | ||
| 1703 | + map.put("ssbc_gz", ssbc_gz); | ||
| 1704 | + map.put("ssbc_jf", ssbc_jf); | ||
| 1705 | + map.put("ssbc_zs", ssbc_zs); | ||
| 1706 | + map.put("ssbc_qr", ssbc_qr); | ||
| 1707 | + map.put("ssbc_qc", ssbc_qc); | ||
| 1708 | + map.put("ssbc_kx", ssbc_kx); | ||
| 1709 | + map.put("ssbc_qh", ssbc_qh); | ||
| 1710 | + map.put("ssbc_yw", ssbc_yw); | ||
| 1711 | + map.put("ssbc_other", ssbc_other); | ||
| 1637 | map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl)); | 1712 | map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl)); |
| 1638 | map.put("jhbc", jhbc); | 1713 | map.put("jhbc", jhbc); |
| 1639 | map.put("jhbc_m", jhbc_m); | 1714 | map.put("jhbc_m", jhbc_m); |
| @@ -1685,6 +1760,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1685,6 +1760,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1685 | map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ)); | 1760 | map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ)); |
| 1686 | map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ)); | 1761 | map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ)); |
| 1687 | map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ)); | 1762 | map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ)); |
| 1763 | + map.put("ssbc", ssbcZ); | ||
| 1764 | + map.put("ssbc_lz", ssbc_lzZ); | ||
| 1765 | + map.put("ssbc_dm", ssbc_lzZ); | ||
| 1766 | + map.put("ssbc_gz", ssbc_gzZ); | ||
| 1767 | + map.put("ssbc_jf", ssbc_jfZ); | ||
| 1768 | + map.put("ssbc_zs", ssbc_zsZ); | ||
| 1769 | + map.put("ssbc_qr", ssbc_qrZ); | ||
| 1770 | + map.put("ssbc_qc", ssbc_qcZ); | ||
| 1771 | + map.put("ssbc_kx", ssbc_qcZ); | ||
| 1772 | + map.put("ssbc_qh", ssbc_qhZ); | ||
| 1773 | + map.put("ssbc_yw", ssbc_ywZ); | ||
| 1774 | + map.put("ssbc_other", ssbc_otherZ); | ||
| 1688 | map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ)); | 1775 | map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ)); |
| 1689 | map.put("jhbc", jhbcZ); | 1776 | map.put("jhbc", jhbcZ); |
| 1690 | map.put("jhbc_m", jhbc_mZ); | 1777 | map.put("jhbc_m", jhbc_mZ); |
| @@ -2646,13 +2733,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -2646,13 +2733,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 2646 | } | 2733 | } |
| 2647 | map.put("jhlc", format.format(jhlc+jcclc)); | 2734 | map.put("jhlc", format.format(jhlc+jcclc)); |
| 2648 | map.put("yygljh", format.format(jhlc)); | 2735 | map.put("yygljh", format.format(jhlc)); |
| 2649 | - map.put("ssgl", format.format(remgl)); | 2736 | + map.put("ssgl", format.format(remMileage)); |
| 2650 | map.put("ksgl", format.format(ksgl)); | 2737 | map.put("ksgl", format.format(ksgl)); |
| 2651 | map.put("yyglsj", format.format(yygl)); | 2738 | map.put("yyglsj", format.format(yygl)); |
| 2652 | map.put("jhbc", jhbc); | 2739 | map.put("jhbc", jhbc); |
| 2653 | map.put("jcclc", jcclc); | 2740 | map.put("jcclc", jcclc); |
| 2654 | 2741 | ||
| 2655 | - map.put("ljgl", format.format(addgl)); | 2742 | + map.put("ljgl", format.format(addMileage)); |
| 2656 | map.put("ssbc", cjbc); | 2743 | map.put("ssbc", cjbc); |
| 2657 | map.put("ysgl", format.format(yygl)); | 2744 | map.put("ysgl", format.format(yygl)); |
| 2658 | map.put("sjbc", jhbc-cjbc+ljbc); | 2745 | map.put("sjbc", jhbc-cjbc+ljbc); |
| @@ -2913,4 +3000,129 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -2913,4 +3000,129 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 2913 | return list; | 3000 | return list; |
| 2914 | } | 3001 | } |
| 2915 | 3002 | ||
| 3003 | + | ||
| 3004 | + @Override | ||
| 3005 | + public List<Map<String, Object>> scheduleDailyExport(Map<String, Object> map){ | ||
| 3006 | + String line = map.get("line").toString(); | ||
| 3007 | + String date = map.get("date").toString(); | ||
| 3008 | + String xlName = map.get("xlName").toString(); | ||
| 3009 | + String state = map.get("state").toString(); | ||
| 3010 | + String type = map.get("type").toString(); | ||
| 3011 | + | ||
| 3012 | + List<Map<String, Object>> dataList2 = new ArrayList<Map<String, Object>>(); | ||
| 3013 | + List<Map<String, Object>> dataList3 = new ArrayList<Map<String, Object>>(); | ||
| 3014 | + List<Map<String, Object>> list1 = this.statisticsDaily(line, date, xlName, null); | ||
| 3015 | + List<ScheduleRealInfo> list2 = this.queryUserInfo(line, date, state); | ||
| 3016 | + List<ScheduleRealInfo> list3 = this.realScheduleList(line, date); | ||
| 3017 | + | ||
| 3018 | + for(Map<String, Object> m : list1){ | ||
| 3019 | +// m.put("ssgl", m.get("ssgl")); | ||
| 3020 | +// m.put("ssbc", m.get("ssbc")); | ||
| 3021 | +// m.put("ssgl_lz", m.get("ssgl_lz") + " / " + m.get("ssbc_lz")); | ||
| 3022 | +// m.put("ssgl_dm", m.get("ssgl_dm") + " / " + m.get("ssbc_dm")); | ||
| 3023 | +// m.put("ssgl_gz", m.get("ssgl_gz") + " / " + m.get("ssbc_gz")); | ||
| 3024 | +// m.put("ssgl_jf", m.get("ssgl_jf") + " / " + m.get("ssbc_jf")); | ||
| 3025 | +// m.put("ssgl_zs", m.get("ssgl_zs") + " / " + m.get("ssbc_zs")); | ||
| 3026 | +// m.put("ssgl_qr", m.get("ssgl_qr") + " / " + m.get("ssbc_qr")); | ||
| 3027 | +// m.put("ssgl_qc", m.get("ssgl_qc") + " / " + m.get("ssbc_qc")); | ||
| 3028 | +// m.put("ssgl_kx", m.get("ssgl_kx") + " / " + m.get("ssbc_kx")); | ||
| 3029 | +// m.put("ssgl_qh", m.get("ssgl_qh") + " / " + m.get("ssbc_qh")); | ||
| 3030 | +// m.put("ssgl_yw", m.get("ssgl_yw") + " / " + m.get("ssbc_yw")); | ||
| 3031 | +// m.put("ssgl_other", m.get("ssgl_other") + " / " + m.get("ssbc_other")); | ||
| 3032 | + } | ||
| 3033 | + | ||
| 3034 | + int size = 0; | ||
| 3035 | + Map<String, Object> tempMap = new HashMap<String, Object>(); | ||
| 3036 | + for(int i = 0; i < list2.size(); i++){ | ||
| 3037 | + Object obj = (Object)list2.get(i); | ||
| 3038 | + Object[] objs = (Object[])obj; | ||
| 3039 | + if(size == 5){ | ||
| 3040 | + size = 0; | ||
| 3041 | + dataList2.add(tempMap); | ||
| 3042 | + tempMap = new HashMap<String, Object>(); | ||
| 3043 | + } | ||
| 3044 | + tempMap.put("lp" + size, objs[3]); | ||
| 3045 | + tempMap.put("ch" + size, objs[2]); | ||
| 3046 | + tempMap.put("jz" + size, objs[1] + "/" + objs[4]); | ||
| 3047 | + tempMap.put("sz" + size, ""); | ||
| 3048 | + tempMap.put("jw" + size, ""); | ||
| 3049 | + tempMap.put("sw" + size, ""); | ||
| 3050 | + | ||
| 3051 | + size++; | ||
| 3052 | + } | ||
| 3053 | + if(size < 5){ | ||
| 3054 | + for(;size < 5; size++){ | ||
| 3055 | + tempMap.put("lp" + size, ""); | ||
| 3056 | + tempMap.put("ch" + size, ""); | ||
| 3057 | + tempMap.put("jz" + size, ""); | ||
| 3058 | + tempMap.put("sz" + size, ""); | ||
| 3059 | + tempMap.put("jw" + size, ""); | ||
| 3060 | + tempMap.put("sw" + size, ""); | ||
| 3061 | + } | ||
| 3062 | + } | ||
| 3063 | + | ||
| 3064 | + dataList2.add(tempMap); | ||
| 3065 | + | ||
| 3066 | + size = 0; | ||
| 3067 | + tempMap = new HashMap<String, Object>(); | ||
| 3068 | + for(ScheduleRealInfo schedule : list3){ | ||
| 3069 | + if(size == 3){ | ||
| 3070 | + size = 0; | ||
| 3071 | + dataList3.add(tempMap); | ||
| 3072 | + tempMap = new HashMap<String, Object>(); | ||
| 3073 | + } | ||
| 3074 | + tempMap.put("lpName" + size, schedule.getLpName()); | ||
| 3075 | + tempMap.put("qdzName" + size, schedule.getQdzName()); | ||
| 3076 | + tempMap.put("zdsj" + size, schedule.getZdsj()); | ||
| 3077 | + tempMap.put("zdsjActual" + size, schedule.getZdsjActual()!=null?schedule.getZdsjActual():""); | ||
| 3078 | + tempMap.put("zdsjk" + size, ""); | ||
| 3079 | + tempMap.put("zdsjm" + size, ""); | ||
| 3080 | + tempMap.put("fcsj" + size, schedule.getFcsj()); | ||
| 3081 | + tempMap.put("fcsjActual" + size, schedule.getFcsjActual()!=null?schedule.getFcsjActual():""); | ||
| 3082 | + tempMap.put("fcsjk" + size, ""); | ||
| 3083 | + tempMap.put("fcsjm" + size, ""); | ||
| 3084 | + tempMap.put("remarks" + size, schedule.getRemarks()!=null?schedule.getRemarks():""); | ||
| 3085 | + | ||
| 3086 | + size++; | ||
| 3087 | + } | ||
| 3088 | + if(size < 3){ | ||
| 3089 | + for(; size < 3; size++){ | ||
| 3090 | + tempMap.put("lpName" + size, ""); | ||
| 3091 | + tempMap.put("qdzName" + size, ""); | ||
| 3092 | + tempMap.put("zdsj" + size, ""); | ||
| 3093 | + tempMap.put("zdsjActual" + size, ""); | ||
| 3094 | + tempMap.put("zdsjk" + size, ""); | ||
| 3095 | + tempMap.put("zdsjm" + size, ""); | ||
| 3096 | + tempMap.put("fcsj" + size, ""); | ||
| 3097 | + tempMap.put("fcsjActual" + size, ""); | ||
| 3098 | + tempMap.put("fcsjk" + size, ""); | ||
| 3099 | + tempMap.put("fcsjm" + size, ""); | ||
| 3100 | + tempMap.put("remarks" + size, ""); | ||
| 3101 | + } | ||
| 3102 | + } | ||
| 3103 | + | ||
| 3104 | + dataList3.add(tempMap); | ||
| 3105 | + | ||
| 3106 | + if (type.equals("export")) { | ||
| 3107 | + SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), | ||
| 3108 | + sdfSimple = new SimpleDateFormat("yyyyMMdd"); | ||
| 3109 | + Map<String, Object> m = new HashMap<String, Object>(); | ||
| 3110 | + List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); | ||
| 3111 | + ReportUtils ee = new ReportUtils(); | ||
| 3112 | + try { | ||
| 3113 | + listI.add(list1.iterator()); | ||
| 3114 | + listI.add(dataList2.iterator()); | ||
| 3115 | + listI.add(dataList3.iterator()); | ||
| 3116 | + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | ||
| 3117 | + ee.excelReplace(listI, new Object[] { m }, path+"mould/scheduleDaily.xls", | ||
| 3118 | + path+"export/调度日报" + sdfSimple.format(sdfMonth.parse(date))+".xls"); | ||
| 3119 | + } catch (Exception e) { | ||
| 3120 | + // TODO: handle exception | ||
| 3121 | + e.printStackTrace(); | ||
| 3122 | + } | ||
| 3123 | + } | ||
| 3124 | + | ||
| 3125 | + return new ArrayList<Map<String, Object>>(); | ||
| 3126 | + } | ||
| 3127 | + | ||
| 2916 | } | 3128 | } |
| 2917 | \ No newline at end of file | 3129 | \ No newline at end of file |