Commit ac4d1dc4ca8d3792b77be6f3abfbfc03786dbf9b

Authored by 王通
1 parent bd5fc756

1.电科所司售配档、车辆配档加入线路代码

src/main/java/com/bsth/server_rs/dks/DksRestService.java
@@ -96,6 +96,7 @@ public class DksRestService { @@ -96,6 +96,7 @@ public class DksRestService {
96 if (i == 0) { 96 if (i == 0) {
97 oldLineCode = config.getLineCode(); 97 oldLineCode = config.getLineCode();
98 vo = new LineServiceConfigVo(); 98 vo = new LineServiceConfigVo();
  99 + vo.setLineCode(config.getLineCode());
99 vo.setLineName(config.getLineName()); 100 vo.setLineName(config.getLineName());
100 vo.setMonth(month); 101 vo.setMonth(month);
101 vo.setConductorFirstCount(config.getConductorCount()); 102 vo.setConductorFirstCount(config.getConductorCount());
@@ -107,6 +108,7 @@ public class DksRestService { @@ -107,6 +108,7 @@ public class DksRestService {
107 oldLineCode = config.getLineCode(); 108 oldLineCode = config.getLineCode();
108 result.add(vo); 109 result.add(vo);
109 vo = new LineServiceConfigVo(); 110 vo = new LineServiceConfigVo();
  111 + vo.setLineCode(config.getLineCode());
110 vo.setLineName(config.getLineName()); 112 vo.setLineName(config.getLineName());
111 vo.setMonth(month); 113 vo.setMonth(month);
112 vo.setConductorFirstCount(config.getConductorCount()); 114 vo.setConductorFirstCount(config.getConductorCount());
@@ -598,6 +600,8 @@ public class DksRestService { @@ -598,6 +600,8 @@ public class DksRestService {
598 */ 600 */
599 private final static class LineServiceConfigVo { 601 private final static class LineServiceConfigVo {
600 602
  603 + private String lineCode;
  604 +
601 private String lineName; 605 private String lineName;
602 606
603 private String month; 607 private String month;
@@ -610,6 +614,14 @@ public class DksRestService { @@ -610,6 +614,14 @@ public class DksRestService {
610 614
611 private Integer conductorLastCount; 615 private Integer conductorLastCount;
612 616
  617 + public String getLineCode() {
  618 + return lineCode;
  619 + }
  620 +
  621 + public void setLineCode(String lineCode) {
  622 + this.lineCode = lineCode;
  623 + }
  624 +
613 public String getLineName() { 625 public String getLineName() {
614 return lineName; 626 return lineName;
615 } 627 }