Commit e42204fcedb80df024e503b46033bbf8d2328404

Authored by 娄高锋
1 parent 671c7bd6

烂班情况分析报表

src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -79,6 +79,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -79,6 +79,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
79 @Override 79 @Override
80 public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException { 80 public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
81 ScheduleRealInfo schedule = new ScheduleRealInfo(); 81 ScheduleRealInfo schedule = new ScheduleRealInfo();
  82 + schedule.setId(rs.getLong("id"));
82 schedule.setScheduleDateStr(rs.getString("schedule_date_Str")); 83 schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
83 schedule.setRealExecDate(rs.getString("real_exec_date")); 84 schedule.setRealExecDate(rs.getString("real_exec_date"));
84 schedule.setXlBm(rs.getString("xl_bm")); 85 schedule.setXlBm(rs.getString("xl_bm"));
@@ -98,6 +99,8 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -98,6 +99,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
98 schedule.setZdzName(rs.getString("zdz_name")); 99 schedule.setZdzName(rs.getString("zdz_name"));
99 schedule.setXlDir(rs.getString("xl_dir")); 100 schedule.setXlDir(rs.getString("xl_dir"));
100 schedule.setStatus(rs.getInt("status")); 101 schedule.setStatus(rs.getInt("status"));
  102 + schedule.setAdjustExps(rs.getString("adjust_exps"));
  103 + schedule.setJhlcOrig(rs.getDouble("jhlc_orig"));
101 schedule.setRemarks(rs.getString("remarks")); 104 schedule.setRemarks(rs.getString("remarks"));
102 schedule.setGsName(rs.getString("gs_name")); 105 schedule.setGsName(rs.getString("gs_name"));
103 schedule.setFgsName(rs.getString("fgs_name")); 106 schedule.setFgsName(rs.getString("fgs_name"));
@@ -1557,47 +1560,52 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1557,47 +1560,52 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1557 companyName = schedule.getGsName(); 1560 companyName = schedule.getGsName();
1558 if(schedule.getFgsName() != null && subCompanyName.length() == 0) 1561 if(schedule.getFgsName() != null && subCompanyName.length() == 0)
1559 subCompanyName = schedule.getFgsName(); 1562 subCompanyName = schedule.getFgsName();
  1563 + double lc = 0d;
  1564 + if(schedule.getJhlcOrig() != null && schedule.getJhlcOrig() > 0.1d){
  1565 + lc = schedule.getJhlcOrig();
  1566 + } else {
  1567 + lc = schedule.getJhlc();
  1568 + }
  1569 +
1560 jhbc++; 1570 jhbc++;
1561 - if(schedule.getJhlc() != null)  
1562 - jhlc += schedule.getJhlc(); 1571 + jhlc += lc;
1563 if(schedule.getStatus() == 2){ 1572 if(schedule.getStatus() == 2){
1564 sjbc++; 1573 sjbc++;
1565 - if(schedule.getJhlc() != null)  
1566 - sjlc += schedule.getJhlc(); 1574 + sjlc += lc;
1567 } else if(schedule.getStatus() == -1){ 1575 } else if(schedule.getStatus() == -1){
1568 - if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("路阻") != -1){ 1576 + if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){
1569 lzbc++; 1577 lzbc++;
1570 - lzlc += schedule.getJhlc();  
1571 - }else if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("吊慢") != -1){ 1578 + lzlc += lc;
  1579 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("吊慢") != -1){
1572 dmbc++; 1580 dmbc++;
1573 - dmlc += schedule.getJhlc();  
1574 - }else if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("故障") != -1){ 1581 + dmlc += lc;
  1582 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("故障") != -1){
1575 gzbc++; 1583 gzbc++;
1576 - gzlc += schedule.getJhlc();  
1577 - }else if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("纠纷") != -1){ 1584 + gzlc += lc;
  1585 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("纠纷") != -1){
1578 jfbc++; 1586 jfbc++;
1579 - jflc += schedule.getJhlc();  
1580 - }else if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("肇事") != -1){ 1587 + jflc += lc;
  1588 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("肇事") != -1){
1581 zsbc++; 1589 zsbc++;
1582 - zslc += schedule.getJhlc();  
1583 - }else if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("缺人") != -1){ 1590 + zslc += lc;
  1591 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺人") != -1){
1584 qrbc++; 1592 qrbc++;
1585 - qrlc += schedule.getJhlc();  
1586 - }else if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("缺车") != -1){ 1593 + qrlc += lc;
  1594 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺车") != -1){
1587 qcbc++; 1595 qcbc++;
1588 - qclc += schedule.getJhlc();  
1589 - }else if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("客稀") != -1){ 1596 + qclc += lc;
  1597 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("客稀") != -1){
1590 kxbc++; 1598 kxbc++;
1591 - kxlc += schedule.getJhlc();  
1592 - }else if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("气候") != -1){ 1599 + kxlc += lc;
  1600 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("气候") != -1){
1593 qhbc++; 1601 qhbc++;
1594 - qhlc += schedule.getJhlc();  
1595 - }else if(schedule.getRemarks() != null && schedule.getRemarks().indexOf("外援") != -1){ 1602 + qhlc += lc;
  1603 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("外援") != -1){
1596 wybc++; 1604 wybc++;
1597 - wylc += schedule.getJhlc(); 1605 + wylc += lc;
1598 } else { 1606 } else {
1599 qtbc++; 1607 qtbc++;
1600 - qtlc += schedule.getJhlc(); 1608 + qtlc += lc;
1601 } 1609 }
1602 } 1610 }
1603 } 1611 }