youxiw2000 / bsthLineProfiles · Commits

Commit 4be34257bd68f9de654318a0bc6033e267340507

Authored by yiming
1 parent 9751ebd7
build: skipped

bf

Inline Side-by-side
Showing 9 changed files with 1676 additions and 89 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
  View file @4be3425
@@ -158,13 +158,14 @@ public class BsthTLineHistoryController extends BaseController @@ -158,13 +158,14 @@ public class BsthTLineHistoryController extends BaseController
158 158
159 159
160 160
161 - 161 + /*
162 @RequiresPermissions("system:lineHistory:export") 162 @RequiresPermissions("system:lineHistory:export")
163 @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) 163 @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
164 @PostMapping("/export") 164 @PostMapping("/export")
165 @ResponseBody 165 @ResponseBody
166 public AjaxResult export(BsthTLine bsthTLine) 166 public AjaxResult export(BsthTLine bsthTLine)
167 { 167 {
  168 + bsthTLine.setExamineStatus("-1");
168 List<BsthTLine> list = bsthTLineService.selectBsthTLineHistoryList(bsthTLine); 169 List<BsthTLine> list = bsthTLineService.selectBsthTLineHistoryList(bsthTLine);
169 170
170 List<DictData> dicts = dictDataService.selectDictDataList(null); 171 List<DictData> dicts = dictDataService.selectDictDataList(null);
@@ -242,19 +243,19 @@ public class BsthTLineHistoryController extends BaseController @@ -242,19 +243,19 @@ public class BsthTLineHistoryController extends BaseController
242 ExcelUtil<BsthTLine> util = new ExcelUtil<BsthTLine>(BsthTLine.class); 243 ExcelUtil<BsthTLine> util = new ExcelUtil<BsthTLine>(BsthTLine.class);
243 return util.exportExcel(list, "line"); 244 return util.exportExcel(list, "line");
244 } 245 }
245 -  
246 - /** 246 +*/
  247 + /* *//**
247 * 新增【请填写功能名称】 248 * 新增【请填写功能名称】
248 - */ 249 + *//*
249 @GetMapping("/add") 250 @GetMapping("/add")
250 public String add() 251 public String add()
251 { 252 {
252 return prefix + "/add"; 253 return prefix + "/add";
253 } 254 }
254 255
255 - /** 256 + *//**
256 * 新增保存【请填写功能名称】 257 * 新增保存【请填写功能名称】
257 - */ 258 + *//*
258 @RequiresPermissions("system:lineHistory:add") 259 @RequiresPermissions("system:lineHistory:add")
259 @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) 260 @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
260 @PostMapping("/add") 261 @PostMapping("/add")
@@ -282,7 +283,7 @@ public class BsthTLineHistoryController extends BaseController @@ -282,7 +283,7 @@ public class BsthTLineHistoryController extends BaseController
282 public AjaxResult updateToLineInfo(String rows) { 283 public AjaxResult updateToLineInfo(String rows) {
283 return toAjax(bsthTLineService.updateToLineInfo(rows)); 284 return toAjax(bsthTLineService.updateToLineInfo(rows));
284 } 285 }
285 - 286 +*/
286 287
287 288
288 } 289 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryReportController.java
  View file @4be3425
1 package com.ruoyi.project.system.line.controller; 1 package com.ruoyi.project.system.line.controller;
2 2
  3 +import java.lang.reflect.Constructor;
3 import java.lang.reflect.Field; 4 import java.lang.reflect.Field;
4 import java.lang.reflect.Method; 5 import java.lang.reflect.Method;
5 import java.text.SimpleDateFormat; 6 import java.text.SimpleDateFormat;
@@ -10,6 +11,7 @@ import java.util.List; @@ -10,6 +11,7 @@ import java.util.List;
10 import java.util.Map; 11 import java.util.Map;
11 12
12 import com.ruoyi.common.utils.poi.ExcelUtil; 13 import com.ruoyi.common.utils.poi.ExcelUtil;
  14 +import com.ruoyi.project.system.line.domain.LineHistoryReport;
13 import org.apache.shiro.authz.annotation.RequiresPermissions; 15 import org.apache.shiro.authz.annotation.RequiresPermissions;
14 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
15 import org.springframework.stereotype.Controller; 17 import org.springframework.stereotype.Controller;
@@ -65,10 +67,11 @@ public class BsthTLineHistoryReportController extends BaseController @@ -65,10 +67,11 @@ public class BsthTLineHistoryReportController extends BaseController
65 @RequiresPermissions("system:HistoryReport:list") 67 @RequiresPermissions("system:HistoryReport:list")
66 @PostMapping("/list") 68 @PostMapping("/list")
67 @ResponseBody 69 @ResponseBody
68 - public TableDataInfo list(LineEditReport lineEditReport) 70 + public TableDataInfo list(BsthTLine bsthTLine)
69 { 71 {
70 startPage(); 72 startPage();
71 - List<LineEditReport> list = bsthTLineService.selectLineEditReportList(lineEditReport); 73 + bsthTLine.setHistoryId(1L);
  74 + List<BsthTLine> list = bsthTLineService.selectBsthTLineHistoryList(bsthTLine);
72 return getDataTable(list); 75 return getDataTable(list);
73 } 76 }
74 77
@@ -77,62 +80,92 @@ public class BsthTLineHistoryReportController extends BaseController @@ -77,62 +80,92 @@ public class BsthTLineHistoryReportController extends BaseController
77 @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) 80 @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
78 @PostMapping("/export") 81 @PostMapping("/export")
79 @ResponseBody 82 @ResponseBody
80 - public AjaxResult export(LineEditReport lineEditReport) throws NoSuchFieldException { 83 + public AjaxResult export(BsthTLine bsthTLine) throws NoSuchFieldException {
81 84
  85 + //查询变更记录
  86 + List<LineHistoryReport> list =bsthTLineService.getLineHistoryReport(bsthTLine);
82 87
83 - List<LineEditReport> list = bsthTLineService.selectLineEditReportList(lineEditReport);  
84 88
85 List<DictData> dicts = dictDataService.selectDictDataList(null); 89 List<DictData> dicts = dictDataService.selectDictDataList(null);
86 -  
87 Map<String,List<DictData>> dictMap = new HashMap(); 90 Map<String,List<DictData>> dictMap = new HashMap();
88 -  
89 List<String> titles=new ArrayList<>(); 91 List<String> titles=new ArrayList<>();
90 -  
91 for(DictData d : dicts) { 92 for(DictData d : dicts) {
92 -  
93 if(dictMap.get(d.getDictType()) == null) { 93 if(dictMap.get(d.getDictType()) == null) {
94 dictMap.put(d.getDictType(), new ArrayList<DictData>()); 94 dictMap.put(d.getDictType(), new ArrayList<DictData>());
95 } 95 }
96 -  
97 dictMap.get(d.getDictType()).add(d); 96 dictMap.get(d.getDictType()).add(d);
98 } 97 }
99 98
100 try { 99 try {
101 - for(LineEditReport line:list) {  
102 - 100 + for(LineHistoryReport line:list) {
103 Field[] field = line.getClass().getDeclaredFields(); 101 Field[] field = line.getClass().getDeclaredFields();
104 -  
105 for(int j=0 ; j<field.length ; j++){ //遍历所有属性 102 for(int j=0 ; j<field.length ; j++){ //遍历所有属性
106 -  
107 -  
108 String name = field[j].getName(); //获取属性的名字 103 String name = field[j].getName(); //获取属性的名字
109 -  
110 -  
111 -  
112 - String type = name;  
113 - name = name.substring(0,1).toUpperCase() + name.substring(1);  
114 -  
115 - if(dictMap.get(type) != null) {  
116 - Method param = line.getClass().getMethod("get"+name);  
117 - String value = (String) param.invoke(line);  
118 - if(value != null && value.split(",").length > 0) {  
119 - String result = "";  
120 - for(String str:value.split(",")) {  
121 - for(DictData d:dictMap.get(type)) {  
122 - if(d.getDictValue().equals(str)) {  
123 - result += d.getDictLabel() + ","; 104 + if(name.length()>3&&!"Old".equals(name.substring(name.length()-3))&&!"lineName".equals(name)){
  105 + //获取变更前后的值
  106 + Field f = line.getClass().getDeclaredField(name);
  107 + Field f2 = line.getClass().getDeclaredField(name+"Old");
  108 + f.setAccessible(true);
  109 + f2.setAccessible(true);
  110 + f.get(line);
  111 + String v =f.get(line)==null?"":f.get(line).toString();
  112 + String vo=f2.get(line)==null?"":f2.get(line).toString();
  113 + //如果没变置空
  114 + if(v.equals(vo)){
  115 + f.set(line, null);
  116 + f2.set(line, null);
  117 + }
  118 + v =f.get(line)==null?"":f.get(line).toString();
  119 + vo=f2.get(line)==null?"":f2.get(line).toString();
  120 + //编码转换
  121 + if(dictMap.get(name) != null) {
  122 + if(v != null && v.split(",").length > 0) {
  123 + String result = "";
  124 + for(String str:v.split(",")) {
  125 + for(DictData d:dictMap.get(name)) {
  126 + if(d.getDictValue().equals(str)) {
  127 + result += d.getDictLabel() + ",";
  128 + }
124 } 129 }
125 } 130 }
  131 + if(!result.isEmpty()) {
  132 + f.set(line, result.substring(0,result.length()-1));
  133 + }else {
  134 + f.set(line, v);
  135 + }
126 } 136 }
127 - Method m = line.getClass().getMethod("set"+name, new Class[] {String.class});  
128 -  
129 - if(!result.isEmpty()) {  
130 - m.invoke(line,new Object[] {new String(result.substring(0,result.length()-1))});  
131 - }else {  
132 - m.invoke(line,new Object[] {new String(value)}); 137 + if(vo != null && vo.split(",").length > 0) {
  138 + String result = "";
  139 + for(String str:vo.split(",")) {
  140 + for(DictData d:dictMap.get(name)) {
  141 + if(d.getDictValue().equals(str)) {
  142 + result += d.getDictLabel() + ",";
  143 + }
  144 + }
  145 + }
  146 + if(!result.isEmpty()) {
  147 + f2.set(line, result.substring(0,result.length()-1));
  148 + }else {
  149 + f2.set(line, vo);
  150 + }
  151 + }
  152 + }
  153 + if("inoutDistrict".equals(name)||"isWarrant".equals(name)||"isMetro".equals(name)||"hasTimelists".equals(name)){
  154 + if(!"".equals(v)){
  155 + for(DictData d:dictMap.get("trueFalse")) {
  156 + if(d.getDictValue().equals(v)) {
  157 + f.set(line, d.getDictLabel());
  158 + }
  159 + }
  160 + }
  161 + if(!"".equals(vo)){
  162 + for(DictData d:dictMap.get("trueFalse")) {
  163 + if(d.getDictValue().equals(vo)) {
  164 + f2.set(line, d.getDictLabel());
  165 + }
  166 + }
133 } 167 }
134 } 168 }
135 -  
136 } 169 }
137 } 170 }
138 } 171 }
@@ -142,9 +175,19 @@ public class BsthTLineHistoryReportController extends BaseController @@ -142,9 +175,19 @@ public class BsthTLineHistoryReportController extends BaseController
142 } 175 }
143 176
144 177
145 - ExcelUtil<LineEditReport> util = new ExcelUtil<LineEditReport>(LineEditReport.class); 178 + ExcelUtil<LineHistoryReport> util = new ExcelUtil<LineHistoryReport>(LineHistoryReport.class);
146 util.setTitles(titles); 179 util.setTitles(titles);
147 return util.exportExcel(list, "line"); 180 return util.exportExcel(list, "line");
148 } 181 }
149 182
  183 + public static Object getObjectField(Field field,String valueStr) throws Exception{
  184 + Class typeClass = field.getType();
  185 + Constructor con = typeClass.getConstructor(valueStr.getClass());
  186 + Object obj = con.newInstance(valueStr);
  187 + return obj;
  188 + }
  189 +
  190 + public static void main(String[] args) {
  191 +
  192 + }
150 } 193 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @4be3425
@@ -47,7 +47,7 @@ public class BsthTLine extends BaseEntity @@ -47,7 +47,7 @@ public class BsthTLine extends BaseEntity
47 private String lineLevel; 47 private String lineLevel;
48 48
49 /** 线路属性 */ 49 /** 线路属性 */
50 - @Excel(name = "线路属性") 50 + @Excel(name = "线路类型")
51 private String lineType; 51 private String lineType;
52 52
53 /** 区属 */ 53 /** 区属 */
@@ -346,6 +346,7 @@ public class BsthTLine extends BaseEntity @@ -346,6 +346,7 @@ public class BsthTLine extends BaseEntity
346 346
347 private String createTimeEnd; 347 private String createTimeEnd;
348 348
  349 + private Long historyId;
349 public void setId(Long id) 350 public void setId(Long id)
350 { 351 {
351 this.id = id; 352 this.id = id;
@@ -1157,6 +1158,14 @@ public class BsthTLine extends BaseEntity @@ -1157,6 +1158,14 @@ public class BsthTLine extends BaseEntity
1157 this.createTimeEnd = createTimeEnd; 1158 this.createTimeEnd = createTimeEnd;
1158 } 1159 }
1159 1160
  1161 + public Long getHistoryId() {
  1162 + return historyId;
  1163 + }
  1164 +
  1165 + public void setHistoryId(Long historyId) {
  1166 + this.historyId = historyId;
  1167 + }
  1168 +
1160 @Override 1169 @Override
1161 public String toString() { 1170 public String toString() {
1162 return "BsthTLine{" + 1171 return "BsthTLine{" +
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java 0 → 100644
  View file @4be3425
  1 +package com.ruoyi.project.system.line.domain;
  2 +
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.ruoyi.framework.aspectj.lang.annotation.Excel;
  5 +import com.ruoyi.framework.web.domain.BaseEntity;
  6 +
  7 +import java.util.Date;
  8 +
  9 +/**
  10 + * 【请填写功能名称】对象 bsth_t_line
  11 + *
  12 + * @author ruoyi
  13 + * @date 2021-08-17
  14 + */
  15 +public class LineHistoryReport extends BaseEntity
  16 +{
  17 +
  18 + private Long id;
  19 + private Long idOld;
  20 +
  21 +
  22 + @Excel(name = "线路名称")
  23 + private String lineName;
  24 +
  25 + @Excel(name = "公司")
  26 + private String company;
  27 + @Excel(name = "原公司")
  28 + private String companyOld;
  29 +
  30 +
  31 + @Excel(name = "分公司")
  32 + private String fCompany;
  33 + @Excel(name = "原分公司")
  34 + private String fCompanyOld;
  35 +
  36 + @Excel(name = "主线路id")
  37 + private Long pLineId;
  38 + @Excel(name = "原主线路id")
  39 + private Long pLineIdOld;
  40 +
  41 + /** 营运方式 全程/区间/大站/定班/跨线/B线 */
  42 + @Excel(name = "营运方式")
  43 + private String serviceType;
  44 + @Excel(name = "原营运方式")
  45 + private String serviceTypeOld;
  46 +
  47 + @Excel(name = "线路属性")
  48 + private String lineLevel;
  49 + @Excel(name = "原线路属性")
  50 + private String lineLevelOld;
  51 +
  52 + @Excel(name = "线路类型")
  53 + private String lineType;
  54 + @Excel(name = "原线路类型")
  55 + private String lineTypeOld;
  56 +
  57 + @Excel(name = "区属")
  58 + private String district;
  59 + @Excel(name = "原区属")
  60 + private String districtOld;
  61 +
  62 + @Excel(name = "是否区内")
  63 + private String inoutDistrict;
  64 + @Excel(name = "原是否区内")
  65 + private String inoutDistrictOld;
  66 +
  67 +
  68 +
  69 +
  70 + /** 营运状态 运营中/撤销/暂停 */
  71 + @Excel(name = "营运状态")
  72 + private String serviceState;
  73 + @Excel(name = "原营运状态")
  74 + private String serviceStateOld;
  75 +
  76 +
  77 + @Excel(name = "车辆类型")
  78 + private String busType;
  79 + @Excel(name = "原车辆类型")
  80 + private String busTypeOld;
  81 +
  82 + @Excel(name = "是否空调")
  83 + private String airConditionerType;
  84 + @Excel(name = "原是否空调")
  85 + private String airConditionerTypeOld;
  86 +
  87 + @Excel(name = "售票类型")
  88 + private String sellTicketType;
  89 + @Excel(name = "原售票类型")
  90 + private String sellTicketTypeOld;
  91 +
  92 + @Excel(name = "运营时间")
  93 + private String serviceTime;
  94 + @Excel(name = "原运营时间")
  95 + private String serviceTimeOld;
  96 +
  97 + @Excel(name = "线路长度")
  98 + private Long lineDistance;
  99 + @Excel(name = "原线路长度")
  100 + private Long lineDistanceOld;
  101 +
  102 + @Excel(name = "线路编码")
  103 + private String lineCode;
  104 + @Excel(name = "原线路编码")
  105 + private String lineCodeOld;
  106 +
  107 + @Excel(name = "授权年限")
  108 + private Long warrantYear;
  109 + @Excel(name = "原授权年限")
  110 + private Long warrantYearOld;
  111 +
  112 + @JsonFormat(pattern = "yyyy-MM-dd")
  113 + @Excel(name = "授权起始日期", width = 30, dateFormat = "yyyy-MM-dd")
  114 + private Date warrantStartTime;
  115 + @JsonFormat(pattern = "yyyy-MM-dd")
  116 + @Excel(name = "原授权起始日期", width = 30, dateFormat = "yyyy-MM-dd")
  117 + private Date warrantStartTimeOld;
  118 +
  119 +
  120 + @JsonFormat(pattern = "yyyy-MM-dd")
  121 + @Excel(name = "授权结束日期", width = 30, dateFormat = "yyyy-MM-dd")
  122 + private Date warrantEndTime;
  123 + @JsonFormat(pattern = "yyyy-MM-dd")
  124 + @Excel(name = "原授权结束日期", width = 30, dateFormat = "yyyy-MM-dd")
  125 + private Date warrantEndTimeOld;
  126 +
  127 + @JsonFormat(pattern = "yyyy-MM-dd")
  128 + @Excel(name = "撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
  129 + private Date planCancelTime;
  130 + @JsonFormat(pattern = "yyyy-MM-dd")
  131 + @Excel(name = "原撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
  132 + private Date planCancelTimeOld;
  133 +
  134 + @JsonFormat(pattern = "yyyy-MM-dd")
  135 + @Excel(name = "实际撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
  136 + private Date cancelTime;
  137 + @JsonFormat(pattern = "yyyy-MM-dd")
  138 + @Excel(name = "原实际撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
  139 + private Date cancelTimeOld;
  140 +
  141 +
  142 + @Excel(name = "撤销原因")
  143 + private String cancelReason;
  144 + @Excel(name = "原撤销原因")
  145 + private String cancelReasonOld;
  146 +
  147 + @Excel(name = "备注")
  148 + private String remark;
  149 + @Excel(name = "原备注")
  150 + private String remarkOld;
  151 +
  152 + @JsonFormat(pattern = "yyyy-MM-dd")
  153 + @Excel(name = "行车作业计划表报备时间", width = 30, dateFormat = "yyyy-MM-dd")
  154 + private Date timeSchedule;
  155 + @JsonFormat(pattern = "yyyy-MM-dd")
  156 + @Excel(name = "原行车作业计划表报备时间", width = 30, dateFormat = "yyyy-MM-dd")
  157 + private Date timeScheduleOld;
  158 +
  159 + @Excel(name = "停车场")
  160 + private String park;
  161 + @Excel(name = "原停车场")
  162 + private String parkOld;
  163 +
  164 + @Excel(name = "是否权证")
  165 + private String isWarrant;
  166 + @Excel(name = "原是否权证")
  167 + private String isWarrantOld;
  168 +
  169 + @JsonFormat(pattern = "yyyy-MM-dd")
  170 + @Excel(name = "权证开通日期", width = 30, dateFormat = "yyyy-MM-dd")
  171 + private Date isWarrantStartTime;
  172 + @JsonFormat(pattern = "yyyy-MM-dd")
  173 + @Excel(name = "原权证开通日期", width = 30, dateFormat = "yyyy-MM-dd")
  174 + private Date isWarrantStartTimeOld;
  175 +
  176 + @JsonFormat(pattern = "yyyy-MM-dd")
  177 + @Excel(name = "权证到期日期", width = 30, dateFormat = "yyyy-MM-dd")
  178 + private Date isWarrantEndTime;
  179 + @JsonFormat(pattern = "yyyy-MM-dd")
  180 + @Excel(name = "原权证到期日期", width = 30, dateFormat = "yyyy-MM-dd")
  181 + private Date isWarrantEndTimeOld;
  182 +
  183 + @Excel(name = "道路类型")
  184 + private String roadType;
  185 + @Excel(name = "原道路类型")
  186 + private String roadTypeOld;
  187 +
  188 + @Excel(name = "票价")
  189 + private String ticketPrice;
  190 + @Excel(name = "原票价")
  191 + private String ticketPriceOld;
  192 +
  193 + @Excel(name = "首站")
  194 + private String firstStation;
  195 + @Excel(name = "原首站")
  196 + private String firstStationOld;
  197 +
  198 + @Excel(name = "起讫站")
  199 + private String startEnd;
  200 + @Excel(name = "原起讫站")
  201 + private String startEndOld;
  202 +
  203 + @Excel(name = "首站时间")
  204 + private String firstTime;
  205 + @Excel(name = "原首站时间")
  206 + private String firstTimeOld;
  207 +
  208 + @Excel(name = "末站")
  209 + private String lastStation;
  210 + @Excel(name = "原末站")
  211 + private String lastStationOld;
  212 +
  213 + @Excel(name = "末站首站时间")
  214 + private String lastTime;
  215 + @Excel(name = "原末站首站时间")
  216 + private String lastTimeOld;
  217 +
  218 + @Excel(name = "上行里程数")
  219 + private String mileageUp;
  220 + @Excel(name = "原上行里程数")
  221 + private String mileageUpOld;
  222 +
  223 + @Excel(name = "下行里程数")
  224 + private String mileageDown;
  225 + @Excel(name = "原下行里程数")
  226 + private String mileageDownOld;
  227 +
  228 + @Excel(name = "平均里程数")
  229 + private String averageMileage;
  230 + @Excel(name = "原平均里程数")
  231 + private String averageMileageOld;
  232 +
  233 + @Excel(name = "站级数(上行)")
  234 + private String stationUp;
  235 + @Excel(name = "原站级数(上行)")
  236 + private String stationUpOld;
  237 +
  238 + @Excel(name = "站级数(下行)")
  239 + private String stationDown;
  240 + @Excel(name = "原站级数(下行)")
  241 + private String stationDownOld;
  242 +
  243 + @Excel(name = "行驶时间(上行)")
  244 + private String travelTimeUp;
  245 + @Excel(name = "原行驶时间(上行)")
  246 + private String travelTimeUpOld;
  247 +
  248 + @Excel(name = "行驶时间(下行)")
  249 + private String travelTimeDown;
  250 + @Excel(name = "原行驶时间(下行)")
  251 + private String travelTimeDownOld;
  252 +
  253 + @Excel(name = "行驶间隔(高峰)")
  254 + private String travelIntervalUp;
  255 + @Excel(name = "原行驶间隔(高峰)")
  256 + private String travelIntervalUpOld;
  257 +
  258 + @Excel(name = "行驶间隔(低谷)")
  259 + private String travelIntervalDown;
  260 + @Excel(name = "原行驶间隔(低谷)")
  261 + private String travelIntervalDownOld;
  262 +
  263 + @Excel(name = "经营权证(大巴)")
  264 + private Long warrantVehiclesLarge;
  265 + @Excel(name = "原经营权证(大巴)")
  266 + private Long warrantVehiclesLargeOld;
  267 +
  268 + @Excel(name = "经营权证(中巴)")
  269 + private Long warrantVehiclesMiddle;
  270 + @Excel(name = "原经营权证(中巴)")
  271 + private Long warrantVehiclesMiddleOld;
  272 +
  273 + @Excel(name = "实际配车数")
  274 + private Long vehiclesNumber;
  275 + @Excel(name = "原实际配车数")
  276 + private Long vehiclesNumberOld;
  277 +
  278 + @Excel(name = "实际车辆数(大巴)")
  279 + private Long numberVehiclesLarge;
  280 + @Excel(name = "原实际车辆数(大巴)")
  281 + private Long numberVehiclesLargeOld;
  282 +
  283 + @Excel(name = "实际车辆数(中巴)")
  284 + private Long numberVehiclesMiddle;
  285 + @Excel(name = "原实际车辆数(中巴)")
  286 + private Long numberVehiclesMiddleOld;
  287 +
  288 + @Excel(name = "车辆自编号")
  289 + private String carPlate;
  290 + @Excel(name = "原车辆自编号")
  291 + private String carPlateOld;
  292 +
  293 + @Excel(name = "线路总配人数")
  294 + private Long numberPerson;
  295 + @Excel(name = "原线路总配人数")
  296 + private Long numberPersonOld;
  297 +
  298 + @Excel(name = "人数司机")
  299 + private Long numberPersonDriver;
  300 + @Excel(name = "原人数司机")
  301 + private Long numberPersonDriverOld;
  302 +
  303 +
  304 + @Excel(name = "售票员数")
  305 + private Long numberPersonSales;
  306 + @Excel(name = "原售票员数")
  307 + private Long numberPersonSalesOld;
  308 +
  309 + @Excel(name = "新能源车数")
  310 + private Long busEvNumber;
  311 + @Excel(name = "原新能源车数")
  312 + private Long busEvNumberOld;
  313 +
  314 + @Excel(name = "线路走向")
  315 + private String directions;
  316 + @Excel(name = "原线路走向")
  317 + private String directionsOld;
  318 +
  319 + @Excel(name = "经营权证数")
  320 + private String numberOfManage;
  321 + @Excel(name = "原经营权证数")
  322 + private String numberOfManageOld;
  323 +
  324 + @Excel(name = "站点名称")
  325 + private String halfwayStation;
  326 + @Excel(name = "站点名称")
  327 + private String halfwayStationOld;
  328 +
  329 + @Excel(name = "高峰系数")
  330 + private Long fullCustomerPercent;
  331 + @Excel(name = "原高峰系数")
  332 + private Long fullCustomerPercentOld;
  333 +
  334 + @Excel(name = "低谷系数")
  335 + private Long lowCustomerPercent;
  336 + @Excel(name = "原低谷系数")
  337 + private Long lowCustomerPercentOld;
  338 +
  339 + @Excel(name = "间隔等级")
  340 + private String divideLevel;
  341 + @Excel(name = "原间隔等级")
  342 + private String divideLevelOld;
  343 +
  344 + @Excel(name = "是否挂牌")
  345 + private String hasTimelists;
  346 + @Excel(name = "原是否挂牌")
  347 + private String hasTimelistsOld;
  348 +
  349 + @Excel(name = "是否轨交末班车衔接")
  350 + private String isMetro;
  351 + @Excel(name = "原是否轨交末班车衔接")
  352 + private String isMetroOld;
  353 +
  354 + @Excel(name = "轨交时间")
  355 + private String metroTime;
  356 + @Excel(name = "原轨交时间")
  357 + private String metroTimeOld;
  358 +
  359 + @Excel(name = "冷僻线路补贴类型")
  360 + private String coldBonusType;
  361 + @Excel(name = "原冷僻线路补贴类型")
  362 + private String coldBonusTypeOld;
  363 +
  364 + @Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd")
  365 + private Date startDate;
  366 + @Excel(name = "原启用日期", width = 30, dateFormat = "yyyy-MM-dd")
  367 + private Date startDateOld;
  368 +
  369 + @Excel(name = "夜间停车场")
  370 + private String nightParking;
  371 + @Excel(name = "原夜间停车场")
  372 + private String nightParkingOld;
  373 +
  374 + @Excel(name = "性质")
  375 + private String lineUpdateType;
  376 + @Excel(name = "原性质")
  377 + private String lineUpdateTypeOld;
  378 +
  379 + //营收类型（公交线路/机场专线/特约车线路/零星特约车线路/交通车线路/团客车线路/其他线路
  380 + @Excel(name = "营收类型")
  381 + private String revenueType;
  382 + @Excel(name = "原营收类型")
  383 + private String revenueTypeOld;
  384 +
  385 + public Long getId() {
  386 + return id;
  387 + }
  388 +
  389 + public void setId(Long id) {
  390 + this.id = id;
  391 + }
  392 +
  393 + public Long getIdOld() {
  394 + return idOld;
  395 + }
  396 +
  397 + public void setIdOld(Long idOld) {
  398 + this.idOld = idOld;
  399 + }
  400 +
  401 + public String getLineName() {
  402 + return lineName;
  403 + }
  404 +
  405 + public void setLineName(String lineName) {
  406 + this.lineName = lineName;
  407 + }
  408 +
  409 +
  410 + public String getCompany() {
  411 + return company;
  412 + }
  413 +
  414 + public void setCompany(String company) {
  415 + this.company = company;
  416 + }
  417 +
  418 + public String getCompanyOld() {
  419 + return companyOld;
  420 + }
  421 +
  422 + public void setCompanyOld(String companyOld) {
  423 + this.companyOld = companyOld;
  424 + }
  425 +
  426 + public String getFCompany() {
  427 + return fCompany;
  428 + }
  429 +
  430 + public void setFCompany(String fCompany) {
  431 + this.fCompany = fCompany;
  432 + }
  433 +
  434 + public String getFCompanyOld() {
  435 + return fCompanyOld;
  436 + }
  437 +
  438 + public void setFCompanyOld(String fCompanyOld) {
  439 + this.fCompanyOld = fCompanyOld;
  440 + }
  441 +
  442 + public Long getPLineId() {
  443 + return pLineId;
  444 + }
  445 +
  446 + public void setPLineId(Long pLineId) {
  447 + this.pLineId = pLineId;
  448 + }
  449 +
  450 + public Long getPLineIdOld() {
  451 + return pLineIdOld;
  452 + }
  453 +
  454 + public void setPLineIdOld(Long pLineIdOld) {
  455 + this.pLineIdOld = pLineIdOld;
  456 + }
  457 +
  458 + public String getServiceType() {
  459 + return serviceType;
  460 + }
  461 +
  462 + public void setServiceType(String serviceType) {
  463 + this.serviceType = serviceType;
  464 + }
  465 +
  466 + public String getServiceTypeOld() {
  467 + return serviceTypeOld;
  468 + }
  469 +
  470 + public void setServiceTypeOld(String serviceTypeOld) {
  471 + this.serviceTypeOld = serviceTypeOld;
  472 + }
  473 +
  474 + public String getLineLevel() {
  475 + return lineLevel;
  476 + }
  477 +
  478 + public void setLineLevel(String lineLevel) {
  479 + this.lineLevel = lineLevel;
  480 + }
  481 +
  482 + public String getLineLevelOld() {
  483 + return lineLevelOld;
  484 + }
  485 +
  486 + public void setLineLevelOld(String lineLevelOld) {
  487 + this.lineLevelOld = lineLevelOld;
  488 + }
  489 +
  490 + public String getLineType() {
  491 + return lineType;
  492 + }
  493 +
  494 + public void setLineType(String lineType) {
  495 + this.lineType = lineType;
  496 + }
  497 +
  498 + public String getLineTypeOld() {
  499 + return lineTypeOld;
  500 + }
  501 +
  502 + public void setLineTypeOld(String lineTypeOld) {
  503 + this.lineTypeOld = lineTypeOld;
  504 + }
  505 +
  506 + public String getDistrict() {
  507 + return district;
  508 + }
  509 +
  510 + public void setDistrict(String district) {
  511 + this.district = district;
  512 + }
  513 +
  514 + public String getDistrictOld() {
  515 + return districtOld;
  516 + }
  517 +
  518 + public void setDistrictOld(String districtOld) {
  519 + this.districtOld = districtOld;
  520 + }
  521 +
  522 + public String getInoutDistrict() {
  523 + return inoutDistrict;
  524 + }
  525 +
  526 + public void setInoutDistrict(String inoutDistrict) {
  527 + this.inoutDistrict = inoutDistrict;
  528 + }
  529 +
  530 + public String getInoutDistrictOld() {
  531 + return inoutDistrictOld;
  532 + }
  533 +
  534 + public void setInoutDistrictOld(String inoutDistrictOld) {
  535 + this.inoutDistrictOld = inoutDistrictOld;
  536 + }
  537 +
  538 + public String getServiceState() {
  539 + return serviceState;
  540 + }
  541 +
  542 + public void setServiceState(String serviceState) {
  543 + this.serviceState = serviceState;
  544 + }
  545 +
  546 + public String getServiceStateOld() {
  547 + return serviceStateOld;
  548 + }
  549 +
  550 + public void setServiceStateOld(String serviceStateOld) {
  551 + this.serviceStateOld = serviceStateOld;
  552 + }
  553 +
  554 + public String getBusType() {
  555 + return busType;
  556 + }
  557 +
  558 + public void setBusType(String busType) {
  559 + this.busType = busType;
  560 + }
  561 +
  562 + public String getBusTypeOld() {
  563 + return busTypeOld;
  564 + }
  565 +
  566 + public void setBusTypeOld(String busTypeOld) {
  567 + this.busTypeOld = busTypeOld;
  568 + }
  569 +
  570 + public String getAirConditionerType() {
  571 + return airConditionerType;
  572 + }
  573 +
  574 + public void setAirConditionerType(String airConditionerType) {
  575 + this.airConditionerType = airConditionerType;
  576 + }
  577 +
  578 + public String getAirConditionerTypeOld() {
  579 + return airConditionerTypeOld;
  580 + }
  581 +
  582 + public void setAirConditionerTypeOld(String airConditionerTypeOld) {
  583 + this.airConditionerTypeOld = airConditionerTypeOld;
  584 + }
  585 +
  586 + public String getSellTicketType() {
  587 + return sellTicketType;
  588 + }
  589 +
  590 + public void setSellTicketType(String sellTicketType) {
  591 + this.sellTicketType = sellTicketType;
  592 + }
  593 +
  594 + public String getSellTicketTypeOld() {
  595 + return sellTicketTypeOld;
  596 + }
  597 +
  598 + public void setSellTicketTypeOld(String sellTicketTypeOld) {
  599 + this.sellTicketTypeOld = sellTicketTypeOld;
  600 + }
  601 +
  602 + public String getServiceTime() {
  603 + return serviceTime;
  604 + }
  605 +
  606 + public void setServiceTime(String serviceTime) {
  607 + this.serviceTime = serviceTime;
  608 + }
  609 +
  610 + public String getServiceTimeOld() {
  611 + return serviceTimeOld;
  612 + }
  613 +
  614 + public void setServiceTimeOld(String serviceTimeOld) {
  615 + this.serviceTimeOld = serviceTimeOld;
  616 + }
  617 +
  618 + public Long getLineDistance() {
  619 + return lineDistance;
  620 + }
  621 +
  622 + public void setLineDistance(Long lineDistance) {
  623 + this.lineDistance = lineDistance;
  624 + }
  625 +
  626 + public Long getLineDistanceOld() {
  627 + return lineDistanceOld;
  628 + }
  629 +
  630 + public void setLineDistanceOld(Long lineDistanceOld) {
  631 + this.lineDistanceOld = lineDistanceOld;
  632 + }
  633 +
  634 + public String getLineCode() {
  635 + return lineCode;
  636 + }
  637 +
  638 + public void setLineCode(String lineCode) {
  639 + this.lineCode = lineCode;
  640 + }
  641 +
  642 + public String getLineCodeOld() {
  643 + return lineCodeOld;
  644 + }
  645 +
  646 + public void setLineCodeOld(String lineCodeOld) {
  647 + this.lineCodeOld = lineCodeOld;
  648 + }
  649 +
  650 + public Long getWarrantYear() {
  651 + return warrantYear;
  652 + }
  653 +
  654 + public void setWarrantYear(Long warrantYear) {
  655 + this.warrantYear = warrantYear;
  656 + }
  657 +
  658 + public Long getWarrantYearOld() {
  659 + return warrantYearOld;
  660 + }
  661 +
  662 + public void setWarrantYearOld(Long warrantYearOld) {
  663 + this.warrantYearOld = warrantYearOld;
  664 + }
  665 +
  666 + public Date getWarrantStartTime() {
  667 + return warrantStartTime;
  668 + }
  669 +
  670 + public void setWarrantStartTime(Date warrantStartTime) {
  671 + this.warrantStartTime = warrantStartTime;
  672 + }
  673 +
  674 + public Date getWarrantStartTimeOld() {
  675 + return warrantStartTimeOld;
  676 + }
  677 +
  678 + public void setWarrantStartTimeOld(Date warrantStartTimeOld) {
  679 + this.warrantStartTimeOld = warrantStartTimeOld;
  680 + }
  681 +
  682 + public Date getWarrantEndTime() {
  683 + return warrantEndTime;
  684 + }
  685 +
  686 + public void setWarrantEndTime(Date warrantEndTime) {
  687 + this.warrantEndTime = warrantEndTime;
  688 + }
  689 +
  690 + public Date getWarrantEndTimeOld() {
  691 + return warrantEndTimeOld;
  692 + }
  693 +
  694 + public void setWarrantEndTimeOld(Date warrantEndTimeOld) {
  695 + this.warrantEndTimeOld = warrantEndTimeOld;
  696 + }
  697 +
  698 + public Date getPlanCancelTime() {
  699 + return planCancelTime;
  700 + }
  701 +
  702 + public void setPlanCancelTime(Date planCancelTime) {
  703 + this.planCancelTime = planCancelTime;
  704 + }
  705 +
  706 + public Date getPlanCancelTimeOld() {
  707 + return planCancelTimeOld;
  708 + }
  709 +
  710 + public void setPlanCancelTimeOld(Date planCancelTimeOld) {
  711 + this.planCancelTimeOld = planCancelTimeOld;
  712 + }
  713 +
  714 + public Date getCancelTime() {
  715 + return cancelTime;
  716 + }
  717 +
  718 + public void setCancelTime(Date cancelTime) {
  719 + this.cancelTime = cancelTime;
  720 + }
  721 +
  722 + public Date getCancelTimeOld() {
  723 + return cancelTimeOld;
  724 + }
  725 +
  726 + public void setCancelTimeOld(Date cancelTimeOld) {
  727 + this.cancelTimeOld = cancelTimeOld;
  728 + }
  729 +
  730 + public String getCancelReason() {
  731 + return cancelReason;
  732 + }
  733 +
  734 + public void setCancelReason(String cancelReason) {
  735 + this.cancelReason = cancelReason;
  736 + }
  737 +
  738 + public String getCancelReasonOld() {
  739 + return cancelReasonOld;
  740 + }
  741 +
  742 + public void setCancelReasonOld(String cancelReasonOld) {
  743 + this.cancelReasonOld = cancelReasonOld;
  744 + }
  745 +
  746 + @Override
  747 + public String getRemark() {
  748 + return remark;
  749 + }
  750 +
  751 + @Override
  752 + public void setRemark(String remark) {
  753 + this.remark = remark;
  754 + }
  755 +
  756 + public String getRemarkOld() {
  757 + return remarkOld;
  758 + }
  759 +
  760 + public void setRemarkOld(String remarkOld) {
  761 + this.remarkOld = remarkOld;
  762 + }
  763 +
  764 + public Date getTimeSchedule() {
  765 + return timeSchedule;
  766 + }
  767 +
  768 + public void setTimeSchedule(Date timeSchedule) {
  769 + this.timeSchedule = timeSchedule;
  770 + }
  771 +
  772 + public Date getTimeScheduleOld() {
  773 + return timeScheduleOld;
  774 + }
  775 +
  776 + public void setTimeScheduleOld(Date timeScheduleOld) {
  777 + this.timeScheduleOld = timeScheduleOld;
  778 + }
  779 +
  780 + public String getPark() {
  781 + return park;
  782 + }
  783 +
  784 + public void setPark(String park) {
  785 + this.park = park;
  786 + }
  787 +
  788 + public String getParkOld() {
  789 + return parkOld;
  790 + }
  791 +
  792 + public void setParkOld(String parkOld) {
  793 + this.parkOld = parkOld;
  794 + }
  795 +
  796 + public String getIsWarrant() {
  797 + return isWarrant;
  798 + }
  799 +
  800 + public void setIsWarrant(String isWarrant) {
  801 + this.isWarrant = isWarrant;
  802 + }
  803 +
  804 + public String getIsWarrantOld() {
  805 + return isWarrantOld;
  806 + }
  807 +
  808 + public void setIsWarrantOld(String isWarrantOld) {
  809 + this.isWarrantOld = isWarrantOld;
  810 + }
  811 +
  812 + public Date getIsWarrantStartTime() {
  813 + return isWarrantStartTime;
  814 + }
  815 +
  816 + public void setIsWarrantStartTime(Date isWarrantStartTime) {
  817 + this.isWarrantStartTime = isWarrantStartTime;
  818 + }
  819 +
  820 + public Date getIsWarrantStartTimeOld() {
  821 + return isWarrantStartTimeOld;
  822 + }
  823 +
  824 + public void setIsWarrantStartTimeOld(Date isWarrantStartTimeOld) {
  825 + this.isWarrantStartTimeOld = isWarrantStartTimeOld;
  826 + }
  827 +
  828 + public Date getIsWarrantEndTime() {
  829 + return isWarrantEndTime;
  830 + }
  831 +
  832 + public void setIsWarrantEndTime(Date isWarrantEndTime) {
  833 + this.isWarrantEndTime = isWarrantEndTime;
  834 + }
  835 +
  836 + public Date getIsWarrantEndTimeOld() {
  837 + return isWarrantEndTimeOld;
  838 + }
  839 +
  840 + public void setIsWarrantEndTimeOld(Date isWarrantEndTimeOld) {
  841 + this.isWarrantEndTimeOld = isWarrantEndTimeOld;
  842 + }
  843 +
  844 + public String getRoadType() {
  845 + return roadType;
  846 + }
  847 +
  848 + public void setRoadType(String roadType) {
  849 + this.roadType = roadType;
  850 + }
  851 +
  852 + public String getRoadTypeOld() {
  853 + return roadTypeOld;
  854 + }
  855 +
  856 + public void setRoadTypeOld(String roadTypeOld) {
  857 + this.roadTypeOld = roadTypeOld;
  858 + }
  859 +
  860 + public String getTicketPrice() {
  861 + return ticketPrice;
  862 + }
  863 +
  864 + public void setTicketPrice(String ticketPrice) {
  865 + this.ticketPrice = ticketPrice;
  866 + }
  867 +
  868 + public String getTicketPriceOld() {
  869 + return ticketPriceOld;
  870 + }
  871 +
  872 + public void setTicketPriceOld(String ticketPriceOld) {
  873 + this.ticketPriceOld = ticketPriceOld;
  874 + }
  875 +
  876 + public String getFirstStation() {
  877 + return firstStation;
  878 + }
  879 +
  880 + public void setFirstStation(String firstStation) {
  881 + this.firstStation = firstStation;
  882 + }
  883 +
  884 + public String getFirstStationOld() {
  885 + return firstStationOld;
  886 + }
  887 +
  888 + public void setFirstStationOld(String firstStationOld) {
  889 + this.firstStationOld = firstStationOld;
  890 + }
  891 +
  892 + public String getStartEnd() {
  893 + return startEnd;
  894 + }
  895 +
  896 + public void setStartEnd(String startEnd) {
  897 + this.startEnd = startEnd;
  898 + }
  899 +
  900 + public String getStartEndOld() {
  901 + return startEndOld;
  902 + }
  903 +
  904 + public void setStartEndOld(String startEndOld) {
  905 + this.startEndOld = startEndOld;
  906 + }
  907 +
  908 + public String getFirstTime() {
  909 + return firstTime;
  910 + }
  911 +
  912 + public void setFirstTime(String firstTime) {
  913 + this.firstTime = firstTime;
  914 + }
  915 +
  916 + public String getFirstTimeOld() {
  917 + return firstTimeOld;
  918 + }
  919 +
  920 + public void setFirstTimeOld(String firstTimeOld) {
  921 + this.firstTimeOld = firstTimeOld;
  922 + }
  923 +
  924 + public String getLastStation() {
  925 + return lastStation;
  926 + }
  927 +
  928 + public void setLastStation(String lastStation) {
  929 + this.lastStation = lastStation;
  930 + }
  931 +
  932 + public String getLastStationOld() {
  933 + return lastStationOld;
  934 + }
  935 +
  936 + public void setLastStationOld(String lastStationOld) {
  937 + this.lastStationOld = lastStationOld;
  938 + }
  939 +
  940 + public String getLastTime() {
  941 + return lastTime;
  942 + }
  943 +
  944 + public void setLastTime(String lastTime) {
  945 + this.lastTime = lastTime;
  946 + }
  947 +
  948 + public String getLastTimeOld() {
  949 + return lastTimeOld;
  950 + }
  951 +
  952 + public void setLastTimeOld(String lastTimeOld) {
  953 + this.lastTimeOld = lastTimeOld;
  954 + }
  955 +
  956 + public String getMileageUp() {
  957 + return mileageUp;
  958 + }
  959 +
  960 + public void setMileageUp(String mileageUp) {
  961 + this.mileageUp = mileageUp;
  962 + }
  963 +
  964 + public String getMileageUpOld() {
  965 + return mileageUpOld;
  966 + }
  967 +
  968 + public void setMileageUpOld(String mileageUpOld) {
  969 + this.mileageUpOld = mileageUpOld;
  970 + }
  971 +
  972 + public String getMileageDown() {
  973 + return mileageDown;
  974 + }
  975 +
  976 + public void setMileageDown(String mileageDown) {
  977 + this.mileageDown = mileageDown;
  978 + }
  979 +
  980 + public String getMileageDownOld() {
  981 + return mileageDownOld;
  982 + }
  983 +
  984 + public void setMileageDownOld(String mileageDownOld) {
  985 + this.mileageDownOld = mileageDownOld;
  986 + }
  987 +
  988 + public String getAverageMileage() {
  989 + return averageMileage;
  990 + }
  991 +
  992 + public void setAverageMileage(String averageMileage) {
  993 + this.averageMileage = averageMileage;
  994 + }
  995 +
  996 + public String getAverageMileageOld() {
  997 + return averageMileageOld;
  998 + }
  999 +
  1000 + public void setAverageMileageOld(String averageMileageOld) {
  1001 + this.averageMileageOld = averageMileageOld;
  1002 + }
  1003 +
  1004 + public String getStationUp() {
  1005 + return stationUp;
  1006 + }
  1007 +
  1008 + public void setStationUp(String stationUp) {
  1009 + this.stationUp = stationUp;
  1010 + }
  1011 +
  1012 + public String getStationUpOld() {
  1013 + return stationUpOld;
  1014 + }
  1015 +
  1016 + public void setStationUpOld(String stationUpOld) {
  1017 + this.stationUpOld = stationUpOld;
  1018 + }
  1019 +
  1020 + public String getStationDown() {
  1021 + return stationDown;
  1022 + }
  1023 +
  1024 + public void setStationDown(String stationDown) {
  1025 + this.stationDown = stationDown;
  1026 + }
  1027 +
  1028 + public String getStationDownOld() {
  1029 + return stationDownOld;
  1030 + }
  1031 +
  1032 + public void setStationDownOld(String stationDownOld) {
  1033 + this.stationDownOld = stationDownOld;
  1034 + }
  1035 +
  1036 + public String getTravelTimeUp() {
  1037 + return travelTimeUp;
  1038 + }
  1039 +
  1040 + public void setTravelTimeUp(String travelTimeUp) {
  1041 + this.travelTimeUp = travelTimeUp;
  1042 + }
  1043 +
  1044 + public String getTravelTimeUpOld() {
  1045 + return travelTimeUpOld;
  1046 + }
  1047 +
  1048 + public void setTravelTimeUpOld(String travelTimeUpOld) {
  1049 + this.travelTimeUpOld = travelTimeUpOld;
  1050 + }
  1051 +
  1052 + public String getTravelTimeDown() {
  1053 + return travelTimeDown;
  1054 + }
  1055 +
  1056 + public void setTravelTimeDown(String travelTimeDown) {
  1057 + this.travelTimeDown = travelTimeDown;
  1058 + }
  1059 +
  1060 + public String getTravelTimeDownOld() {
  1061 + return travelTimeDownOld;
  1062 + }
  1063 +
  1064 + public void setTravelTimeDownOld(String travelTimeDownOld) {
  1065 + this.travelTimeDownOld = travelTimeDownOld;
  1066 + }
  1067 +
  1068 + public String getTravelIntervalUp() {
  1069 + return travelIntervalUp;
  1070 + }
  1071 +
  1072 + public void setTravelIntervalUp(String travelIntervalUp) {
  1073 + this.travelIntervalUp = travelIntervalUp;
  1074 + }
  1075 +
  1076 + public String getTravelIntervalUpOld() {
  1077 + return travelIntervalUpOld;
  1078 + }
  1079 +
  1080 + public void setTravelIntervalUpOld(String travelIntervalUpOld) {
  1081 + this.travelIntervalUpOld = travelIntervalUpOld;
  1082 + }
  1083 +
  1084 + public String getTravelIntervalDown() {
  1085 + return travelIntervalDown;
  1086 + }
  1087 +
  1088 + public void setTravelIntervalDown(String travelIntervalDown) {
  1089 + this.travelIntervalDown = travelIntervalDown;
  1090 + }
  1091 +
  1092 + public String getTravelIntervalDownOld() {
  1093 + return travelIntervalDownOld;
  1094 + }
  1095 +
  1096 + public void setTravelIntervalDownOld(String travelIntervalDownOld) {
  1097 + this.travelIntervalDownOld = travelIntervalDownOld;
  1098 + }
  1099 +
  1100 + public Long getWarrantVehiclesLarge() {
  1101 + return warrantVehiclesLarge;
  1102 + }
  1103 +
  1104 + public void setWarrantVehiclesLarge(Long warrantVehiclesLarge) {
  1105 + this.warrantVehiclesLarge = warrantVehiclesLarge;
  1106 + }
  1107 +
  1108 + public Long getWarrantVehiclesLargeOld() {
  1109 + return warrantVehiclesLargeOld;
  1110 + }
  1111 +
  1112 + public void setWarrantVehiclesLargeOld(Long warrantVehiclesLargeOld) {
  1113 + this.warrantVehiclesLargeOld = warrantVehiclesLargeOld;
  1114 + }
  1115 +
  1116 + public Long getWarrantVehiclesMiddle() {
  1117 + return warrantVehiclesMiddle;
  1118 + }
  1119 +
  1120 + public void setWarrantVehiclesMiddle(Long warrantVehiclesMiddle) {
  1121 + this.warrantVehiclesMiddle = warrantVehiclesMiddle;
  1122 + }
  1123 +
  1124 + public Long getWarrantVehiclesMiddleOld() {
  1125 + return warrantVehiclesMiddleOld;
  1126 + }
  1127 +
  1128 + public void setWarrantVehiclesMiddleOld(Long warrantVehiclesMiddleOld) {
  1129 + this.warrantVehiclesMiddleOld = warrantVehiclesMiddleOld;
  1130 + }
  1131 +
  1132 + public Long getVehiclesNumber() {
  1133 + return vehiclesNumber;
  1134 + }
  1135 +
  1136 + public void setVehiclesNumber(Long vehiclesNumber) {
  1137 + this.vehiclesNumber = vehiclesNumber;
  1138 + }
  1139 +
  1140 + public Long getVehiclesNumberOld() {
  1141 + return vehiclesNumberOld;
  1142 + }
  1143 +
  1144 + public void setVehiclesNumberOld(Long vehiclesNumberOld) {
  1145 + this.vehiclesNumberOld = vehiclesNumberOld;
  1146 + }
  1147 +
  1148 + public Long getNumberVehiclesLarge() {
  1149 + return numberVehiclesLarge;
  1150 + }
  1151 +
  1152 + public void setNumberVehiclesLarge(Long numberVehiclesLarge) {
  1153 + this.numberVehiclesLarge = numberVehiclesLarge;
  1154 + }
  1155 +
  1156 + public Long getNumberVehiclesLargeOld() {
  1157 + return numberVehiclesLargeOld;
  1158 + }
  1159 +
  1160 + public void setNumberVehiclesLargeOld(Long numberVehiclesLargeOld) {
  1161 + this.numberVehiclesLargeOld = numberVehiclesLargeOld;
  1162 + }
  1163 +
  1164 + public Long getNumberVehiclesMiddle() {
  1165 + return numberVehiclesMiddle;
  1166 + }
  1167 +
  1168 + public void setNumberVehiclesMiddle(Long numberVehiclesMiddle) {
  1169 + this.numberVehiclesMiddle = numberVehiclesMiddle;
  1170 + }
  1171 +
  1172 + public Long getNumberVehiclesMiddleOld() {
  1173 + return numberVehiclesMiddleOld;
  1174 + }
  1175 +
  1176 + public void setNumberVehiclesMiddleOld(Long numberVehiclesMiddleOld) {
  1177 + this.numberVehiclesMiddleOld = numberVehiclesMiddleOld;
  1178 + }
  1179 +
  1180 + public String getCarPlate() {
  1181 + return carPlate;
  1182 + }
  1183 +
  1184 + public void setCarPlate(String carPlate) {
  1185 + this.carPlate = carPlate;
  1186 + }
  1187 +
  1188 + public String getCarPlateOld() {
  1189 + return carPlateOld;
  1190 + }
  1191 +
  1192 + public void setCarPlateOld(String carPlateOld) {
  1193 + this.carPlateOld = carPlateOld;
  1194 + }
  1195 +
  1196 + public Long getNumberPerson() {
  1197 + return numberPerson;
  1198 + }
  1199 +
  1200 + public void setNumberPerson(Long numberPerson) {
  1201 + this.numberPerson = numberPerson;
  1202 + }
  1203 +
  1204 + public Long getNumberPersonOld() {
  1205 + return numberPersonOld;
  1206 + }
  1207 +
  1208 + public void setNumberPersonOld(Long numberPersonOld) {
  1209 + this.numberPersonOld = numberPersonOld;
  1210 + }
  1211 +
  1212 + public Long getNumberPersonDriver() {
  1213 + return numberPersonDriver;
  1214 + }
  1215 +
  1216 + public void setNumberPersonDriver(Long numberPersonDriver) {
  1217 + this.numberPersonDriver = numberPersonDriver;
  1218 + }
  1219 +
  1220 + public Long getNumberPersonDriverOld() {
  1221 + return numberPersonDriverOld;
  1222 + }
  1223 +
  1224 + public void setNumberPersonDriverOld(Long numberPersonDriverOld) {
  1225 + this.numberPersonDriverOld = numberPersonDriverOld;
  1226 + }
  1227 +
  1228 + public Long getNumberPersonSales() {
  1229 + return numberPersonSales;
  1230 + }
  1231 +
  1232 + public void setNumberPersonSales(Long numberPersonSales) {
  1233 + this.numberPersonSales = numberPersonSales;
  1234 + }
  1235 +
  1236 + public Long getNumberPersonSalesOld() {
  1237 + return numberPersonSalesOld;
  1238 + }
  1239 +
  1240 + public void setNumberPersonSalesOld(Long numberPersonSalesOld) {
  1241 + this.numberPersonSalesOld = numberPersonSalesOld;
  1242 + }
  1243 +
  1244 + public Long getBusEvNumber() {
  1245 + return busEvNumber;
  1246 + }
  1247 +
  1248 + public void setBusEvNumber(Long busEvNumber) {
  1249 + this.busEvNumber = busEvNumber;
  1250 + }
  1251 +
  1252 + public Long getBusEvNumberOld() {
  1253 + return busEvNumberOld;
  1254 + }
  1255 +
  1256 + public void setBusEvNumberOld(Long busEvNumberOld) {
  1257 + this.busEvNumberOld = busEvNumberOld;
  1258 + }
  1259 +
  1260 + public String getDirections() {
  1261 + return directions;
  1262 + }
  1263 +
  1264 + public void setDirections(String directions) {
  1265 + this.directions = directions;
  1266 + }
  1267 +
  1268 + public String getDirectionsOld() {
  1269 + return directionsOld;
  1270 + }
  1271 +
  1272 + public void setDirectionsOld(String directionsOld) {
  1273 + this.directionsOld = directionsOld;
  1274 + }
  1275 +
  1276 + public String getNumberOfManage() {
  1277 + return numberOfManage;
  1278 + }
  1279 +
  1280 + public void setNumberOfManage(String numberOfManage) {
  1281 + this.numberOfManage = numberOfManage;
  1282 + }
  1283 +
  1284 + public String getNumberOfManageOld() {
  1285 + return numberOfManageOld;
  1286 + }
  1287 +
  1288 + public void setNumberOfManageOld(String numberOfManageOld) {
  1289 + this.numberOfManageOld = numberOfManageOld;
  1290 + }
  1291 +
  1292 + public String getHalfwayStation() {
  1293 + return halfwayStation;
  1294 + }
  1295 +
  1296 + public void setHalfwayStation(String halfwayStation) {
  1297 + this.halfwayStation = halfwayStation;
  1298 + }
  1299 +
  1300 + public String getHalfwayStationOld() {
  1301 + return halfwayStationOld;
  1302 + }
  1303 +
  1304 + public void setHalfwayStationOld(String halfwayStationOld) {
  1305 + this.halfwayStationOld = halfwayStationOld;
  1306 + }
  1307 +
  1308 + public Long getFullCustomerPercent() {
  1309 + return fullCustomerPercent;
  1310 + }
  1311 +
  1312 + public void setFullCustomerPercent(Long fullCustomerPercent) {
  1313 + this.fullCustomerPercent = fullCustomerPercent;
  1314 + }
  1315 +
  1316 + public Long getFullCustomerPercentOld() {
  1317 + return fullCustomerPercentOld;
  1318 + }
  1319 +
  1320 + public void setFullCustomerPercentOld(Long fullCustomerPercentOld) {
  1321 + this.fullCustomerPercentOld = fullCustomerPercentOld;
  1322 + }
  1323 +
  1324 + public Long getLowCustomerPercent() {
  1325 + return lowCustomerPercent;
  1326 + }
  1327 +
  1328 + public void setLowCustomerPercent(Long lowCustomerPercent) {
  1329 + this.lowCustomerPercent = lowCustomerPercent;
  1330 + }
  1331 +
  1332 + public Long getLowCustomerPercentOld() {
  1333 + return lowCustomerPercentOld;
  1334 + }
  1335 +
  1336 + public void setLowCustomerPercentOld(Long lowCustomerPercentOld) {
  1337 + this.lowCustomerPercentOld = lowCustomerPercentOld;
  1338 + }
  1339 +
  1340 + public String getDivideLevel() {
  1341 + return divideLevel;
  1342 + }
  1343 +
  1344 + public void setDivideLevel(String divideLevel) {
  1345 + this.divideLevel = divideLevel;
  1346 + }
  1347 +
  1348 + public String getDivideLevelOld() {
  1349 + return divideLevelOld;
  1350 + }
  1351 +
  1352 + public void setDivideLevelOld(String divideLevelOld) {
  1353 + this.divideLevelOld = divideLevelOld;
  1354 + }
  1355 +
  1356 + public String getHasTimelists() {
  1357 + return hasTimelists;
  1358 + }
  1359 +
  1360 + public void setHasTimelists(String hasTimelists) {
  1361 + this.hasTimelists = hasTimelists;
  1362 + }
  1363 +
  1364 + public String getHasTimelistsOld() {
  1365 + return hasTimelistsOld;
  1366 + }
  1367 +
  1368 + public void setHasTimelistsOld(String hasTimelistsOld) {
  1369 + this.hasTimelistsOld = hasTimelistsOld;
  1370 + }
  1371 +
  1372 + public String getIsMetro() {
  1373 + return isMetro;
  1374 + }
  1375 +
  1376 + public void setIsMetro(String isMetro) {
  1377 + this.isMetro = isMetro;
  1378 + }
  1379 +
  1380 + public String getIsMetroOld() {
  1381 + return isMetroOld;
  1382 + }
  1383 +
  1384 + public void setIsMetroOld(String isMetroOld) {
  1385 + this.isMetroOld = isMetroOld;
  1386 + }
  1387 +
  1388 + public String getMetroTime() {
  1389 + return metroTime;
  1390 + }
  1391 +
  1392 + public void setMetroTime(String metroTime) {
  1393 + this.metroTime = metroTime;
  1394 + }
  1395 +
  1396 + public String getMetroTimeOld() {
  1397 + return metroTimeOld;
  1398 + }
  1399 +
  1400 + public void setMetroTimeOld(String metroTimeOld) {
  1401 + this.metroTimeOld = metroTimeOld;
  1402 + }
  1403 +
  1404 + public String getColdBonusType() {
  1405 + return coldBonusType;
  1406 + }
  1407 +
  1408 + public void setColdBonusType(String coldBonusType) {
  1409 + this.coldBonusType = coldBonusType;
  1410 + }
  1411 +
  1412 + public String getColdBonusTypeOld() {
  1413 + return coldBonusTypeOld;
  1414 + }
  1415 +
  1416 + public void setColdBonusTypeOld(String coldBonusTypeOld) {
  1417 + this.coldBonusTypeOld = coldBonusTypeOld;
  1418 + }
  1419 +
  1420 + public Date getStartDate() {
  1421 + return startDate;
  1422 + }
  1423 +
  1424 + public void setStartDate(Date startDate) {
  1425 + this.startDate = startDate;
  1426 + }
  1427 +
  1428 + public Date getStartDateOld() {
  1429 + return startDateOld;
  1430 + }
  1431 +
  1432 + public void setStartDateOld(Date startDateOld) {
  1433 + this.startDateOld = startDateOld;
  1434 + }
  1435 +
  1436 + public String getNightParking() {
  1437 + return nightParking;
  1438 + }
  1439 +
  1440 + public void setNightParking(String nightParking) {
  1441 + this.nightParking = nightParking;
  1442 + }
  1443 +
  1444 + public String getNightParkingOld() {
  1445 + return nightParkingOld;
  1446 + }
  1447 +
  1448 + public void setNightParkingOld(String nightParkingOld) {
  1449 + this.nightParkingOld = nightParkingOld;
  1450 + }
  1451 +
  1452 + public String getLineUpdateType() {
  1453 + return lineUpdateType;
  1454 + }
  1455 +
  1456 + public void setLineUpdateType(String lineUpdateType) {
  1457 + this.lineUpdateType = lineUpdateType;
  1458 + }
  1459 +
  1460 + public String getLineUpdateTypeOld() {
  1461 + return lineUpdateTypeOld;
  1462 + }
  1463 +
  1464 + public void setLineUpdateTypeOld(String lineUpdateTypeOld) {
  1465 + this.lineUpdateTypeOld = lineUpdateTypeOld;
  1466 + }
  1467 +
  1468 + public String getRevenueType() {
  1469 + return revenueType;
  1470 + }
  1471 +
  1472 + public void setRevenueType(String revenueType) {
  1473 + this.revenueType = revenueType;
  1474 + }
  1475 +
  1476 + public String getRevenueTypeOld() {
  1477 + return revenueTypeOld;
  1478 + }
  1479 +
  1480 + public void setRevenueTypeOld(String revenueTypeOld) {
  1481 + this.revenueTypeOld = revenueTypeOld;
  1482 + }
  1483 +}
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
  View file @4be3425
@@ -5,6 +5,7 @@ import java.util.Map; @@ -5,6 +5,7 @@ import java.util.Map;
5 5
6 import com.ruoyi.project.system.line.domain.BsthTLine; 6 import com.ruoyi.project.system.line.domain.BsthTLine;
7 import com.ruoyi.project.system.line.domain.LineEditReport; 7 import com.ruoyi.project.system.line.domain.LineEditReport;
  8 +import com.ruoyi.project.system.line.domain.LineHistoryReport;
8 import org.apache.ibatis.annotations.Mapper; 9 import org.apache.ibatis.annotations.Mapper;
9 10
10 /** 11 /**
@@ -79,4 +80,8 @@ public interface BsthTLineMapper @@ -79,4 +80,8 @@ public interface BsthTLineMapper
79 80
80 81
81 List<BsthTLine> usedBsthTLineReport(BsthTLine bsthTLine); 82 List<BsthTLine> usedBsthTLineReport(BsthTLine bsthTLine);
  83 +
  84 + BsthTLine selectBsthTLineHistory(BsthTLine bsthTLine);
  85 +
  86 + List<LineHistoryReport>getLineHistoryReport(BsthTLine bsthTLine);
82 } 87 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
  View file @4be3425
@@ -6,6 +6,7 @@ import java.util.Map; @@ -6,6 +6,7 @@ import java.util.Map;
6 import com.alibaba.fastjson.JSONArray; 6 import com.alibaba.fastjson.JSONArray;
7 import com.ruoyi.project.system.line.domain.BsthTLine; 7 import com.ruoyi.project.system.line.domain.BsthTLine;
8 import com.ruoyi.project.system.line.domain.LineEditReport; 8 import com.ruoyi.project.system.line.domain.LineEditReport;
  9 +import com.ruoyi.project.system.line.domain.LineHistoryReport;
9 10
10 /** 11 /**
11 * 【请填写功能名称】Service接口 12 * 【请填写功能名称】Service接口
@@ -57,7 +58,6 @@ public interface IBsthTLineService @@ -57,7 +58,6 @@ public interface IBsthTLineService
57 BsthTLine selectBsthTLineExamineByLineName(BsthTLine bsthTLine); 58 BsthTLine selectBsthTLineExamineByLineName(BsthTLine bsthTLine);
58 59
59 boolean lineNameIsExist(String lineName); 60 boolean lineNameIsExist(String lineName);
60 -  
61 BsthTLine selectHistoryByLineNameAndUpdateStatus(BsthTLine bsthTLine); 61 BsthTLine selectHistoryByLineNameAndUpdateStatus(BsthTLine bsthTLine);
62 62
63 int deleteBsthTLineHistoryById(Long id); 63 int deleteBsthTLineHistoryById(Long id);
@@ -71,5 +71,7 @@ public interface IBsthTLineService @@ -71,5 +71,7 @@ public interface IBsthTLineService
71 71
72 List<BsthTLine> usedBsthTLineReport(BsthTLine bsthTLine); 72 List<BsthTLine> usedBsthTLineReport(BsthTLine bsthTLine);
73 73
  74 + List<LineHistoryReport>getLineHistoryReport(BsthTLine bsthTLine);
  75 +
74 /*int createLineMonthReport();*/ 76 /*int createLineMonthReport();*/
75 } 77 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
  View file @4be3425
@@ -9,6 +9,7 @@ import java.util.stream.Collectors; @@ -9,6 +9,7 @@ import java.util.stream.Collectors;
9 import com.ruoyi.common.utils.DateUtils; 9 import com.ruoyi.common.utils.DateUtils;
10 import com.ruoyi.common.utils.security.ShiroUtils; 10 import com.ruoyi.common.utils.security.ShiroUtils;
11 11
  12 +import com.ruoyi.project.system.line.domain.LineHistoryReport;
12 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
14 import org.springframework.transaction.annotation.Transactional; 15 import org.springframework.transaction.annotation.Transactional;
@@ -318,20 +319,6 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -318,20 +319,6 @@ public class BsthTLineServiceImpl implements IBsthTLineService
318 } 319 }
319 320
320 321
321 -  
322 -  
323 -  
324 -  
325 -  
326 -  
327 -  
328 -  
329 -  
330 -  
331 -  
332 -  
333 -  
334 -  
335 @Override 322 @Override
336 public List<BsthTLine> selectBsthTLineExamineList(BsthTLine bsthTLine) 323 public List<BsthTLine> selectBsthTLineExamineList(BsthTLine bsthTLine)
337 { 324 {
@@ -380,7 +367,6 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -380,7 +367,6 @@ public class BsthTLineServiceImpl implements IBsthTLineService
380 bl.setUpdateStatus("0"); 367 bl.setUpdateStatus("0");
381 bsthTLineMapper.saveEditHistory(bl); 368 bsthTLineMapper.saveEditHistory(bl);
382 i=bsthTLineMapper.insertBsthTLine(bl); 369 i=bsthTLineMapper.insertBsthTLine(bl);
383 -  
384 //删除审核表 370 //删除审核表
385 bsthTLineMapper.deleteBsthTLineExamineById(new String[]{bsthTLine.getId().toString()}); 371 bsthTLineMapper.deleteBsthTLineExamineById(new String[]{bsthTLine.getId().toString()});
386 }else{//未通过 372 }else{//未通过
@@ -393,15 +379,32 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -393,15 +379,32 @@ public class BsthTLineServiceImpl implements IBsthTLineService
393 return i; 379 return i;
394 }else{//变更 380 }else{//变更
395 if("2".equals(bsthTLine.getExamineStatus())){//通过 381 if("2".equals(bsthTLine.getExamineStatus())){//通过
396 - //把新的数据存入历史表等待定时器执行  
397 - bsthTLine=bsthTLineMapper.selectBsthTLineExamineById(bsthTLine.getId());//新数据  
398 - String id=bsthTLine.getId().toString();  
399 - bsthTLine.setUpdateStatus("1");  
400 - i=bsthTLineMapper.saveEditHistory(bsthTLine); 382 + //查出审核表的记录
  383 + bl=bsthTLineMapper.selectBsthTLineExamineById(bsthTLine.getId());
  384 + //查出历史当前数据的id
  385 + BsthTLine b=new BsthTLine();
  386 + b.setLineName(bl.getLineName());
  387 + b.setUpdateStatus("0");
  388 + BsthTLine blo=bsthTLineMapper.selectBsthTLineHistory(b);
  389 + if(blo==null){
  390 + return 0;
  391 + }
  392 + //查询主表
  393 + BsthTLine bsthTLine1=bsthTLineMapper.selectBsthTLineByLineName(bl.getLineName());
  394 + //把历史表中的状态update_status 0-当前 改为-1历史
  395 + b=new BsthTLine();
  396 + b.setId(blo.getId());
  397 + b.setUpdateStatus("-1");
  398 + bsthTLineMapper.updateBsthTLineHistory(b);
  399 + //把审核表的记录插入历史表 状态 0-当前 记录前一次数据的id
  400 + bl.setUpdateStatus("0");
  401 + bl.setHistoryId(blo.getId());
  402 + bsthTLineMapper.saveEditHistory(bl);
  403 + //修改主表
  404 + bl.setId(bsthTLine1.getId());
  405 + i=bsthTLineMapper.updateBsthTLine(bl);
401 //删除审核表记录 406 //删除审核表记录
402 - bsthTLineMapper.deleteBsthTLineExamineById(new String[]{id});  
403 - this.updateToLineInfo(bsthTLine.getId().toString());  
404 - 407 + bsthTLineMapper.deleteBsthTLineExamineById(new String[]{bl.getId().toString()});
405 }else{//未通过 408 }else{//未通过
406 //修改审核表状态 409 //修改审核表状态
407 bl=new BsthTLine(); 410 bl=new BsthTLine();
@@ -477,4 +480,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -477,4 +480,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService
477 return bsthTLineMapper.usedBsthTLineReport(bsthTLine); 480 return bsthTLineMapper.usedBsthTLineReport(bsthTLine);
478 } 481 }
479 482
  483 + @Override
  484 + public List<LineHistoryReport>getLineHistoryReport(BsthTLine bsthTLine){
  485 + return bsthTLineMapper.getLineHistoryReport(bsthTLine);
  486 + }
  487 +
480 } 488 }
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @4be3425
@@ -1071,7 +1071,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1071,7 +1071,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1071 <if test="startDate != null "> and start_date > #{startDate}</if> 1071 <if test="startDate != null "> and start_date > #{startDate}</if>
1072 <if test="startReason != null "> and start_reason = #{startReason}</if> 1072 <if test="startReason != null "> and start_reason = #{startReason}</if>
1073 <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if> 1073 <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
1074 - and update_status != "0" 1074 + <if test="createTimeStr != null and createTimeStr != ''"> and create_time >= #{createTimeStr}</if>
  1075 + <if test="createTimeEnd != null and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
  1076 + <if test="historyId != null and historyId != ''"> and history_id is not null</if>
  1077 + <if test="updateStatus != null and updateStatus != ''"> and update_status #{updateStatus}</if>
1075 </where> 1078 </where>
1076 </select> 1079 </select>
1077 1080
@@ -1178,6 +1181,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1178,6 +1181,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1178 <if test="lineUpdateType != null">line_update_type,</if> 1181 <if test="lineUpdateType != null">line_update_type,</if>
1179 <if test="revenueType != null">revenue_type,</if> 1182 <if test="revenueType != null">revenue_type,</if>
1180 <if test="updateStatus != null">update_status,</if> 1183 <if test="updateStatus != null">update_status,</if>
  1184 + <if test="historyId != null">history_id,</if>
1181 create_time, 1185 create_time,
1182 </trim> 1186 </trim>
1183 <trim prefix="values (" suffix=")" suffixOverrides=","> 1187 <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -1262,6 +1266,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1262,6 +1266,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1262 <if test="lineUpdateType != null">#{lineUpdateType},</if> 1266 <if test="lineUpdateType != null">#{lineUpdateType},</if>
1263 <if test="revenueType != null">#{revenueType},</if> 1267 <if test="revenueType != null">#{revenueType},</if>
1264 <if test="updateStatus != null">#{updateStatus},</if> 1268 <if test="updateStatus != null">#{updateStatus},</if>
  1269 + <if test="historyId != null">#{historyId},</if>
1265 sysdate(), 1270 sysdate(),
1266 </trim> 1271 </trim>
1267 </insert> 1272 </insert>
@@ -1516,7 +1521,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1516,7 +1521,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1516 <where> 1521 <where>
1517 <if test="eventId != null "> and event_id = #{eventId}</if> 1522 <if test="eventId != null "> and event_id = #{eventId}</if>
1518 <if test="lineId != null "> and line_id = #{lineId}</if> 1523 <if test="lineId != null "> and line_id = #{lineId}</if>
1519 - <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if> 1524 + <if test="lineName != null and lineName != ''"> line_name= #{lineName}</if>
1520 <if test="company != null and company != ''"> and company = #{company}</if> 1525 <if test="company != null and company != ''"> and company = #{company}</if>
1521 <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if> 1526 <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>
1522 <if test="pLineId != null "> and p_line_id = #{pLineId}</if> 1527 <if test="pLineId != null "> and p_line_id = #{pLineId}</if>
@@ -1621,7 +1626,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1621,7 +1626,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1621 <where> 1626 <where>
1622 <if test="eventId != null "> and event_id = #{eventId}</if> 1627 <if test="eventId != null "> and event_id = #{eventId}</if>
1623 <if test="lineId != null "> and line_id = #{lineId}</if> 1628 <if test="lineId != null "> and line_id = #{lineId}</if>
1624 - <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if> 1629 + <if test="lineName != null and lineName != ''"> and line_name= #{lineName}</if>
1625 <if test="company != null and company != ''"> and company = #{company}</if> 1630 <if test="company != null and company != ''"> and company = #{company}</if>
1626 <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if> 1631 <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>
1627 <if test="pLineId != null "> and p_line_id = #{pLineId}</if> 1632 <if test="pLineId != null "> and p_line_id = #{pLineId}</if>
@@ -1711,7 +1716,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1711,7 +1716,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1711 select bsth_t_line.*,bsth_t_line_examine.examine_status from bsth_t_line left join bsth_t_line_examine 1716 select bsth_t_line.*,bsth_t_line_examine.examine_status from bsth_t_line left join bsth_t_line_examine
1712 on bsth_t_line.line_name=bsth_t_line_examine.line_name 1717 on bsth_t_line.line_name=bsth_t_line_examine.line_name
1713 <where> 1718 <where>
1714 - <if test="lineName != null and lineName != ''"> and bsth_t_line.line_name like concat('%', #{lineName}, '%')</if> 1719 + <if test="lineName != null and lineName != ''"> bsth_t_line.line_name= #{lineName}</if>
1715 <if test="company != null and company != ''"> and bsth_t_line.company = #{company}</if> 1720 <if test="company != null and company != ''"> and bsth_t_line.company = #{company}</if>
1716 <if test="fCompany != null and fCompany != ''"> and bsth_t_line.f_company = #{fCompany}</if> 1721 <if test="fCompany != null and fCompany != ''"> and bsth_t_line.f_company = #{fCompany}</if>
1717 </where> 1722 </where>
@@ -1726,5 +1731,52 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1726,5 +1731,52 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1726 1731
1727 </select> 1732 </select>
1728 1733
  1734 + <select id="selectBsthTLineHistory" parameterType="BsthTLine" resultMap="BsthTLineResult">
  1735 + <include refid="selectBsthTLineHistoryVo" />
  1736 + <where>
  1737 + <if test="lineName != null and lineName != ''"> and line_name = #{lineName}</if>
  1738 + <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus}</if>
  1739 + </where>
  1740 + </select>
  1741 +
  1742 + <select id="getLineHistoryReport" parameterType="BsthTLine" resultType="com.ruoyi.project.system.line.domain.LineHistoryReport">
  1743 + SELECT h1.id id,h1.line_name lineName,h1.company company,h1.f_company fCompany,h1.p_line_id pLineId,
  1744 + h1.service_type serviceType,h1.line_level lineLevel,h1.line_type lineType,h1.district district,
  1745 + h1.inout_district inoutDistrict,h1.service_state serviceState,h1.bus_type busType,h1.air_conditioner_type airConditionerType,
  1746 + h1.sell_ticket_type sellTicketType,h1.service_time serviceTime,h1.line_distance lineDistance,h1.line_code lineCode,
  1747 + h1.warrant_year warrantYear,h1.warrant_start_time warrantStartTime,h1.warrant_end_time warrantEndTime,
  1748 + h1.plan_cancel_time planCancelTime,h1.cancel_time cancelTime,h1.cancel_reason cancelReason,h1.remark remark,
  1749 + h1.time_schedule timeSchedule,h1.park park,h1.is_warrant isWarrant,h1.isWarrant_start_time isWarrantStartTime,
  1750 + h1.isWarrant_end_time isWarrantEndTime,h1.road_type roadType,h1.ticket_price ticketPrice,h1.first_station firstStation,
  1751 + h1.start_end startEnd,h1.first_time firstTime, h1.last_station lastStation, h1.last_time lastTime, h1.mileage_up mileageUp,
  1752 + h1.mileage_down mileageDown,h1.average_mileage averageMileage,h1.station_up stationUp,h1.station_down stationDown,
  1753 + h1.travel_time_up travelTimeUp,h1.travel_time_down travelTimeDown,h1.travel_interval_up travelIntervalUp,
  1754 + h1.travel_interval_down travelIntervalDown,h1.warrant_vehicles_large warrantVehiclesLarge,h1.warrant_vehicles_middle warrantVehiclesMiddle,
  1755 + h1.vehicles_number vehiclesNumber,h1.number_vehicles_large numberVehiclesLarge,h1.number_vehicles_middle numberVehiclesMiddle,
  1756 + h1.car_plate carPlate,h1.number_person numberPerson,h1.number_person_driver numberPersonDriver,h1.number_person_sales numberPersonSales,
  1757 + h1.bus_ev_number busEvNumber,h1.directions directions,h1.number_of_manage numberOfManage,h1.halfway_station halfwayStation,
  1758 + h1.full_customer_percent fullCustomerPercent,h1.low_customer_percent lowCustomerPercent,h1.divide_level divideLevel,
  1759 + h1.has_timelists hasTimelists,h1.is_metro isMetro,h1.metro_time metroTime,h1.cold_bonus_type coldBonusType,h1.night_parking nightParking,h1.start_date startDate,
  1760 + h1.line_update_type lineUpdateType,h1.revenue_type revenueType,
  1761 + h2.id idOld,h2.line_name lineNameOld,h2.company companyOld,h2.f_company fCompanyOld,h2.p_line_id pLineIdOld,
  1762 + h2.service_type serviceTypeOld,h2.line_level lineLevelOld,h2.line_type lineTypeOld,h2.district districtOld,
  1763 + h2.inout_district inoutDistrictOld,h2.service_state serviceStateOld,h2.bus_type busTypeOld,h2.air_conditioner_type airConditionerTypeOld,
  1764 + h2.sell_ticket_type sellTicketTypeOld,h2.service_time serviceTimeOld,h2.line_distance lineDistanceOld,h2.line_code lineCodeOld,
  1765 + h2.warrant_year warrantYearOld,h2.warrant_start_time warrantStartTimeOld,h2.warrant_end_time warrantEndTimeOld,
  1766 + h2.plan_cancel_time planCancelTimeOld,h2.cancel_time cancelTimeOld,h2.cancel_reason cancelReasonOld,h2.remark remarkOld,
  1767 + h2.time_schedule timeScheduleOld,h2.park parkOld,h2.is_warrant isWarrantOld,h2.isWarrant_start_time isWarrantStartTimeOld,
  1768 + h2.isWarrant_end_time isWarrantEndTimeOld,h2.road_type roadTypeOld,h2.ticket_price ticketPriceOld,h2.first_station firstStationOld,
  1769 + h2.start_end startEndOld,h2.first_time firstTimeOld, h2.last_station lastStationOld, h2.last_time lastTimeOld, h2.mileage_up mileageUpOld,
  1770 + h2.mileage_down mileageDownOld,h2.average_mileage averageMileageOld,h2.station_up stationUpOld,h2.station_down stationDownOld,
  1771 + h2.travel_time_up travelTimeUpOld,h2.travel_time_down travelTimeDownOld,h2.travel_interval_up travelIntervalUpOld,
  1772 + h2.travel_interval_down travelIntervalDownOld,h2.warrant_vehicles_large warrantVehiclesLargeOld,h2.warrant_vehicles_middle warrantVehiclesMiddleOld,
  1773 + h2.vehicles_number vehiclesNumberOld,h2.number_vehicles_large numberVehiclesLargeOld,h2.number_vehicles_middle numberVehiclesMiddleOld,
  1774 + h2.car_plate carPlateOld,h2.number_person numberPersonOld,h2.number_person_driver numberPersonDriverOld,h2.number_person_sales numberPersonSalesOld,
  1775 + h2.bus_ev_number busEvNumberOld,h2.directions directionsOld,h2.number_of_manage numberOfManageOld,h2.halfway_station halfwayStationOld,
  1776 + h2.full_customer_percent fullCustomerPercentOld,h2.low_customer_percent lowCustomerPercentOld,h2.divide_level divideLevelOld,
  1777 + h2.has_timelists hasTimelistsOld,h2.is_metro isMetroOld,h2.metro_time metroTimeOld,h2.cold_bonus_type coldBonusTypeOld,h2.night_parking nightParkingOld,h2.start_date startDateOld,
  1778 + h2.line_update_type lineUpdateTypeOld,h2.revenue_type revenueTypeOld
  1779 + FROM bsth_t_line_history h1 LEFT JOIN bsth_t_line_history h2 on h1.history_id=h2.id where h1.history_id is not null
  1780 + </select>
1729 1781
1730 </mapper> 1782 </mapper>
1731 \ No newline at end of file 1783 \ No newline at end of file
bsthLineProfiles/src/main/resources/templates/system/historyReport/historyReport.html
  View file @4be3425
@@ -113,34 +113,18 @@ @@ -113,34 +113,18 @@
113 } 113 }
114 }, 114 },
115 { 115 {
116 - field: 'lineDistanceBefore',  
117 - title: '原线路长度'  
118 - },  
119 - {  
120 field: 'lineDistance', 116 field: 'lineDistance',
121 title: '线路长度' 117 title: '线路长度'
122 }, 118 },
123 { 119 {
124 - field: 'startEndBefore',  
125 - title: '原起讫站'  
126 - },  
127 - {  
128 field: 'startEnd', 120 field: 'startEnd',
129 title: '起讫站' 121 title: '起讫站'
130 }, 122 },
131 { 123 {
132 - field: 'vehiclesNumberBefore',  
133 - title: '原配车数'  
134 - },  
135 - {  
136 field: 'vehiclesNumber', 124 field: 'vehiclesNumber',
137 title: '实际配车数' 125 title: '实际配车数'
138 }, 126 },
139 { 127 {
140 - field: 'numberPersonBefore',  
141 - title: '原配人数'  
142 - },  
143 - {  
144 field: 'numberPerson', 128 field: 'numberPerson',
145 title: '线路总配人数' 129 title: '线路总配人数'
146 },{ 130 },{