youxiw2000 / bsthLineProfiles · Commits

Commit b2cf3450b97676cda0c5919efe1f08ad11db21dd

Authored by yiming
1 parent 7556340d
build: skipped

bf

Inline Side-by-side
Showing 23 changed files with 21 additions and 807 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/monitor/job/task/RyTask.java
  View file @b2cf345
@@ -35,14 +35,7 @@ public class RyTask { @@ -35,14 +35,7 @@ public class RyTask {
35 public void ryParams(String params) { 35 public void ryParams(String params) {
36 System.out.println("执行有参方法：" + params); 36 System.out.println("执行有参方法：" + params);
37 } 37 }
38 -  
39 - public void autoUpdateHistory() {  
40 38
41 - System.out.println("autoUpdateHistory");  
42 - lineService.findNeedUpdateHistory();  
43 -  
44 -  
45 - }  
46 39
47 public void compareLineData() { 40 public void compareLineData() {
48 String data = HttpUtils.sendGet("http://180.167.126.126:18991/prod-api/service/interfact/all", ""); 41 String data = HttpUtils.sendGet("http://180.167.126.126:18991/prod-api/service/interfact/all", "");
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
  View file @b2cf345
@@ -105,7 +105,7 @@ public class BsthTLineAddController extends BaseController @@ -105,7 +105,7 @@ public class BsthTLineAddController extends BaseController
105 if(!bsthTLineService.lineNameIsExistInBsthTLine(bsthTLine.getLineName())){ 105 if(!bsthTLineService.lineNameIsExistInBsthTLine(bsthTLine.getLineName())){
106 AjaxResult ajaxResult=new AjaxResult(); 106 AjaxResult ajaxResult=new AjaxResult();
107 ajaxResult.put("code","96"); 107 ajaxResult.put("code","96");
108 - ajaxResult.put("msg","线路已存"); 108 + ajaxResult.put("msg","线路已存在");
109 return ajaxResult; 109 return ajaxResult;
110 } 110 }
111 //不存在新增 111 //不存在新增
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @b2cf345
@@ -162,10 +162,6 @@ public class BsthTLine extends BaseEntity @@ -162,10 +162,6 @@ public class BsthTLine extends BaseEntity
162 @Excel(name = "首站") 162 @Excel(name = "首站")
163 private String firstStation; 163 private String firstStation;
164 164
165 - /** 起讫站 */  
166 - @Excel(name = "起讫站")  
167 - private String startEnd;  
168 -  
169 /** 首站时间 */ 165 /** 首站时间 */
170 @Excel(name = "首站时间") 166 @Excel(name = "首站时间")
171 private String firstTime; 167 private String firstTime;
@@ -636,15 +632,7 @@ public class BsthTLine extends BaseEntity @@ -636,15 +632,7 @@ public class BsthTLine extends BaseEntity
636 { 632 {
637 return firstStation; 633 return firstStation;
638 } 634 }
639 - public void setStartEnd(String startEnd)  
640 - {  
641 - this.startEnd = startEnd;  
642 - }  
643 635
644 - public String getStartEnd()  
645 - {  
646 - return startEnd;  
647 - }  
648 public void setFirstTime(String firstTime) 636 public void setFirstTime(String firstTime)
649 { 637 {
650 this.firstTime = firstTime; 638 this.firstTime = firstTime;
@@ -1205,7 +1193,6 @@ public class BsthTLine extends BaseEntity @@ -1205,7 +1193,6 @@ public class BsthTLine extends BaseEntity
1205 ", roadType='" + roadType + '\'' + 1193 ", roadType='" + roadType + '\'' +
1206 ", ticketPrice='" + ticketPrice + '\'' + 1194 ", ticketPrice='" + ticketPrice + '\'' +
1207 ", firstStation='" + firstStation + '\'' + 1195 ", firstStation='" + firstStation + '\'' +
1208 - ", startEnd='" + startEnd + '\'' +  
1209 ", firstTime='" + firstTime + '\'' + 1196 ", firstTime='" + firstTime + '\'' +
1210 ", lastStation='" + lastStation + '\'' + 1197 ", lastStation='" + lastStation + '\'' +
1211 ", lastTime='" + lastTime + '\'' + 1198 ", lastTime='" + lastTime + '\'' +
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineEditReport.java deleted 100644 → 0
  View file @7556340
1 -package com.ruoyi.project.system.line.domain;  
2 -  
3 -import java.util.Date;  
4 -import com.fasterxml.jackson.annotation.JsonFormat;  
5 -import org.apache.commons.lang3.builder.ToStringBuilder;  
6 -import org.apache.commons.lang3.builder.ToStringStyle;  
7 -import com.ruoyi.framework.aspectj.lang.annotation.Excel;  
8 -import com.ruoyi.framework.web.domain.BaseEntity;  
9 -  
10 -/**  
11 - * 【请填写功能名称】对象 bsth_t_line  
12 - *  
13 - * @author ruoyi  
14 - * @date 2021-08-17  
15 - */  
16 -public class LineEditReport extends BaseEntity  
17 -{  
18 - private static final long serialVersionUID = 1L;  
19 -  
20 - private Long id;  
21 - @Excel(name = "线路名称")  
22 - private String lineName;  
23 -  
24 - @Excel(name = "公司名称")  
25 - private String company;  
26 -  
27 - @Excel(name = "线路长度")  
28 - private String lineDistance;  
29 -  
30 - @Excel(name = "原线路长度")  
31 - private String lineDistanceBefore;  
32 -  
33 - @Excel(name = "起讫站")  
34 - private String startEnd;  
35 -  
36 - @Excel(name = "原起讫站")  
37 - private String startEndBefore;  
38 -  
39 - @Excel(name = "实际配车数")  
40 - private Long vehiclesNumber;  
41 -  
42 - @Excel(name = "原配车数")  
43 - private Long vehiclesNumberBefore;  
44 -  
45 - @Excel(name = "线路总配人数")  
46 - private Long numberPerson;  
47 -  
48 - @Excel(name = "原配人数")  
49 - private Long numberPersonBefore;  
50 -  
51 - @Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd")  
52 - private Date startDate;  
53 -  
54 - @Excel(name = "线路性质")  
55 - private String lineUpdateType;  
56 -  
57 - public Long getId() {  
58 - return id;  
59 - }  
60 -  
61 - public void setId(Long id) {  
62 - this.id = id;  
63 - }  
64 -  
65 - public String getLineName() {  
66 - return lineName;  
67 - }  
68 -  
69 - public void setLineName(String lineName) {  
70 - this.lineName = lineName;  
71 - }  
72 -  
73 - public String getCompany() {  
74 - return company;  
75 - }  
76 -  
77 - public void setCompany(String company) {  
78 - this.company = company;  
79 - }  
80 -  
81 - public String getLineDistance() {  
82 - return lineDistance;  
83 - }  
84 -  
85 - public void setLineDistance(String lineDistance) {  
86 - this.lineDistance = lineDistance;  
87 - }  
88 -  
89 - public String getLineDistanceBefore() {  
90 - return lineDistanceBefore;  
91 - }  
92 -  
93 - public void setLineDistanceBefore(String lineDistanceBefore) {  
94 - this.lineDistanceBefore = lineDistanceBefore;  
95 - }  
96 -  
97 - public String getStartEnd() {  
98 - return startEnd;  
99 - }  
100 -  
101 - public void setStartEnd(String startEnd) {  
102 - this.startEnd = startEnd;  
103 - }  
104 -  
105 - public String getStartEndBefore() {  
106 - return startEndBefore;  
107 - }  
108 -  
109 - public void setStartEndBefore(String startEndBefore) {  
110 - this.startEndBefore = startEndBefore;  
111 - }  
112 -  
113 - public Long getVehiclesNumber() {  
114 - return vehiclesNumber;  
115 - }  
116 -  
117 - public void setVehiclesNumber(Long vehiclesNumber) {  
118 - this.vehiclesNumber = vehiclesNumber;  
119 - }  
120 -  
121 - public Long getVehiclesNumberBefore() {  
122 - return vehiclesNumberBefore;  
123 - }  
124 -  
125 - public void setVehiclesNumberBefore(Long vehiclesNumberBefore) {  
126 - this.vehiclesNumberBefore = vehiclesNumberBefore;  
127 - }  
128 -  
129 - public Long getNumberPerson() {  
130 - return numberPerson;  
131 - }  
132 -  
133 - public void setNumberPerson(Long numberPerson) {  
134 - this.numberPerson = numberPerson;  
135 - }  
136 -  
137 - public Long getNumberPersonBefore() {  
138 - return numberPersonBefore;  
139 - }  
140 -  
141 - public void setNumberPersonBefore(Long numberPersonBefore) {  
142 - this.numberPersonBefore = numberPersonBefore;  
143 - }  
144 -  
145 - public Date getStartDate() {  
146 - return startDate;  
147 - }  
148 -  
149 - public void setStartDate(Date startDate) {  
150 - this.startDate = startDate;  
151 - }  
152 -  
153 - public String getLineUpdateType() {  
154 - return lineUpdateType;  
155 - }  
156 -  
157 - public void setLineUpdateType(String lineUpdateType) {  
158 - this.lineUpdateType = lineUpdateType;  
159 - }  
160 -  
161 - public static long getSerialversionuid() {  
162 - return serialVersionUID;  
163 - }  
164 -  
165 -  
166 -}  
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
  View file @b2cf345
@@ -200,10 +200,6 @@ public class LineHistoryReport extends BaseEntity @@ -200,10 +200,6 @@ public class LineHistoryReport extends BaseEntity
200 @Excel(name = "原首站") 200 @Excel(name = "原首站")
201 private String firstStationOld; 201 private String firstStationOld;
202 202
203 - @Excel(name = "起讫站")  
204 - private String startEnd;  
205 - @Excel(name = "原起讫站")  
206 - private String startEndOld;  
207 203
208 @Excel(name = "首站时间") 204 @Excel(name = "首站时间")
209 private String firstTime; 205 private String firstTime;
@@ -887,21 +883,6 @@ public class LineHistoryReport extends BaseEntity @@ -887,21 +883,6 @@ public class LineHistoryReport extends BaseEntity
887 this.firstStationOld = firstStationOld; 883 this.firstStationOld = firstStationOld;
888 } 884 }
889 885
890 - public String getStartEnd() {  
891 - return startEnd;  
892 - }  
893 -  
894 - public void setStartEnd(String startEnd) {  
895 - this.startEnd = startEnd;  
896 - }  
897 -  
898 - public String getStartEndOld() {  
899 - return startEndOld;  
900 - }  
901 -  
902 - public void setStartEndOld(String startEndOld) {  
903 - this.startEndOld = startEndOld;  
904 - }  
905 886
906 public String getFirstTime() { 887 public String getFirstTime() {
907 return firstTime; 888 return firstTime;
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
  View file @b2cf345
@@ -4,7 +4,6 @@ import java.util.List; @@ -4,7 +4,6 @@ import java.util.List;
4 import java.util.Map; 4 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;  
8 import com.ruoyi.project.system.line.domain.LineHistoryReport; 7 import com.ruoyi.project.system.line.domain.LineHistoryReport;
9 import org.apache.ibatis.annotations.Mapper; 8 import org.apache.ibatis.annotations.Mapper;
10 9
@@ -60,9 +59,6 @@ public interface BsthTLineMapper @@ -60,9 +59,6 @@ public interface BsthTLineMapper
60 59
61 BsthTLine selectHistoryByLineNameAndUpdateStatus(BsthTLine bsthTLine); 60 BsthTLine selectHistoryByLineNameAndUpdateStatus(BsthTLine bsthTLine);
62 61
63 - int insertLineEditRepot(LineEditReport lineEditReport);  
64 -  
65 - List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport);  
66 62
67 List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object); 63 List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object);
68 64
@@ -72,7 +68,6 @@ public interface BsthTLineMapper @@ -72,7 +68,6 @@ public interface BsthTLineMapper
72 68
73 int deleteBsthTLineHistoryById(Long id); 69 int deleteBsthTLineHistoryById(Long id);
74 70
75 - /*int createLineMonthReport(BsthTLine line);*/  
76 71
77 List<Map> selectCompany(); 72 List<Map> selectCompany();
78 73
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
  View file @b2cf345
@@ -3,9 +3,7 @@ package com.ruoyi.project.system.line.service; @@ -3,9 +3,7 @@ package com.ruoyi.project.system.line.service;
3 import java.util.List; 3 import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
5 5
6 -import com.alibaba.fastjson.JSONArray;  
7 import com.ruoyi.project.system.line.domain.BsthTLine; 6 import com.ruoyi.project.system.line.domain.BsthTLine;
8 -import com.ruoyi.project.system.line.domain.LineEditReport;  
9 import com.ruoyi.project.system.line.domain.LineHistoryReport; 7 import com.ruoyi.project.system.line.domain.LineHistoryReport;
10 8
11 /** 9 /**
@@ -31,13 +29,10 @@ public interface IBsthTLineService @@ -31,13 +29,10 @@ public interface IBsthTLineService
31 29
32 BsthTLine selectBsthTLineHistoryById(Long id); 30 BsthTLine selectBsthTLineHistoryById(Long id);
33 31
34 - int updateToLineInfo(String rows);  
35 32
36 - void findNeedUpdateHistory();  
37 33
38 List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare); 34 List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare);
39 35
40 - List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport);  
41 36
42 List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object); 37 List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object);
43 38
@@ -73,5 +68,4 @@ public interface IBsthTLineService @@ -73,5 +68,4 @@ public interface IBsthTLineService
73 68
74 List<LineHistoryReport>getLineHistoryReport(BsthTLine bsthTLine); 69 List<LineHistoryReport>getLineHistoryReport(BsthTLine bsthTLine);
75 70
76 - /*int createLineMonthReport();*/  
77 } 71 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
  View file @b2cf345
1 package com.ruoyi.project.system.line.service.impl; 1 package com.ruoyi.project.system.line.service.impl;
2 2
3 -import java.time.LocalDateTime;  
4 -import java.time.ZoneId;  
5 -import java.time.format.DateTimeFormatter;  
6 import java.util.*; 3 import java.util.*;
7 import java.util.stream.Collectors; 4 import java.util.stream.Collectors;
8 5
9 -import com.ruoyi.common.utils.DateUtils;  
10 -import com.ruoyi.common.utils.security.ShiroUtils;  
11 -  
12 import com.ruoyi.project.system.line.domain.LineHistoryReport; 6 import com.ruoyi.project.system.line.domain.LineHistoryReport;
13 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Service; 8 import org.springframework.stereotype.Service;
@@ -16,9 +10,7 @@ import org.springframework.transaction.annotation.Transactional; @@ -16,9 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
16 10
17 import com.ruoyi.project.system.line.mapper.BsthTLineMapper; 11 import com.ruoyi.project.system.line.mapper.BsthTLineMapper;
18 import com.ruoyi.project.system.line.domain.BsthTLine; 12 import com.ruoyi.project.system.line.domain.BsthTLine;
19 -import com.ruoyi.project.system.line.domain.LineEditReport;  
20 import com.ruoyi.project.system.line.service.IBsthTLineService; 13 import com.ruoyi.project.system.line.service.IBsthTLineService;
21 -import com.ruoyi.project.system.user.domain.User;  
22 import com.ruoyi.common.utils.text.Convert; 14 import com.ruoyi.common.utils.text.Convert;
23 15
24 /** 16 /**
@@ -96,215 +88,13 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -96,215 +88,13 @@ public class BsthTLineServiceImpl implements IBsthTLineService
96 return bsthTLineMapper.selectBsthTLineHistoryById(id); 88 return bsthTLineMapper.selectBsthTLineHistoryById(id);
97 } 89 }
98 90
99 - /*@Override  
100 - public int createLineMonthReport() {  
101 -  
102 - List<BsthTLine> list = bsthTLineMapper.selectBsthTLineList(null);  
103 -  
104 - Date d = new Date();  
105 -  
106 - d.setDate(d.getDate()-1);  
107 -  
108 - int count = 0;  
109 - for(BsthTLine line :list) {  
110 - line.setCreateTime(d);  
111 - line.setCreateBy("system");  
112 - bsthTLineMapper.createLineMonthReport(line);  
113 - count++;  
114 - }  
115 -  
116 - return count;  
117 - }*/  
118 -  
119 -  
120 -  
121 - @Override  
122 - public void findNeedUpdateHistory() {  
123 -  
124 -  
125 -  
126 - List<BsthTLine> list = bsthTLineMapper.findNeedUpdateHistory();  
127 -  
128 - if(list.size() > 0) {  
129 - String ids = "";  
130 -  
131 - for(BsthTLine line:list) {  
132 - ids+= line.getId() + ",";  
133 - }  
134 -  
135 - updateToLineInfo(ids.substring(0,ids.length()-1));  
136 - }  
137 -  
138 - }  
139 -  
140 -/*  
141 - @Override  
142 - @Transactional  
143 - public int updateToLineInfo(String ids) {  
144 - String[] idarray = ids.split(",");  
145 -  
146 - List<BsthTLine > historys = bsthTLineMapper.selectBsthTLineHistoryByIds(idarray);  
147 -  
148 - String[] names = new String[historys.size()];  
149 -  
150 - for(int i =0;i < historys.size();i++) {  
151 - names[i] = historys.get(i).getLineName();  
152 - }  
153 -  
154 - List<BsthTLine > lines = bsthTLineMapper.selectBsthTLineByNames(names);  
155 -  
156 - if(lines.size() != historys.size()) {  
157 - return 0;  
158 - }  
159 -  
160 - Map<String,LineEditReport> reportList = new HashMap<String,LineEditReport>();  
161 -  
162 - for(int i =0;i < lines.size();i++) {  
163 -  
164 - if(reportList.get(lines.get(i).getLineName()) == null) {  
165 - reportList.put(lines.get(i).getLineName(), new LineEditReport());  
166 - }  
167 - if(reportList.get(historys.get(i).getLineName()) == null) {  
168 - reportList.put(historys.get(i).getLineName(), new LineEditReport());  
169 - }  
170 -  
171 - reportList.get(lines.get(i).getLineName()).setLineDistanceBefore(lines.get(i).getLineDistance());  
172 - reportList.get(lines.get(i).getLineName()).setNumberPersonBefore(lines.get(i).getNumberPerson());  
173 - reportList.get(lines.get(i).getLineName()).setStartEndBefore(lines.get(i).getStartEnd());  
174 - reportList.get(lines.get(i).getLineName()).setVehiclesNumberBefore(lines.get(i).getVehiclesNumber());  
175 - reportList.get(lines.get(i).getLineName()).setCompany(lines.get(i).getCompany());  
176 - reportList.get(lines.get(i).getLineName()).setLineName(lines.get(i).getLineName());  
177 - reportList.get(historys.get(i).getLineName()).setLineDistance(historys.get(i).getLineDistance());  
178 - reportList.get(historys.get(i).getLineName()).setNumberPerson(historys.get(i).getNumberPerson());  
179 - reportList.get(historys.get(i).getLineName()).setStartEnd(historys.get(i).getStartEnd());  
180 - reportList.get(historys.get(i).getLineName()).setVehiclesNumber(historys.get(i).getVehiclesNumber());  
181 - reportList.get(historys.get(i).getLineName()).setLineUpdateType(historys.get(i).getLineUpdateType());  
182 - reportList.get(historys.get(i).getLineName()).setCreateTime(historys.get(i).getCreateTime());  
183 - reportList.get(historys.get(i).getLineName()).setStartDate(historys.get(i).getStartDate());  
184 -  
185 -  
186 - BsthTLine line = bsthTLineMapper.selectBsthTLineHistoryAndisNeedUpdate(lines.get(i));  
187 - if(line == null) {  
188 - lines.get(i).setUpdateStatus("-1");  
189 - try {  
190 - lines.get(i).setCreateBy(ShiroUtils.getSysUser().getUserName());  
191 - } catch (Exception e) {  
192 - lines.get(i).setCreateBy("System");  
193 - }  
194 -  
195 - bsthTLineMapper.saveEditHistory(lines.get(i));  
196 - }else {  
197 - line.setUpdateStatus("-1");  
198 - bsthTLineMapper.updateBsthTLineHistory(line);  
199 - }  
200 -  
201 -  
202 - Date d = new Date();  
203 - d.setHours(d.getHours() - 1);  
204 -  
205 - historys.get(i).setStartDate(d);  
206 - bsthTLineMapper.updateBsthTLineByLineName(historys.get(i));  
207 - historys.get(i).setUpdateStatus("0");  
208 - bsthTLineMapper.updateBsthTLineHistory(historys.get(i));  
209 - }  
210 -  
211 - for(String key:reportList.keySet()) {  
212 -  
213 - bsthTLineMapper.insertLineEditRepot(reportList.get(key));  
214 -  
215 -  
216 - }  
217 -  
218 -  
219 - return lines.size();  
220 - }  
221 -*/  
222 -  
223 - @Override  
224 - @Transactional  
225 - public int updateToLineInfo(String ids) {  
226 - //查出待更新的数据  
227 - String[] idarray = ids.split(",");  
228 - List<BsthTLine > historys = bsthTLineMapper.selectBsthTLineHistoryByIds(idarray);  
229 - Map<String,List<BsthTLine >> historyMap=historys.stream().collect(Collectors.groupingBy(h->h.getLineName()));  
230 -  
231 - //查出原始数据  
232 - String[] names = new String[historys.size()];  
233 - for(int i =0;i < historys.size();i++) {  
234 - names[i] = historys.get(i).getLineName();  
235 - }  
236 - List<BsthTLine > lines = bsthTLineMapper.selectBsthTLineByNames(names);  
237 - Map<String,List<BsthTLine >> lineMap=lines.stream().collect(Collectors.groupingBy(l->l.getLineName()));  
238 -  
239 - if(lines.size() != historys.size()) {  
240 - return 0;  
241 - }  
242 -  
243 - //记录historyReport  
244 - Map<String,LineEditReport> reportList = new HashMap<>();  
245 - historyMap.forEach((k,v)->{  
246 - BsthTLine history=historyMap.get(k).get(0);  
247 - BsthTLine line=lineMap.get(k).get(0);  
248 -  
249 -  
250 - LineEditReport lineEditReport=new LineEditReport();  
251 - lineEditReport.setCompany(line.getCompany());  
252 - lineEditReport.setLineName(line.getLineName());  
253 - lineEditReport.setLineUpdateType(history.getLineUpdateType());  
254 - lineEditReport.setLineDistanceBefore(line.getLineDistance());  
255 - lineEditReport.setLineDistance(history.getLineDistance());  
256 - lineEditReport.setStartEnd(history.getStartEnd());  
257 - lineEditReport.setStartEndBefore(line.getStartEnd());  
258 - lineEditReport.setVehiclesNumber(history.getVehiclesNumber());  
259 - lineEditReport.setNumberPerson(history.getNumberPerson());  
260 - if(history.getStartDate()==null){  
261 - lineEditReport.setStartDate(initDateByDay());  
262 - }else {  
263 - lineEditReport.setStartDate(history.getStartDate());  
264 - }  
265 - lineEditReport.setCreateTime(history.getCreateTime());  
266 - lineEditReport.setVehiclesNumberBefore(line.getVehiclesNumber());  
267 - lineEditReport.setNumberPersonBefore(line.getNumberPerson());  
268 -  
269 -  
270 - BsthTLine bl=new BsthTLine();  
271 - bl.setLineName(history.getLineName());  
272 - bl.setUpdateStatus("0");  
273 - bl=bsthTLineMapper.selectHistoryByLineNameAndUpdateStatus(bl);  
274 - //修改状态 当前->历史  
275 - bl.setUpdateStatus("-1");  
276 - bsthTLineMapper.updateBsthTLineHistory(bl);  
277 -  
278 -  
279 -  
280 - //更新运营数据  
281 - Date d = new Date();  
282 - d.setHours(d.getHours() - 1);  
283 - history.setStartDate(d);  
284 - bsthTLineMapper.updateBsthTLineByLineName(history);  
285 -  
286 - //把待处理改为当前  
287 - history.setUpdateStatus("0");  
288 - bsthTLineMapper.updateBsthTLineHistory(history);  
289 -  
290 - reportList.put(k,lineEditReport);  
291 - bsthTLineMapper.insertLineEditRepot(lineEditReport);  
292 - });  
293 - return lines.size();  
294 - }  
295 -  
296 -  
297 -  
298 @Override 91 @Override
299 public List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare) { 92 public List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare) {
300 93
301 return bsthTLineMapper.selectHistoryListNotUpdate(compare); 94 return bsthTLineMapper.selectHistoryListNotUpdate(compare);
302 } 95 }
303 96
304 - @Override  
305 - public List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport) {  
306 - return bsthTLineMapper.selectLineEditReportList(lineEditReport);  
307 - } 97 +
308 98
309 @Override 99 @Override
310 public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object) { 100 public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object) {
bsthLineProfiles/src/main/java/com/ruoyi/project/utils/ExcelUtils.java
  View file @b2cf345
@@ -13,165 +13,12 @@ import java.util.List; @@ -13,165 +13,12 @@ import java.util.List;
13 import cn.hutool.core.io.IoUtil; 13 import cn.hutool.core.io.IoUtil;
14 import cn.hutool.poi.excel.ExcelWriter; 14 import cn.hutool.poi.excel.ExcelWriter;
15 import cn.hutool.poi.excel.StyleSet; 15 import cn.hutool.poi.excel.StyleSet;
16 -import org.apache.poi.hssf.usermodel.HSSFCell;  
17 -import org.apache.poi.hssf.usermodel.HSSFRow;  
18 -import org.apache.poi.hssf.usermodel.HSSFSheet;  
19 -import org.apache.poi.hssf.usermodel.HSSFWorkbook;  
20 -import org.apache.poi.poifs.filesystem.POIFSFileSystem;  
21 -  
22 -import com.ruoyi.project.system.line.domain.BsthTLine;  
23 -import com.ruoyi.project.system.line.domain.LineEditReport;  
24 import org.apache.poi.ss.usermodel.*; 16 import org.apache.poi.ss.usermodel.*;
25 -  
26 import javax.servlet.ServletOutputStream; 17 import javax.servlet.ServletOutputStream;
27 import javax.servlet.http.HttpServletResponse; 18 import javax.servlet.http.HttpServletResponse;
28 19
29 public class ExcelUtils { 20 public class ExcelUtils {
30 -  
31 -  
32 - public String excelLineHistoryReport(String templatePath,String outPath,List<LineEditReport> list) {  
33 - try {  
34 - POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(templatePath));  
35 - HSSFWorkbook wb = new HSSFWorkbook(fs);  
36 -  
37 - HSSFSheet sheet = wb.getSheetAt(0);  
38 -  
39 - HSSFRow templateRow = sheet.getRow(2);  
40 -  
41 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");  
42 -  
43 - for (int i = 0; i < list.size(); i++) {  
44 -  
45 - HSSFRow dataRow = sheet.createRow(2 + i);  
46 -  
47 - dataRow.createCell(0);  
48 - dataRow.getCell(0).setCellStyle(templateRow.getCell(0).getCellStyle());  
49 - dataRow.getCell(0).setCellValue(i+1);  
50 -  
51 -  
52 - int idx = 0;  
53 -  
54 - while(templateRow.getCell(idx) != null) {  
55 -  
56 - HSSFCell cell = templateRow.getCell(idx);  
57 -  
58 - if(cell.getStringCellValue() != null && cell.getStringCellValue() != "") {  
59 - HSSFCell dataCell = dataRow.createCell(idx);  
60 -  
61 - dataCell.setCellStyle(cell.getCellStyle());  
62 -  
63 - String name = cell.getStringCellValue().substring(0,1).toUpperCase() + cell.getStringCellValue().substring(1);  
64 -  
65 - Method m = list.get(i).getClass().getMethod("get"+name);  
66 -  
67 -  
68 - Object obj = m.invoke(list.get(i));  
69 -  
70 - if(obj.getClass() == Date.class) {  
71 -  
72 -  
73 - dataCell.setCellValue(sdf.format(obj));  
74 - idx++;  
75 - continue;  
76 - }  
77 -  
78 -  
79 - dataCell.setCellValue(m.invoke(list.get(i)) == null ? "" : m.invoke(list.get(i)) + "");  
80 -  
81 - }  
82 -  
83 - idx++;  
84 -  
85 - }  
86 - }  
87 -  
88 - createFolder(outPath);  
89 -// 输出文件  
90 - FileOutputStream fileOut = new FileOutputStream(outPath);  
91 - wb.write(fileOut);  
92 - fileOut.close();  
93 -  
94 - return outPath;  
95 -  
96 - } catch (Exception e) {  
97 - e.printStackTrace();  
98 - }  
99 -  
100 - return null;  
101 - }  
102 -  
103 - public String excelLineInfoReport(String templatePath,String outPath,List<BsthTLine> list) {  
104 - try {  
105 - POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(templatePath));  
106 - HSSFWorkbook wb = new HSSFWorkbook(fs);  
107 -  
108 - HSSFSheet sheet = wb.getSheetAt(0);  
109 -  
110 - HSSFRow templateRow = sheet.getRow(2);  
111 -  
112 21
113 - for (int i = 0; i < list.size(); i++) {  
114 -  
115 - HSSFRow dataRow = sheet.createRow(2 + i);  
116 -  
117 - dataRow.createCell(0);  
118 - dataRow.getCell(0).setCellStyle(templateRow.getCell(0).getCellStyle());  
119 - dataRow.getCell(0).setCellValue(i+1);  
120 -  
121 - String isCold = "是";  
122 -  
123 - if(list.get(i).getColdBonusType() == null || list.get(i).getColdBonusType().isEmpty()) {  
124 - isCold = "否";  
125 - }  
126 -  
127 - int idx = 0;  
128 -  
129 - while(templateRow.getCell(idx) != null) {  
130 -  
131 - HSSFCell cell = templateRow.getCell(idx);  
132 -  
133 - if(cell.getStringCellValue() != null && cell.getStringCellValue() != "") {  
134 - HSSFCell dataCell = dataRow.createCell(idx);  
135 -  
136 - dataCell.setCellStyle(cell.getCellStyle());  
137 -  
138 - String name = cell.getStringCellValue().substring(0,1).toUpperCase() + cell.getStringCellValue().substring(1);  
139 -  
140 - if(name.equals("IsCold")) {  
141 - dataCell.setCellValue(isCold);  
142 - idx++;  
143 - continue;  
144 - }  
145 -  
146 - Method m = list.get(i).getClass().getMethod("get"+name);  
147 -  
148 - System.out.println(m.invoke(list.get(i)));  
149 -  
150 - dataCell.setCellValue(m.invoke(list.get(i)) == null ? "" : m.invoke(list.get(i)) + "");  
151 -  
152 - }  
153 -  
154 - idx++;  
155 -  
156 - }  
157 -  
158 -  
159 - }  
160 -  
161 - createFolder(outPath);  
162 -// 输出文件  
163 - FileOutputStream fileOut = new FileOutputStream(outPath);  
164 - wb.write(fileOut);  
165 - fileOut.close();  
166 -  
167 - return outPath;  
168 -  
169 - } catch (Exception e) {  
170 - e.printStackTrace();  
171 - }  
172 -  
173 - return null;  
174 - }  
175 22
176 public static void createFolder(String path) { 23 public static void createFolder(String path) {
177 File targetFile = null; 24 File targetFile = null;
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @b2cf345
@@ -45,7 +45,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -45,7 +45,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
45 <result property="roadType" column="road_type" /> 45 <result property="roadType" column="road_type" />
46 <result property="ticketPrice" column="ticket_price" /> 46 <result property="ticketPrice" column="ticket_price" />
47 <result property="firstStation" column="first_station" /> 47 <result property="firstStation" column="first_station" />
48 - <result property="startEnd" column="start_end" />  
49 <result property="firstTime" column="first_time" /> 48 <result property="firstTime" column="first_time" />
50 <result property="lastStation" column="last_station" /> 49 <result property="lastStation" column="last_station" />
51 <result property="lastTime" column="last_time" /> 50 <result property="lastTime" column="last_time" />
@@ -99,16 +98,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -99,16 +98,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
99 </resultMap> 98 </resultMap>
100 99
101 100
102 - <resultMap type="LineEditReport" id="LineEditReportResult"> 101 + <!--<resultMap type="LineEditReport" id="LineEditReportResult">
103 <result property="id" column="id" /> 102 <result property="id" column="id" />
104 <result property="lineName" column="line_name" /> 103 <result property="lineName" column="line_name" />
105 <result property="company" column="company" /> 104 <result property="company" column="company" />
106 <result property="lineDistance" column="line_distance" /> 105 <result property="lineDistance" column="line_distance" />
107 - <result property="startEnd" column="start_end" />  
108 <result property="vehiclesNumber" column="vehicles_number" /> 106 <result property="vehiclesNumber" column="vehicles_number" />
109 <result property="numberPerson" column="number_person" /> 107 <result property="numberPerson" column="number_person" />
110 <result property="lineDistanceBefore" column="line_distance_before" /> 108 <result property="lineDistanceBefore" column="line_distance_before" />
111 - <result property="startEndBefore" column="start_end_before" />  
112 <result property="vehiclesNumberBefore" column="vehicles_number_before" /> 109 <result property="vehiclesNumberBefore" column="vehicles_number_before" />
113 <result property="numberPersonBefore" column="number_person_before" /> 110 <result property="numberPersonBefore" column="number_person_before" />
114 <result property="createTime" column="create_time" /> 111 <result property="createTime" column="create_time" />
@@ -116,7 +113,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -116,7 +113,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
116 <result property="lineUpdateType" column="line_update_type" /> 113 <result property="lineUpdateType" column="line_update_type" />
117 <result property="files" column="files" /> 114 <result property="files" column="files" />
118 </resultMap> 115 </resultMap>
119 - 116 +-->
120 117
121 <sql id="selectBsthTLineVo"> 118 <sql id="selectBsthTLineVo">
122 select * from bsth_t_line 119 select * from bsth_t_line
@@ -130,10 +127,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -130,10 +127,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
130 select * from bsth_t_line_history 127 select * from bsth_t_line_history
131 </sql> 128 </sql>
132 129
133 - <sql id="selectLineEditReportVo">  
134 - select * from bsth_t_line_history_report  
135 - </sql>  
136 -  
137 <select id="selectBsthTLineList" parameterType="BsthTLine" resultMap="BsthTLineResult"> 130 <select id="selectBsthTLineList" parameterType="BsthTLine" resultMap="BsthTLineResult">
138 <include refid="selectBsthTLineVo" /> 131 <include refid="selectBsthTLineVo" />
139 <where> 132 <where>
@@ -170,7 +163,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -170,7 +163,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
170 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if> 163 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
171 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if> 164 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
172 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if> 165 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
173 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
174 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if> 166 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
175 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if> 167 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
176 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if> 168 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
@@ -286,7 +278,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -286,7 +278,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
286 <if test="roadType != null">road_type,</if> 278 <if test="roadType != null">road_type,</if>
287 <if test="ticketPrice != null">ticket_price,</if> 279 <if test="ticketPrice != null">ticket_price,</if>
288 <if test="firstStation != null">first_station,</if> 280 <if test="firstStation != null">first_station,</if>
289 - <if test="startEnd != null">start_end,</if>  
290 <if test="firstTime != null">first_time,</if> 281 <if test="firstTime != null">first_time,</if>
291 <if test="lastStation != null">last_station,</if> 282 <if test="lastStation != null">last_station,</if>
292 <if test="lastTime != null">last_time,</if> 283 <if test="lastTime != null">last_time,</if>
@@ -371,7 +362,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -371,7 +362,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
371 <if test="roadType != null">#{roadType},</if> 362 <if test="roadType != null">#{roadType},</if>
372 <if test="ticketPrice != null">#{ticketPrice},</if> 363 <if test="ticketPrice != null">#{ticketPrice},</if>
373 <if test="firstStation != null">#{firstStation},</if> 364 <if test="firstStation != null">#{firstStation},</if>
374 - <if test="startEnd != null">#{startEnd},</if>  
375 <if test="firstTime != null">#{firstTime},</if> 365 <if test="firstTime != null">#{firstTime},</if>
376 <if test="lastStation != null">#{lastStation},</if> 366 <if test="lastStation != null">#{lastStation},</if>
377 <if test="lastTime != null">#{lastTime},</if> 367 <if test="lastTime != null">#{lastTime},</if>
@@ -463,7 +453,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -463,7 +453,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
463 <if test="roadType != null">road_type = #{roadType},</if> 453 <if test="roadType != null">road_type = #{roadType},</if>
464 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if> 454 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
465 <if test="firstStation != null">first_station = #{firstStation},</if> 455 <if test="firstStation != null">first_station = #{firstStation},</if>
466 - <if test="startEnd != null">start_end = #{startEnd},</if>  
467 <if test="firstTime != null">first_time = #{firstTime},</if> 456 <if test="firstTime != null">first_time = #{firstTime},</if>
468 <if test="lastStation != null">last_station = #{lastStation},</if> 457 <if test="lastStation != null">last_station = #{lastStation},</if>
469 <if test="lastTime != null">last_time = #{lastTime},</if> 458 <if test="lastTime != null">last_time = #{lastTime},</if>
@@ -553,7 +542,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -553,7 +542,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
553 <if test="roadType != null">road_type = #{roadType},</if> 542 <if test="roadType != null">road_type = #{roadType},</if>
554 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if> 543 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
555 <if test="firstStation != null">first_station = #{firstStation},</if> 544 <if test="firstStation != null">first_station = #{firstStation},</if>
556 - <if test="startEnd != null">start_end = #{startEnd},</if>  
557 <if test="firstTime != null">first_time = #{firstTime},</if> 545 <if test="firstTime != null">first_time = #{firstTime},</if>
558 <if test="lastStation != null">last_station = #{lastStation},</if> 546 <if test="lastStation != null">last_station = #{lastStation},</if>
559 <if test="lastTime != null">last_time = #{lastTime},</if> 547 <if test="lastTime != null">last_time = #{lastTime},</if>
@@ -641,7 +629,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -641,7 +629,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
641 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if> 629 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
642 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if> 630 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
643 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if> 631 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
644 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
645 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if> 632 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
646 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if> 633 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
647 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if> 634 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
@@ -732,7 +719,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -732,7 +719,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
732 <if test="roadType != null">road_type,</if> 719 <if test="roadType != null">road_type,</if>
733 <if test="ticketPrice != null">ticket_price,</if> 720 <if test="ticketPrice != null">ticket_price,</if>
734 <if test="firstStation != null">first_station,</if> 721 <if test="firstStation != null">first_station,</if>
735 - <if test="startEnd != null">start_end,</if>  
736 <if test="firstTime != null">first_time,</if> 722 <if test="firstTime != null">first_time,</if>
737 <if test="lastStation != null">last_station,</if> 723 <if test="lastStation != null">last_station,</if>
738 <if test="lastTime != null">last_time,</if> 724 <if test="lastTime != null">last_time,</if>
@@ -819,7 +805,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -819,7 +805,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
819 <if test="roadType != null">#{roadType},</if> 805 <if test="roadType != null">#{roadType},</if>
820 <if test="ticketPrice != null">#{ticketPrice},</if> 806 <if test="ticketPrice != null">#{ticketPrice},</if>
821 <if test="firstStation != null">#{firstStation},</if> 807 <if test="firstStation != null">#{firstStation},</if>
822 - <if test="startEnd != null">#{startEnd},</if>  
823 <if test="firstTime != null">#{firstTime},</if> 808 <if test="firstTime != null">#{firstTime},</if>
824 <if test="lastStation != null">#{lastStation},</if> 809 <if test="lastStation != null">#{lastStation},</if>
825 <if test="lastTime != null">#{lastTime},</if> 810 <if test="lastTime != null">#{lastTime},</if>
@@ -930,7 +915,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -930,7 +915,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
930 <if test="roadType != null">road_type = #{roadType},</if> 915 <if test="roadType != null">road_type = #{roadType},</if>
931 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if> 916 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
932 <if test="firstStation != null">first_station = #{firstStation},</if> 917 <if test="firstStation != null">first_station = #{firstStation},</if>
933 - <if test="startEnd != null">start_end = #{startEnd},</if>  
934 <if test="firstTime != null">first_time = #{firstTime},</if> 918 <if test="firstTime != null">first_time = #{firstTime},</if>
935 <if test="lastStation != null">last_station = #{lastStation},</if> 919 <if test="lastStation != null">last_station = #{lastStation},</if>
936 <if test="lastTime != null">last_time = #{lastTime},</if> 920 <if test="lastTime != null">last_time = #{lastTime},</if>
@@ -1030,7 +1014,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1030,7 +1014,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1030 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if> 1014 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
1031 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if> 1015 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
1032 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if> 1016 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
1033 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
1034 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if> 1017 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
1035 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if> 1018 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
1036 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if> 1019 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
@@ -1139,7 +1122,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1139,7 +1122,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1139 <if test="roadType != null">road_type,</if> 1122 <if test="roadType != null">road_type,</if>
1140 <if test="ticketPrice != null">ticket_price,</if> 1123 <if test="ticketPrice != null">ticket_price,</if>
1141 <if test="firstStation != null">first_station,</if> 1124 <if test="firstStation != null">first_station,</if>
1142 - <if test="startEnd != null">start_end,</if>  
1143 <if test="firstTime != null">first_time,</if> 1125 <if test="firstTime != null">first_time,</if>
1144 <if test="lastStation != null">last_station,</if> 1126 <if test="lastStation != null">last_station,</if>
1145 <if test="lastTime != null">last_time,</if> 1127 <if test="lastTime != null">last_time,</if>
@@ -1226,7 +1208,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1226,7 +1208,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1226 <if test="roadType != null">#{roadType},</if> 1208 <if test="roadType != null">#{roadType},</if>
1227 <if test="ticketPrice != null">#{ticketPrice},</if> 1209 <if test="ticketPrice != null">#{ticketPrice},</if>
1228 <if test="firstStation != null">#{firstStation},</if> 1210 <if test="firstStation != null">#{firstStation},</if>
1229 - <if test="startEnd != null">#{startEnd},</if>  
1230 <if test="firstTime != null">#{firstTime},</if> 1211 <if test="firstTime != null">#{firstTime},</if>
1231 <if test="lastStation != null">#{lastStation},</if> 1212 <if test="lastStation != null">#{lastStation},</if>
1232 <if test="lastTime != null">#{lastTime},</if> 1213 <if test="lastTime != null">#{lastTime},</if>
@@ -1317,7 +1298,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1317,7 +1298,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1317 <if test="roadType != null">road_type = #{roadType},</if> 1298 <if test="roadType != null">road_type = #{roadType},</if>
1318 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if> 1299 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
1319 <if test="firstStation != null">first_station = #{firstStation},</if> 1300 <if test="firstStation != null">first_station = #{firstStation},</if>
1320 - <if test="startEnd != null">start_end = #{startEnd},</if>  
1321 <if test="firstTime != null">first_time = #{firstTime},</if> 1301 <if test="firstTime != null">first_time = #{firstTime},</if>
1322 <if test="lastStation != null">last_station = #{lastStation},</if> 1302 <if test="lastStation != null">last_station = #{lastStation},</if>
1323 <if test="lastTime != null">last_time = #{lastTime},</if> 1303 <if test="lastTime != null">last_time = #{lastTime},</if>
@@ -1404,7 +1384,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1404,7 +1384,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1404 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if> 1384 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
1405 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if> 1385 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
1406 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if> 1386 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
1407 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
1408 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if> 1387 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
1409 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if> 1388 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
1410 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if> 1389 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
@@ -1467,62 +1446,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1467,62 +1446,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1467 </select> 1446 </select>
1468 1447
1469 1448
1470 - <insert id="insertLineEditRepot" parameterType="LineEditReport"  
1471 - useGeneratedKeys="true" keyProperty="id">  
1472 - insert into bsth_t_line_history_report  
1473 - <trim prefix="(" suffix=")" suffixOverrides=",">  
1474 - <if test="lineName != null">line_name,</if>  
1475 - <if test="company != null">company,</if>  
1476 - <if test="lineDistance != null">line_distance,</if>  
1477 - <if test="startEnd != null">start_end,</if>  
1478 - <if test="vehiclesNumber != null">vehicles_number,</if>  
1479 - <if test="numberPerson != null">number_person,</if>  
1480 - <if test="lineDistanceBefore != null">line_distance_before,</if>  
1481 - <if test="startEndBefore != null">start_end_before,</if>  
1482 - <if test="vehiclesNumberBefore != null">vehicles_number_before,</if>  
1483 - <if test="numberPersonBefore != null">number_person_before,</if>  
1484 - <if test="createTime != null">create_time,</if>  
1485 - <if test="startDate != null">start_date,</if>  
1486 - <if test="lineUpdateType != null">line_update_type,</if>  
1487 - </trim>  
1488 - <trim prefix="values (" suffix=")" suffixOverrides=",">  
1489 - <if test="lineName != null">#{lineName},</if>  
1490 - <if test="company != null">#{company},</if>  
1491 - <if test="lineDistance != null">#{lineDistance},</if>  
1492 - <if test="startEnd != null">#{startEnd},</if>  
1493 - <if test="vehiclesNumber != null">#{vehiclesNumber},</if>  
1494 - <if test="numberPerson != null">#{numberPerson},</if>  
1495 - <if test="lineDistanceBefore != null">#{lineDistanceBefore},</if>  
1496 - <if test="startEndBefore != null">#{startEndBefore},</if>  
1497 - <if test="vehiclesNumberBefore != null">#{vehiclesNumberBefore},</if>  
1498 - <if test="numberPersonBefore != null">#{numberPersonBefore},</if>  
1499 - <if test="createTime != null">#{createTime},</if>  
1500 - <if test="startDate != null">#{startDate},</if>  
1501 - <if test="lineUpdateType != null">#{lineUpdateType},</if>  
1502 - </trim>  
1503 - </insert>  
1504 -  
1505 -  
1506 - <select id="selectLineEditReportList" parameterType="LineEditReport"  
1507 - resultMap="LineEditReportResult">  
1508 - <include refid="selectLineEditReportVo" />  
1509 - <where>  
1510 - <if test="lineName != null and lineName != ''">and line_name like concat('%', #{lineName}, '%') </if>  
1511 - <if test="company != null and company != ''">and company = #{company}</if>  
1512 - <if test="lineDistance != null and lineDistance != ''">and line_distance = #{lineDistance}</if>  
1513 - <if test="startEnd != null and startEnd != ''">and start_end = #{startEnd}</if>  
1514 - <if test="vehiclesNumber != null and vehiclesNumber != ''">and vehicles_number = #{vehiclesNumber}</if>  
1515 - <if test="numberPerson != null and numberPerson != ''">and number_person = #{numberPerson}</if>  
1516 - <if test="lineDistanceBefore != null and lineDistanceBefore != ''">and line_distance_before = #{lineDistanceBefore}</if>  
1517 - <if test="startEndBefore != null and startEndBefore != ''">and start_end_before = #{startEndBefore}</if>  
1518 - <if test="vehiclesNumberBefore != null and vehiclesNumberBefore != ''">and vehicles_number_before = #{vehiclesNumberBefore}</if>  
1519 - <if test="numberPersonBefore != null and numberPersonBefore != ''">and number_person_before = #{numberPersonBefore}</if>  
1520 - <if test="createTime != null ">and create_time = #{createTime}</if>  
1521 - <if test="startDate != null ">and start_date >= STR_TO_DATE(CONCAT(#{startDate},"-01"),"%Y-%m-%d")</if>  
1522 - <if test="lineUpdateType != null and lineUpdateType != ''" >and line_update_type = #{lineUpdateType}</if>  
1523 - </where>  
1524 - </select>  
1525 -  
1526 1449
1527 <select id="selectBsthTLineHistoryListGroupByLineName" parameterType="BsthTLine" resultMap="BsthTLineResult"> 1450 <select id="selectBsthTLineHistoryListGroupByLineName" parameterType="BsthTLine" resultMap="BsthTLineResult">
1528 <include refid="selectBsthTLineHistoryVo" /> 1451 <include refid="selectBsthTLineHistoryVo" />
@@ -1558,7 +1481,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1558,7 +1481,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1558 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if> 1481 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
1559 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if> 1482 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
1560 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if> 1483 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
1561 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
1562 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if> 1484 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
1563 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if> 1485 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
1564 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if> 1486 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
@@ -1617,17 +1539,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1617,17 +1539,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1617 1539
1618 1540
1619 1541
1620 -  
1621 -  
1622 -  
1623 -  
1624 -  
1625 -  
1626 -  
1627 -  
1628 -  
1629 -  
1630 -  
1631 <select id="selectHistoryListNotUpdate" 1542 <select id="selectHistoryListNotUpdate"
1632 parameterType="BsthTLine" resultMap="BsthTLineResult"> 1543 parameterType="BsthTLine" resultMap="BsthTLineResult">
1633 <include refid="selectBsthTLineHistoryVo" /> 1544 <include refid="selectBsthTLineHistoryVo" />
@@ -1663,7 +1574,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1663,7 +1574,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1663 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if> 1574 <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
1664 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if> 1575 <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
1665 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if> 1576 <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
1666 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
1667 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if> 1577 <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
1668 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if> 1578 <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
1669 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if> 1579 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
@@ -1756,7 +1666,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1756,7 +1666,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1756 h1.plan_cancel_time planCancelTime,h1.cancel_time cancelTime,h1.cancel_reason cancelReason,h1.remark remark, 1666 h1.plan_cancel_time planCancelTime,h1.cancel_time cancelTime,h1.cancel_reason cancelReason,h1.remark remark,
1757 h1.time_schedule timeSchedule,h1.park park,h1.is_warrant isWarrant,h1.isWarrant_start_time isWarrantStartTime, 1667 h1.time_schedule timeSchedule,h1.park park,h1.is_warrant isWarrant,h1.isWarrant_start_time isWarrantStartTime,
1758 h1.isWarrant_end_time isWarrantEndTime,h1.road_type roadType,h1.ticket_price ticketPrice,h1.first_station firstStation, 1668 h1.isWarrant_end_time isWarrantEndTime,h1.road_type roadType,h1.ticket_price ticketPrice,h1.first_station firstStation,
1759 - h1.start_end startEnd,h1.first_time firstTime, h1.last_station lastStation, h1.last_time lastTime, h1.mileage_up mileageUp, 1669 + h1.first_time firstTime, h1.last_station lastStation, h1.last_time lastTime, h1.mileage_up mileageUp,
1760 h1.mileage_down mileageDown,h1.average_mileage averageMileage,h1.station_up stationUp,h1.station_down stationDown, 1670 h1.mileage_down mileageDown,h1.average_mileage averageMileage,h1.station_up stationUp,h1.station_down stationDown,
1761 h1.travel_time_up travelTimeUp,h1.travel_time_down travelTimeDown,h1.travel_interval_up travelIntervalUp, 1671 h1.travel_time_up travelTimeUp,h1.travel_time_down travelTimeDown,h1.travel_interval_up travelIntervalUp,
1762 h1.travel_interval_down travelIntervalDown,h1.warrant_vehicles_large warrantVehiclesLarge,h1.warrant_vehicles_middle warrantVehiclesMiddle, 1672 h1.travel_interval_down travelIntervalDown,h1.warrant_vehicles_large warrantVehiclesLarge,h1.warrant_vehicles_middle warrantVehiclesMiddle,
@@ -1774,7 +1684,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1774,7 +1684,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1774 h2.plan_cancel_time planCancelTimeOld,h2.cancel_time cancelTimeOld,h2.cancel_reason cancelReasonOld,h2.remark remarkOld, 1684 h2.plan_cancel_time planCancelTimeOld,h2.cancel_time cancelTimeOld,h2.cancel_reason cancelReasonOld,h2.remark remarkOld,
1775 h2.time_schedule timeScheduleOld,h2.park parkOld,h2.is_warrant isWarrantOld,h2.isWarrant_start_time isWarrantStartTimeOld, 1685 h2.time_schedule timeScheduleOld,h2.park parkOld,h2.is_warrant isWarrantOld,h2.isWarrant_start_time isWarrantStartTimeOld,
1776 h2.isWarrant_end_time isWarrantEndTimeOld,h2.road_type roadTypeOld,h2.ticket_price ticketPriceOld,h2.first_station firstStationOld, 1686 h2.isWarrant_end_time isWarrantEndTimeOld,h2.road_type roadTypeOld,h2.ticket_price ticketPriceOld,h2.first_station firstStationOld,
1777 - h2.start_end startEndOld,h2.first_time firstTimeOld, h2.last_station lastStationOld, h2.last_time lastTimeOld, h2.mileage_up mileageUpOld, 1687 + h2.first_time firstTimeOld, h2.last_station lastStationOld, h2.last_time lastTimeOld, h2.mileage_up mileageUpOld,
1778 h2.mileage_down mileageDownOld,h2.average_mileage averageMileageOld,h2.station_up stationUpOld,h2.station_down stationDownOld, 1688 h2.mileage_down mileageDownOld,h2.average_mileage averageMileageOld,h2.station_up stationUpOld,h2.station_down stationDownOld,
1779 h2.travel_time_up travelTimeUpOld,h2.travel_time_down travelTimeDownOld,h2.travel_interval_up travelIntervalUpOld, 1689 h2.travel_time_up travelTimeUpOld,h2.travel_time_down travelTimeDownOld,h2.travel_interval_up travelIntervalUpOld,
1780 h2.travel_interval_down travelIntervalDownOld,h2.warrant_vehicles_large warrantVehiclesLargeOld,h2.warrant_vehicles_middle warrantVehiclesMiddleOld, 1690 h2.travel_interval_down travelIntervalDownOld,h2.warrant_vehicles_large warrantVehiclesLargeOld,h2.warrant_vehicles_middle warrantVehiclesMiddleOld,
bsthLineProfiles/src/main/resources/templates/system/historyReport/historyReport.html
  View file @b2cf345
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 79
80 function queryParams(params) { 80 function queryParams(params) {
81 var search = $.table.queryParams(params); 81 var search = $.table.queryParams(params);
82 - var createTimeStr=$('#createTimeStr').val()!=''?$('#createTimeStr').val()+' 23:59':''; 82 + var createTimeStr=$('#createTimeStr').val()!=''?$('#createTimeStr').val()+' 00:00':'';
83 var createTimeEnd=$('#createTimeEnd').val()!=''?$('#createTimeEnd').val()+' 23:59':''; 83 var createTimeEnd=$('#createTimeEnd').val()!=''?$('#createTimeEnd').val()+' 23:59':'';
84 search.createTimeStr=createTimeStr; 84 search.createTimeStr=createTimeStr;
85 search.createTimeEnd=createTimeEnd; 85 search.createTimeEnd=createTimeEnd;
@@ -127,10 +127,6 @@ @@ -127,10 +127,6 @@
127 title: '线路长度' 127 title: '线路长度'
128 }, 128 },
129 { 129 {
130 - field: 'startEnd',  
131 - title: '起讫站'  
132 - },  
133 - {  
134 field: 'vehiclesNumber', 130 field: 'vehiclesNumber',
135 title: '实际配车数' 131 title: '实际配车数'
136 }, 132 },
@@ -172,7 +168,7 @@ @@ -172,7 +168,7 @@
172 autoclose: true 168 autoclose: true
173 }); 169 });
174 function report(){ 170 function report(){
175 - var createTimeStr=$('#createTimeStr').val()!=''?$('#createTimeStr').val()+' 23:59':''; 171 + var createTimeStr=$('#createTimeStr').val()!=''?$('#createTimeStr').val()+' 00:00':'';
176 var createTimeEnd=$('#createTimeEnd').val()!=''?$('#createTimeEnd').val()+' 23:59':''; 172 var createTimeEnd=$('#createTimeEnd').val()!=''?$('#createTimeEnd').val()+' 23:59':'';
177 var lineName=$('#lineName').val(); 173 var lineName=$('#lineName').val();
178 var lineUpdateType=$('#lineUpdateType').val(); 174 var lineUpdateType=$('#lineUpdateType').val();
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
  View file @b2cf345
@@ -199,12 +199,6 @@ @@ -199,12 +199,6 @@
199 <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text" disabled> 199 <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text" disabled>
200 </div> 200 </div>
201 </span> 201 </span>
202 - <!---------------------------------->  
203 - <span id="startEnd">  
204 - <label class="col-sm-1 control-label">起讫站：</label>  
205 - <div class="col-sm-2">  
206 - <input name="startEnd" th:field="*{startEnd}" class="form-control" type="text" disabled>  
207 - </div>  
208 </span> 202 </span>
209 </div> 203 </div>
210 204
bsthLineProfiles/src/main/resources/templates/system/line/line.html
  View file @b2cf345
@@ -128,8 +128,6 @@ @@ -128,8 +128,6 @@
128 <li><label>票价：</label> <input type="text" name="ticketPrice" /></li> 128 <li><label>票价：</label> <input type="text" name="ticketPrice" /></li>
129 <li><label>首站：</label> <input type="text" 129 <li><label>首站：</label> <input type="text"
130 name="firstStation" /></li> 130 name="firstStation" /></li>
131 - <li><label>起讫站：</label> <input type="text" name="startEnd" />  
132 - </li>  
133 <li><label>首站时间：</label> <input type="text" name="firstTime" /> 131 <li><label>首站时间：</label> <input type="text" name="firstTime" />
134 </li> 132 </li>
135 <li><label>末站：</label> <input type="text" name="lastStation" /> 133 <li><label>末站：</label> <input type="text" name="lastStation" />
@@ -673,10 +671,6 @@ @@ -673,10 +671,6 @@
673 title: '首站' 671 title: '首站'
674 }, 672 },
675 { 673 {
676 - field: 'startEnd',  
677 - title: '起讫站'  
678 - },  
679 - {  
680 field: 'firstTime', 674 field: 'firstTime',
681 title: '首站时间' 675 title: '首站时间'
682 }, 676 },
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
  View file @b2cf345
@@ -15,10 +15,10 @@ @@ -15,10 +15,10 @@
15 <input name="lineName" class="form-control" type="text" onblur="isExist(this.value)"> 15 <input name="lineName" class="form-control" type="text" onblur="isExist(this.value)">
16 </div> 16 </div>
17 <!----------------------------------> 17 <!---------------------------------->
18 - <label class="col-sm-1 control-label">主线路id：</label> 18 + <!-- <label class="col-sm-1 control-label">主线路id：</label>
19 <div class="col-sm-2"> 19 <div class="col-sm-2">
20 <input name="pLineId" class="form-control" type="text"> 20 <input name="pLineId" class="form-control" type="text">
21 - </div> 21 + </div>-->
22 <!----------------------------------> 22 <!---------------------------------->
23 <label class="col-sm-1 control-label">公司：</label> 23 <label class="col-sm-1 control-label">公司：</label>
24 <div class="col-sm-2"> 24 <div class="col-sm-2">
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </div> 61 </div>
62 <!----------------------------------> 62 <!---------------------------------->
63 <label class="col-sm-1 control-label">道路类型：</label> 63 <label class="col-sm-1 control-label">道路类型：</label>
64 - <div class="col-sm-2" th:with="type=${@dict.getType('roadType')}"> 64 + <div class="col-sm-2" >
65 <!--data-max-options="2" 限制多选数量--> 65 <!--data-max-options="2" 限制多选数量-->
66 <select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control" multiple title="" > 66 <select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control" multiple title="" >
67 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"> 67 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
@@ -73,8 +73,7 @@ @@ -73,8 +73,7 @@
73 <div class="form-group"> 73 <div class="form-group">
74 <label class="col-sm-1 control-label">区属：</label> 74 <label class="col-sm-1 control-label">区属：</label>
75 <div class="col-sm-2"> 75 <div class="col-sm-2">
76 - <select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b">  
77 - <option value=""></option> 76 + <select name="district" th:with="type=${@dict.getType('district')}" class="selectpicker form-control" multiple title="">
78 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"> 77 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
79 </option> 78 </option>
80 </select> 79 </select>
@@ -139,10 +138,10 @@ @@ -139,10 +138,10 @@
139 </select> 138 </select>
140 </div> 139 </div>
141 <!----------------------------------> 140 <!---------------------------------->
142 - <label class="col-sm-1 control-label">线路编码：</label> 141 + <!--<label class="col-sm-1 control-label">线路编码：</label>
143 <div class="col-sm-2"> 142 <div class="col-sm-2">
144 <input name="lineCode" class="form-control" type="text"> 143 <input name="lineCode" class="form-control" type="text">
145 - </div> 144 + </div>-->
146 </div> 145 </div>
147 146
148 <div class="form-group"> 147 <div class="form-group">
@@ -161,10 +160,6 @@ @@ -161,10 +160,6 @@
161 <input name="lastStation" class="form-control" type="text"> 160 <input name="lastStation" class="form-control" type="text">
162 </div> 161 </div>
163 <!----------------------------------> 162 <!---------------------------------->
164 - <label class="col-sm-1 control-label">起讫站：</label>  
165 - <div class="col-sm-2">  
166 - <input name="startEnd" class="form-control" type="text">  
167 - </div>  
168 </div> 163 </div>
169 164
170 <div class="form-group"> 165 <div class="form-group">
@@ -178,22 +173,22 @@ @@ -178,22 +173,22 @@
178 <textarea name="directions" class="form-control"></textarea> 173 <textarea name="directions" class="form-control"></textarea>
179 </div> 174 </div>
180 <!----------------------------------> 175 <!---------------------------------->
181 - <label class="col-sm-1 control-label">首站时间：</label> 176 + <label class="col-sm-1 control-label">起点站首末班：</label>
182 <div class="col-sm-2"> 177 <div class="col-sm-2">
183 <input name="firstTime" class="form-control" type="text"> 178 <input name="firstTime" class="form-control" type="text">
184 </div> 179 </div>
185 - <label class="col-sm-1 control-label">末站首站时间：</label>  
186 <!----------------------------------> 180 <!---------------------------------->
  181 + <label class="col-sm-1 control-label">终点站首末班：</label>
187 <div class="col-sm-2"> 182 <div class="col-sm-2">
188 <input name="lastTime" class="form-control" type="text"> 183 <input name="lastTime" class="form-control" type="text">
189 </div> 184 </div>
190 </div> 185 </div>
191 186
192 <div class="form-group"> 187 <div class="form-group">
193 - <label class="col-sm-1 control-label">停车场：</label> 188 + <!--<label class="col-sm-1 control-label">停车场：</label>
194 <div class="col-sm-2"> 189 <div class="col-sm-2">
195 <input name="park" class="form-control" type="text"> 190 <input name="park" class="form-control" type="text">
196 - </div> 191 + </div>-->
197 <!----------------------------------> 192 <!---------------------------------->
198 <label class="col-sm-1 control-label">授权年限：</label> 193 <label class="col-sm-1 control-label">授权年限：</label>
199 <div class="col-sm-2"> 194 <div class="col-sm-2">
@@ -218,7 +213,7 @@ @@ -218,7 +213,7 @@
218 </div> 213 </div>
219 214
220 <div class="form-group"> 215 <div class="form-group">
221 - <label class="col-sm-1 control-label">撤销日期：</label> 216 + <label class="col-sm-1 control-label">线路暂停日期：</label>
222 <div class="col-sm-2"> 217 <div class="col-sm-2">
223 <div class="input-group date"> 218 <div class="input-group date">
224 <input name="planCancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off"> 219 <input name="planCancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
@@ -234,12 +229,7 @@ @@ -234,12 +229,7 @@
234 </div> 229 </div>
235 </div> 230 </div>
236 <!----------------------------------> 231 <!---------------------------------->
237 - <label class="col-sm-1 control-label">撤销原因：</label>  
238 - <div class="col-sm-2">  
239 - <textarea name="cancelReason" class="form-control"></textarea>  
240 - </div>  
241 - <!---------------------------------->  
242 - <label class="col-sm-1 control-label">行车作业计划表报备时间：</label> 232 + <label class="col-sm-1 control-label">实施时间：</label>
243 <div class="col-sm-2"> 233 <div class="col-sm-2">
244 <div class="input-group date"> 234 <div class="input-group date">
245 <input name="timeSchedule" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off"> 235 <input name="timeSchedule" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
@@ -257,24 +247,6 @@ @@ -257,24 +247,6 @@
257 </select> 247 </select>
258 </div> 248 </div>
259 <!----------------------------------> 249 <!---------------------------------->
260 - <label class="col-sm-1 control-label">权证开通日期：</label>  
261 - <div class="col-sm-2">  
262 - <div class="input-group date">  
263 - <input name="isWarrantStartTime" id="isWarrantStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text"  
264 - autocomplete="off">  
265 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
266 - </div>  
267 - </div>  
268 - <!---------------------------------->  
269 - <label class="col-sm-1 control-label">权证到期日期：</label>  
270 - <div class="col-sm-2">  
271 - <div class="input-group date">  
272 - <input name="isWarrantEndTime" id="isWarrantEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text"  
273 - autocomplete="off">  
274 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
275 - </div>  
276 - </div>  
277 - <!---------------------------------->  
278 <label class="col-sm-1 control-label">经营权证（大巴）：</label> 250 <label class="col-sm-1 control-label">经营权证（大巴）：</label>
279 <div class="col-sm-2"> 251 <div class="col-sm-2">
280 <input name="warrantVehiclesLarge" class="form-control" type="text"> 252 <input name="warrantVehiclesLarge" class="form-control" type="text">
@@ -353,16 +325,6 @@ @@ -353,16 +325,6 @@
353 <input name="travelIntervalDown" class="form-control" type="text"> 325 <input name="travelIntervalDown" class="form-control" type="text">
354 </div> 326 </div>
355 <!----------------------------------> 327 <!---------------------------------->
356 - <label class="col-sm-1 control-label">高峰系数：</label>  
357 - <div class="col-sm-2">  
358 - <input name="fullCustomerPercent" class="form-control" type="text">  
359 - </div>  
360 - <!---------------------------------->  
361 - <label class="col-sm-1 control-label">低谷系数：</label>  
362 - <div class="col-sm-2">  
363 - <input name="lowCustomerPercent" class="form-control" type="text">  
364 - </div>  
365 - <!---------------------------------->  
366 <label class="col-sm-1 control-label">间隔等级：</label> 328 <label class="col-sm-1 control-label">间隔等级：</label>
367 <div class="col-sm-2"> 329 <div class="col-sm-2">
368 <input name="divideLevel" class="form-control" type="text"> 330 <input name="divideLevel" class="form-control" type="text">
@@ -375,7 +337,7 @@ @@ -375,7 +337,7 @@
375 <input name="carPlate" class="form-control" type="text"> 337 <input name="carPlate" class="form-control" type="text">
376 </div> 338 </div>
377 <!----------------------------------> 339 <!---------------------------------->
378 - <label class="col-sm-1 control-label">线路总配人数：</label> 340 + <label class="col-sm-1 control-label">线路配档数：</label>
379 <div class="col-sm-2"> 341 <div class="col-sm-2">
380 <input name="numberPerson" class="form-control" type="text"> 342 <input name="numberPerson" class="form-control" type="text">
381 </div> 343 </div>
@@ -424,10 +386,6 @@ @@ -424,10 +386,6 @@
424 </div> 386 </div>
425 387
426 <div class="form-group"> 388 <div class="form-group">
427 - <label class="col-sm-1 control-label">经营权证数：</label>  
428 - <div class="col-sm-2">  
429 - <input name="numberOfManage" class="form-control" type="text">  
430 - </div>  
431 <!----------------------------------> 389 <!---------------------------------->
432 <label class="col-sm-1 control-label">营运状态：</label> 390 <label class="col-sm-1 control-label">营运状态：</label>
433 <div class="col-sm-2"> 391 <div class="col-sm-2">
@@ -460,19 +418,11 @@ @@ -460,19 +418,11 @@
460 </select> 418 </select>
461 </div> 419 </div>
462 <!----------------------------------> 420 <!---------------------------------->
463 - <label class="col-sm-1 control-label">启用时间：</label>  
464 - <div class="col-sm-2">  
465 - <div class="input-group date">  
466 - <input name="startDate" type="text" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss">  
467 - </div>  
468 - </div>  
469 - <!---------------------------------->  
470 <label class="col-sm-1 control-label">备注：</label> 421 <label class="col-sm-1 control-label">备注：</label>
471 <div class="col-sm-2"> 422 <div class="col-sm-2">
472 <textarea name="remark" class="form-control"></textarea> 423 <textarea name="remark" class="form-control"></textarea>
473 </div> 424 </div>
474 </div> 425 </div>
475 -  
476 <div class="form-group"> 426 <div class="form-group">
477 <label class="col-sm-1 control-label">附件：</label> 427 <label class="col-sm-1 control-label">附件：</label>
478 <div class="col-sm-5"> 428 <div class="col-sm-5">
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @b2cf345
@@ -163,11 +163,6 @@ @@ -163,11 +163,6 @@
163 <div class="col-sm-2"> 163 <div class="col-sm-2">
164 <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text"> 164 <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text">
165 </div> 165 </div>
166 - <!---------------------------------->  
167 - <label class="col-sm-1 control-label">起讫站：</label>  
168 - <div class="col-sm-2">  
169 - <input name="startEnd" th:field="*{startEnd}" class="form-control" type="text">  
170 - </div>  
171 </div> 166 </div>
172 167
173 <div class="form-group"> 168 <div class="form-group">
bsthLineProfiles/src/main/resources/templates/system/lineAdd/line.html
  View file @b2cf345
@@ -307,10 +307,6 @@ @@ -307,10 +307,6 @@
307 title: '首站' 307 title: '首站'
308 }, 308 },
309 { 309 {
310 - field: 'startEnd',  
311 - title: '起讫站'  
312 - },  
313 - {  
314 field: 'lastStation', 310 field: 'lastStation',
315 title: '末站' 311 title: '末站'
316 },{ 312 },{
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @b2cf345
@@ -163,11 +163,6 @@ @@ -163,11 +163,6 @@
163 <div class="col-sm-2"> 163 <div class="col-sm-2">
164 <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text" disabled> 164 <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text" disabled>
165 </div> 165 </div>
166 - <!---------------------------------->  
167 - <label class="col-sm-1 control-label">起讫站：</label>  
168 - <div class="col-sm-2">  
169 - <input name="startEnd" th:field="*{startEnd}" class="form-control" type="text" disabled>  
170 - </div>  
171 </div> 166 </div>
172 167
173 <div class="form-group"> 168 <div class="form-group">
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @b2cf345
@@ -164,10 +164,6 @@ @@ -164,10 +164,6 @@
164 <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text"> 164 <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text">
165 </div> 165 </div>
166 <!----------------------------------> 166 <!---------------------------------->
167 - <label class="col-sm-1 control-label">起讫站：</label>  
168 - <div class="col-sm-2">  
169 - <input name="startEnd" th:field="*{startEnd}" class="form-control" type="text">  
170 - </div>  
171 </div> 167 </div>
172 168
173 <div class="form-group"> 169 <div class="form-group">
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
  View file @b2cf345
@@ -164,10 +164,6 @@ @@ -164,10 +164,6 @@
164 <span class="col-sm-9" id="firstStation">{{line.firstStation}}</span> 164 <span class="col-sm-9" id="firstStation">{{line.firstStation}}</span>
165 </div> 165 </div>
166 <div class="col-sm-6"> 166 <div class="col-sm-6">
167 - <label class="col-sm-3 control-label">起讫站：</label>  
168 - <span class="col-sm-9" id="startEnd">{{line.startEnd}}</span>  
169 - </div>  
170 - <div class="col-sm-6">  
171 <label class="col-sm-3 control-label">首站时间：</label> 167 <label class="col-sm-3 control-label">首站时间：</label>
172 <span class="col-sm-9"id="firstTime">{{line.firstTime}}</span> 168 <span class="col-sm-9"id="firstTime">{{line.firstTime}}</span>
173 </div> 169 </div>
@@ -484,12 +480,6 @@ @@ -484,12 +480,6 @@
484 </span> 480 </span>
485 </div> 481 </div>
486 <div class="col-sm-6"> 482 <div class="col-sm-6">
487 - <label class="col-sm-3 control-label">起讫站：</label>  
488 - <span class="col-sm-9">  
489 - {{oldLine.startEnd}}  
490 - </span>  
491 - </div>  
492 - <div class="col-sm-6">  
493 <label class="col-sm-3 control-label">首站时间：</label> 483 <label class="col-sm-3 control-label">首站时间：</label>
494 <span class="col-sm-9"> 484 <span class="col-sm-9">
495 {{oldLine.firstTime}} 485 {{oldLine.firstTime}}
bsthLineProfiles/src/main/resources/templates/system/lineHistory/line.html
  View file @b2cf345
@@ -316,10 +316,6 @@ @@ -316,10 +316,6 @@
316 title: '首站' 316 title: '首站'
317 }, 317 },
318 { 318 {
319 - field: 'startEnd',  
320 - title: '起讫站'  
321 - },  
322 - {  
323 field: 'lastStation', 319 field: 'lastStation',
324 title: '末站' 320 title: '末站'
325 },{ 321 },{
bsthLineProfiles/src/main/resources/templates/system/lineReport/add.html
  View file @b2cf345
@@ -248,12 +248,6 @@ @@ -248,12 +248,6 @@
248 </div> 248 </div>
249 </div> 249 </div>
250 <div class="form-group"> 250 <div class="form-group">
251 - <label class="col-sm-3 control-label">起讫站：</label>  
252 - <div class="col-sm-8">  
253 - <input name="startEnd" class="form-control" type="text">  
254 - </div>  
255 - </div>  
256 - <div class="form-group">  
257 <label class="col-sm-3 control-label">首站时间：</label> 251 <label class="col-sm-3 control-label">首站时间：</label>
258 <div class="col-sm-8"> 252 <div class="col-sm-8">
259 <input name="firstTime" class="form-control" type="text"> 253 <input name="firstTime" class="form-control" type="text">
bsthLineProfiles/src/main/resources/templates/system/lineReport/edit.html
  View file @b2cf345
@@ -283,13 +283,6 @@ @@ -283,13 +283,6 @@
283 </div> 283 </div>
284 </div> 284 </div>
285 <div class="form-group"> 285 <div class="form-group">
286 - <label class="col-sm-3 control-label">起讫站：</label>  
287 - <div class="col-sm-8">  
288 - <input name="startEnd" th:field="*{startEnd}" class="form-control"  
289 - type="text">  
290 - </div>  
291 - </div>  
292 - <div class="form-group">  
293 <label class="col-sm-3 control-label">首站时间：</label> 286 <label class="col-sm-3 control-label">首站时间：</label>
294 <div class="col-sm-8"> 287 <div class="col-sm-8">
295 <input name="firstTime" th:field="*{firstTime}" 288 <input name="firstTime" th:field="*{firstTime}"
bsthLineProfiles/src/main/resources/templates/system/lineReport/line.html
  View file @b2cf345
@@ -122,8 +122,6 @@ @@ -122,8 +122,6 @@
122 <li><label>票价：</label> <input type="text" name="ticketPrice" /></li> 122 <li><label>票价：</label> <input type="text" name="ticketPrice" /></li>
123 <li><label>首站：</label> <input type="text" 123 <li><label>首站：</label> <input type="text"
124 name="firstStation" /></li> 124 name="firstStation" /></li>
125 - <li><label>起讫站：</label> <input type="text" name="startEnd" />  
126 - </li>  
127 <li><label>首站时间：</label> <input type="text" name="firstTime" /> 125 <li><label>首站时间：</label> <input type="text" name="firstTime" />
128 </li> 126 </li>
129 <li><label>末站：</label> <input type="text" name="lastStation" /> 127 <li><label>末站：</label> <input type="text" name="lastStation" />
@@ -596,10 +594,6 @@ @@ -596,10 +594,6 @@
596 title: '首站' 594 title: '首站'
597 }, 595 },
598 { 596 {
599 - field: 'startEnd',  
600 - title: '起讫站'  
601 - },  
602 - {  
603 field: 'firstTime', 597 field: 'firstTime',
604 title: '首站时间' 598 title: '首站时间'
605 }, 599 },