youxiw2000 / bsthLineProfiles · Commits

Commit df14b31c437fc376400be322b7e59b5f76273ada

Authored by yiming
1 parent b2cf3450
build: skipped

bf

Inline Side-by-side
Showing 22 changed files with 753 additions and 1854 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 22 of 25 files are displayed.

bsthLineProfiles/src/main/java/com/ruoyi/project/monitor/job/task/RyTask.java
  View file @df14b31
... ... @@ -65,10 +65,8 @@ public class RyTask {
65 65 if(lineService.selectHistoryListNotUpdate(compare).size() == 0) {
66 66 lineService.insertBsthTLineHistory(luwuLine);
67 67 compare.setId(luwuLine.getId());
68   - compare.setStartDate(new Date(2999,1,1));
69 68 compare.setCreateTime(new Date());
70 69 compare.setCreateBy("SystemCompareThread");
71   - compare.setStartReason("自动同步路务数据比对差异");
72 70 compare.setUpdateStatus("1");
73 71 lineService.updateBsthTLineHistory(compare);
74 72 }
... ... @@ -98,7 +96,6 @@ public class RyTask {
98 96 // compare.setStartDate(new Date(2999,1,1));
99 97 // compare.setCreateTime(new Date());
100 98 // compare.setCreateBy("SystemCompareThread");
101   -// compare.setStartReason("自动同步路务数据比对差异");
102 99 // compare.setUpdateStatus("1");
103 100 // lineService.updateBsthTLineHistory(compare);
104 101 // }
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
  View file @df14b31
... ... @@ -20,6 +20,7 @@ import org.springframework.ui.ModelMap;
20 20 import org.springframework.web.bind.annotation.*;
21 21 import org.springframework.web.servlet.ModelAndView;
22 22  
  23 +import javax.servlet.http.HttpServletRequest;
23 24 import java.io.File;
24 25 import java.lang.reflect.Field;
25 26 import java.lang.reflect.Method;
... ... @@ -85,9 +86,12 @@ public class BsthTLineAddController extends BaseController
85 86 * 新增弹窗
86 87 */
87 88 @GetMapping("/add")
88   - public String add()
  89 + public ModelAndView add()
89 90 {
90   - return prefix + "/add";
  91 + ModelAndView mv=new ModelAndView(prefix + "/add");
  92 + List<Map> companyList=bsthTLineService.selectCompany();
  93 + mv.addObject("companyList",companyList);
  94 + return mv;
91 95 }
92 96  
93 97  
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
  View file @df14b31
... ... @@ -127,7 +127,7 @@ public class BsthTLineController extends BaseController
127 127 if("0".equals(isWarrant)){//现实
128 128 for (Field f : field) {
129 129 String fName=f.getName();
130   - if(!"isWarrantStartTime".equals(fName) && !"isWarrantEndTime".equals(fName) && !"warrantVehiclesLarge".equals(fName) && !"warrantVehiclesMiddle".equals(fName) && !"number_of_manage".equals(fName)){
  130 + if(!"isWarrantStartTime".equals(fName) && !"isWarrantEndTime".equals(fName) && !"warrantVehiclesLarge".equals(fName) && !"warrantVehiclesMiddle".equals(fName) ){
131 131 titles.add(fName);
132 132 }
133 133 }
... ... @@ -146,7 +146,7 @@ public class BsthTLineController extends BaseController
146 146  
147 147 String type = name;
148 148  
149   - if(name.equals( "isLogicDelete") || name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")|| name.equals( "isWarrant")) {
  149 + if(name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")|| name.equals( "isWarrant")) {
150 150 type = "trueFalse";
151 151 }
152 152  
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
  View file @df14b31
... ... @@ -192,7 +192,7 @@ public class BsthTLineHistoryController extends BaseController
192 192  
193 193 String type = name;
194 194  
195   - if(name.equals( "isLogicDelete") || name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")) {
  195 + if(name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")) {
196 196 type = "trueFalse";
197 197 }
198 198  
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryReportController.java
  View file @df14b31
... ... @@ -349,9 +349,7 @@ public class BsthTLineHistoryReportController extends BaseController
349 349 writer.setColumnWidth(2,20);
350 350 export.setLine4(lineHistoryReport.getLineName());//线路
351 351 writer.setColumnWidth(3,20);
352   - Date date=lineHistoryReport.getStartDate();
353 352 SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
354   - export.setLine5( simpleDateFormat.format(date));//实施日期
355 353 writer.setColumnWidth(4,20);
356 354 if("新辟".equals(lineHistoryReport.getLineUpdateType())){
357 355 export.setLine6(lineHistoryReport.getLineUpdateType());//新辟
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @df14b31
... ... @@ -83,7 +83,7 @@ public class BsthTLine extends BaseEntity
83 83 private String lineDistance;
84 84  
85 85 /** 线路编码 */
86   - @Excel(name = "线路编码")
  86 + //@Excel(name = "线路编码")
87 87 private String lineCode;
88 88  
89 89 /** 授权年限 */
... ... @@ -100,9 +100,9 @@ public class BsthTLine extends BaseEntity
100 100 @Excel(name = "授权结束日期", width = 30, dateFormat = "yyyy-MM-dd")
101 101 private Date warrantEndTime;
102 102  
103   - /** 撤销日期 */
  103 + /** 线路暂停日期 */
104 104 @JsonFormat(pattern = "yyyy-MM-dd")
105   - @Excel(name = "撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
  105 + @Excel(name = "线路暂停日期", width = 30, dateFormat = "yyyy-MM-dd")
106 106 private Date planCancelTime;
107 107  
108 108 /** 实际撤销日期 */
... ... @@ -110,13 +110,6 @@ public class BsthTLine extends BaseEntity
110 110 @Excel(name = "实际撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
111 111 private Date cancelTime;
112 112  
113   - /** 撤销原因 */
114   - @Excel(name = "撤销原因")
115   - private String cancelReason;
116   -
117   - /** 是否逻辑删除 */
118   - @Excel(name = "是否逻辑删除")
119   - private String isLogicDelete;
120 113  
121 114 /** 更新人 */
122 115 @Excel(name = "更新人")
... ... @@ -127,23 +120,19 @@ public class BsthTLine extends BaseEntity
127 120 @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
128 121 private Date updateTime;
129 122  
130   - /** 行车作业计划表报备时间 */
  123 + /** 实施时间 */
131 124 @JsonFormat(pattern = "yyyy-MM-dd")
132   - @Excel(name = "行车作业计划表报备时间", width = 30, dateFormat = "yyyy-MM-dd")
  125 + @Excel(name = "实施时间", width = 30, dateFormat = "yyyy-MM-dd")
133 126 private Date timeSchedule;
134 127  
135 128 /** 停车场 */
136   - @Excel(name = "停车场")
  129 + //@Excel(name = "停车场")
137 130 private String park;
138 131  
139 132 /** 是否权证 0-否 1-是*/
140 133 @Excel(name = "是否权证")
141 134 private String isWarrant;
142 135  
143   - /** 权证开通日期 */
144   - @JsonFormat(pattern = "yyyy-MM-dd")
145   - @Excel(name = "权证开通日期", width = 30, dateFormat = "yyyy-MM-dd")
146   - private Date isWarrantStartTime;
147 136  
148 137 /** 权证到期日期 */
149 138 @JsonFormat(pattern = "yyyy-MM-dd")
... ... @@ -162,16 +151,16 @@ public class BsthTLine extends BaseEntity
162 151 @Excel(name = "首站")
163 152 private String firstStation;
164 153  
165   - /** 首站时间 */
166   - @Excel(name = "首站时间")
  154 + /** 起点站首末班 */
  155 + @Excel(name = "起点站首末班")
167 156 private String firstTime;
168 157  
169 158 /** 末站 */
170 159 @Excel(name = "末站")
171 160 private String lastStation;
172 161  
173   - /** 末站首站时间 */
174   - @Excel(name = "末站首站时间")
  162 + /** 终点站首末班 */
  163 + @Excel(name = "终点站首末班")
175 164 private String lastTime;
176 165  
177 166 /** 上行里程数 */
... ... @@ -182,10 +171,6 @@ public class BsthTLine extends BaseEntity
182 171 @Excel(name = "下行里程数")
183 172 private String mileageDown;
184 173  
185   - /** 平均里程数 */
186   - @Excel(name = "平均里程数")
187   - private String averageMileage;
188   -
189 174 /** 站级数(上行) */
190 175 @Excel(name = "站级数(上行)")
191 176 private String stationUp;
... ... @@ -234,8 +219,8 @@ public class BsthTLine extends BaseEntity
234 219 @Excel(name = "车辆自编号")
235 220 private String carPlate;
236 221  
237   - /** 线路总配人数 */
238   - @Excel(name = "线路总配人数")
  222 + /** 线路配档数 */
  223 + @Excel(name = "线路配档数")
239 224 private Long numberPerson;
240 225  
241 226 /** 司机人数 */
... ... @@ -254,22 +239,10 @@ public class BsthTLine extends BaseEntity
254 239 @Excel(name = "线路走向")
255 240 private String directions;
256 241  
257   - /** 经营权证数 */
258   - @Excel(name = "经营权证数")
259   - private String numberOfManage;
260   -
261 242 /** 站点名称 */
262 243 @Excel(name = "站点名称")
263 244 private String halfwayStation;
264 245  
265   - /** 高峰系数 */
266   - @Excel(name = "高峰系数")
267   - private Long fullCustomerPercent;
268   -
269   - /** 低谷系数 */
270   - @Excel(name = "低谷系数")
271   - private Long lowCustomerPercent;
272   -
273 246 /** 间隔等级 */
274 247 @Excel(name = "间隔等级")
275 248 private String divideLevel;
... ... @@ -290,44 +263,13 @@ public class BsthTLine extends BaseEntity
290 263 @Excel(name = "冷僻线路补贴类型")
291 264 private String coldBonusType;
292 265  
293   - /** 月度营收 */
294   - private Long revenuesMonth;
295   -
296   - /** 月度人次 */
297   - private Long personMonth;
298   -
299   - /** 月度里程 */
300   - private Long mileageMonth;
301   -
302   - /** 百公里人次 */
303   - private Long personMonthAvg;
304   -
305   - /** 营收 */
306   - private Long revenues;
307   -
308   - /** 人次 */
309   - private Long persons;
310   -
311   - /** 里程 */
312   - private Long mileages;
313   -
314   - /** 百公里人次 */
315   - private Long personAvg;
316   -
317   - /** 开通日期（无） */
318   - @Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd")
319   - private Date startDate;
320   -
321   - /** 开通日期（无） */
322   - @Excel(name = "启用原因" )
323   - private String startReason;
324 266  
325 267 private String lineUpdateType;
326 268  
327 269 //更新状态 -1 历史版本 0 当前版本 1待更新
328 270 private String updateStatus;
329 271  
330   - @Excel(name = "夜间停车场(无)")
  272 + //@Excel(name = "夜间停车场(无)")
331 273 private String nightParking;
332 274  
333 275 private String files;
... ... @@ -559,24 +501,7 @@ public class BsthTLine extends BaseEntity
559 501 {
560 502 return cancelTime;
561 503 }
562   - public void setCancelReason(String cancelReason)
563   - {
564   - this.cancelReason = cancelReason;
565   - }
566   -
567   - public String getCancelReason()
568   - {
569   - return cancelReason;
570   - }
571   - public void setIsLogicDelete(String isLogicDelete)
572   - {
573   - this.isLogicDelete = isLogicDelete;
574   - }
575 504  
576   - public String getIsLogicDelete()
577   - {
578   - return isLogicDelete;
579   - }
580 505  
581 506 public void setTimeSchedule(Date timeSchedule)
582 507 {
... ... @@ -678,15 +603,6 @@ public class BsthTLine extends BaseEntity
678 603 {
679 604 return mileageDown;
680 605 }
681   - public void setAverageMileage(String averageMileage)
682   - {
683   - this.averageMileage = averageMileage;
684   - }
685   -
686   - public String getAverageMileage()
687   - {
688   - return averageMileage;
689   - }
690 606 public void setStationUp(String stationUp)
691 607 {
692 608 this.stationUp = stationUp;
... ... @@ -840,15 +756,6 @@ public class BsthTLine extends BaseEntity
840 756 {
841 757 return directions;
842 758 }
843   - public void setNumberOfManage(String numberOfManage)
844   - {
845   - this.numberOfManage = numberOfManage;
846   - }
847   -
848   - public String getNumberOfManage()
849   - {
850   - return numberOfManage;
851   - }
852 759 public void setHalfwayStation(String halfwayStation)
853 760 {
854 761 this.halfwayStation = halfwayStation;
... ... @@ -858,24 +765,7 @@ public class BsthTLine extends BaseEntity
858 765 {
859 766 return halfwayStation;
860 767 }
861   - public void setFullCustomerPercent(Long fullCustomerPercent)
862   - {
863   - this.fullCustomerPercent = fullCustomerPercent;
864   - }
865 768  
866   - public Long getFullCustomerPercent()
867   - {
868   - return fullCustomerPercent;
869   - }
870   - public void setLowCustomerPercent(Long lowCustomerPercent)
871   - {
872   - this.lowCustomerPercent = lowCustomerPercent;
873   - }
874   -
875   - public Long getLowCustomerPercent()
876   - {
877   - return lowCustomerPercent;
878   - }
879 769 public void setDivideLevel(String divideLevel)
880 770 {
881 771 this.divideLevel = divideLevel;
... ... @@ -921,96 +811,7 @@ public class BsthTLine extends BaseEntity
921 811 {
922 812 return coldBonusType;
923 813 }
924   - public void setRevenuesMonth(Long revenuesMonth)
925   - {
926   - this.revenuesMonth = revenuesMonth;
927   - }
928 814  
929   - public Long getRevenuesMonth()
930   - {
931   - return revenuesMonth;
932   - }
933   - public void setPersonMonth(Long personMonth)
934   - {
935   - this.personMonth = personMonth;
936   - }
937   -
938   - public Long getPersonMonth()
939   - {
940   - return personMonth;
941   - }
942   - public void setMileageMonth(Long mileageMonth)
943   - {
944   - this.mileageMonth = mileageMonth;
945   - }
946   -
947   - public Long getMileageMonth()
948   - {
949   - return mileageMonth;
950   - }
951   - public void setPersonMonthAvg(Long personMonthAvg)
952   - {
953   - this.personMonthAvg = personMonthAvg;
954   - }
955   -
956   - public Long getPersonMonthAvg()
957   - {
958   - return personMonthAvg;
959   - }
960   - public void setRevenues(Long revenues)
961   - {
962   - this.revenues = revenues;
963   - }
964   -
965   - public Long getRevenues()
966   - {
967   - return revenues;
968   - }
969   - public void setPersons(Long persons)
970   - {
971   - this.persons = persons;
972   - }
973   -
974   - public Long getPersons()
975   - {
976   - return persons;
977   - }
978   - public void setMileages(Long mileages)
979   - {
980   - this.mileages = mileages;
981   - }
982   -
983   - public Long getMileages()
984   - {
985   - return mileages;
986   - }
987   - public void setPersonAvg(Long personAvg)
988   - {
989   - this.personAvg = personAvg;
990   - }
991   -
992   - public Long getPersonAvg()
993   - {
994   - return personAvg;
995   - }
996   - public void setStartDate(Date startDate)
997   - {
998   - this.startDate = startDate;
999   - }
1000   -
1001   - public Date getStartDate()
1002   - {
1003   - return startDate;
1004   - }
1005   -
1006   -
1007   - public String getStartReason() {
1008   - return startReason;
1009   - }
1010   -
1011   - public void setStartReason(String startReason) {
1012   - this.startReason = startReason;
1013   - }
1014 815  
1015 816 public void setNightParking(String nightParking)
1016 817 {
... ... @@ -1054,13 +855,6 @@ public class BsthTLine extends BaseEntity
1054 855 this.files = files;
1055 856 }
1056 857  
1057   - public Date getIsWarrantStartTime() {
1058   - return isWarrantStartTime;
1059   - }
1060   -
1061   - public void setIsWarrantStartTime(Date isWarrantStartTime) {
1062   - this.isWarrantStartTime = isWarrantStartTime;
1063   - }
1064 858  
1065 859 public Date getIsWarrantEndTime() {
1066 860 return isWarrantEndTime;
... ... @@ -1181,15 +975,11 @@ public class BsthTLine extends BaseEntity
1181 975 ", warrantEndTime=" + warrantEndTime +
1182 976 ", planCancelTime=" + planCancelTime +
1183 977 ", cancelTime=" + cancelTime +
1184   - ", cancelReason='" + cancelReason + '\'' +
1185   - ", isLogicDelete='" + isLogicDelete + '\'' +
1186 978 ", updateBy='" + updateBy + '\'' +
1187 979 ", updateTime=" + updateTime +
1188 980 ", timeSchedule=" + timeSchedule +
1189 981 ", park='" + park + '\'' +
1190 982 ", isWarrant='" + isWarrant + '\'' +
1191   - ", isWarrantStartTime=" + isWarrantStartTime +
1192   - ", isWarrantEndTime=" + isWarrantEndTime +
1193 983 ", roadType='" + roadType + '\'' +
1194 984 ", ticketPrice='" + ticketPrice + '\'' +
1195 985 ", firstStation='" + firstStation + '\'' +
... ... @@ -1198,7 +988,6 @@ public class BsthTLine extends BaseEntity
1198 988 ", lastTime='" + lastTime + '\'' +
1199 989 ", mileageUp='" + mileageUp + '\'' +
1200 990 ", mileageDown='" + mileageDown + '\'' +
1201   - ", averageMileage='" + averageMileage + '\'' +
1202 991 ", stationUp='" + stationUp + '\'' +
1203 992 ", stationDown='" + stationDown + '\'' +
1204 993 ", travelTimeUp='" + travelTimeUp + '\'' +
... ... @@ -1216,25 +1005,12 @@ public class BsthTLine extends BaseEntity
1216 1005 ", numberPersonSales=" + numberPersonSales +
1217 1006 ", busEvNumber=" + busEvNumber +
1218 1007 ", directions='" + directions + '\'' +
1219   - ", numberOfManage='" + numberOfManage + '\'' +
1220 1008 ", halfwayStation='" + halfwayStation + '\'' +
1221   - ", fullCustomerPercent=" + fullCustomerPercent +
1222   - ", lowCustomerPercent=" + lowCustomerPercent +
1223 1009 ", divideLevel='" + divideLevel + '\'' +
1224 1010 ", hasTimelists='" + hasTimelists + '\'' +
1225 1011 ", isMetro='" + isMetro + '\'' +
1226 1012 ", metroTime='" + metroTime + '\'' +
1227 1013 ", coldBonusType='" + coldBonusType + '\'' +
1228   - ", revenuesMonth=" + revenuesMonth +
1229   - ", personMonth=" + personMonth +
1230   - ", mileageMonth=" + mileageMonth +
1231   - ", personMonthAvg=" + personMonthAvg +
1232   - ", revenues=" + revenues +
1233   - ", persons=" + persons +
1234   - ", mileages=" + mileages +
1235   - ", personAvg=" + personAvg +
1236   - ", startDate=" + startDate +
1237   - ", startReason='" + startReason + '\'' +
1238 1014 ", lineUpdateType='" + lineUpdateType + '\'' +
1239 1015 ", updateStatus='" + updateStatus + '\'' +
1240 1016 ", nightParking='" + nightParking + '\'' +
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
  View file @df14b31
... ... @@ -104,10 +104,10 @@ public class LineHistoryReport extends BaseEntity
104 104 @Excel(name = "原线路长度")
105 105 private String lineDistanceOld;
106 106  
107   - @Excel(name = "线路编码")
  107 +/* @Excel(name = "线路编码")
108 108 private String lineCode;
109 109 @Excel(name = "原线路编码")
110   - private String lineCodeOld;
  110 + private String lineCodeOld;*/
111 111  
112 112 @Excel(name = "授权年限")
113 113 private Long warrantYear;
... ... @@ -130,10 +130,10 @@ public class LineHistoryReport extends BaseEntity
130 130 private Date warrantEndTimeOld;
131 131  
132 132 @JsonFormat(pattern = "yyyy-MM-dd")
133   - @Excel(name = "撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
  133 + @Excel(name = "线路暂停日期", width = 30, dateFormat = "yyyy-MM-dd")
134 134 private Date planCancelTime;
135 135 @JsonFormat(pattern = "yyyy-MM-dd")
136   - @Excel(name = "原撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
  136 + @Excel(name = "原撤销线路暂停日期", width = 30, dateFormat = "yyyy-MM-dd")
137 137 private Date planCancelTimeOld;
138 138  
139 139 @JsonFormat(pattern = "yyyy-MM-dd")
... ... @@ -144,27 +144,22 @@ public class LineHistoryReport extends BaseEntity
144 144 private Date cancelTimeOld;
145 145  
146 146  
147   - @Excel(name = "撤销原因")
148   - private String cancelReason;
149   - @Excel(name = "原撤销原因")
150   - private String cancelReasonOld;
151   -
152 147 @Excel(name = "备注")
153 148 private String remark;
154 149 @Excel(name = "原备注")
155 150 private String remarkOld;
156 151  
157 152 @JsonFormat(pattern = "yyyy-MM-dd")
158   - @Excel(name = "行车作业计划表报备时间", width = 30, dateFormat = "yyyy-MM-dd")
  153 + @Excel(name = "实施时间", width = 30, dateFormat = "yyyy-MM-dd")
159 154 private Date timeSchedule;
160 155 @JsonFormat(pattern = "yyyy-MM-dd")
161   - @Excel(name = "原行车作业计划表报备时间", width = 30, dateFormat = "yyyy-MM-dd")
  156 + @Excel(name = "原实施时间", width = 30, dateFormat = "yyyy-MM-dd")
162 157 private Date timeScheduleOld;
163 158  
164   - @Excel(name = "停车场")
  159 + /*@Excel(name = "停车场")
165 160 private String park;
166 161 @Excel(name = "原停车场")
167   - private String parkOld;
  162 + private String parkOld;*/
168 163  
169 164 @Excel(name = "是否权证")
170 165 private String isWarrant;
... ... @@ -172,13 +167,6 @@ public class LineHistoryReport extends BaseEntity
172 167 private String isWarrantOld;
173 168  
174 169 @JsonFormat(pattern = "yyyy-MM-dd")
175   - @Excel(name = "权证开通日期", width = 30, dateFormat = "yyyy-MM-dd")
176   - private Date isWarrantStartTime;
177   - @JsonFormat(pattern = "yyyy-MM-dd")
178   - @Excel(name = "原权证开通日期", width = 30, dateFormat = "yyyy-MM-dd")
179   - private Date isWarrantStartTimeOld;
180   -
181   - @JsonFormat(pattern = "yyyy-MM-dd")
182 170 @Excel(name = "权证到期日期", width = 30, dateFormat = "yyyy-MM-dd")
183 171 private Date isWarrantEndTime;
184 172 @JsonFormat(pattern = "yyyy-MM-dd")
... ... @@ -201,9 +189,9 @@ public class LineHistoryReport extends BaseEntity
201 189 private String firstStationOld;
202 190  
203 191  
204   - @Excel(name = "首站时间")
  192 + @Excel(name = "起点站首末班")
205 193 private String firstTime;
206   - @Excel(name = "原首站时间")
  194 + @Excel(name = "原起点站首末班")
207 195 private String firstTimeOld;
208 196  
209 197 @Excel(name = "末站")
... ... @@ -211,9 +199,9 @@ public class LineHistoryReport extends BaseEntity
211 199 @Excel(name = "原末站")
212 200 private String lastStationOld;
213 201  
214   - @Excel(name = "末站首站时间")
  202 + @Excel(name = "终点站首末班")
215 203 private String lastTime;
216   - @Excel(name = "原末站首站时间")
  204 + @Excel(name = "原终点站首末班")
217 205 private String lastTimeOld;
218 206  
219 207 @Excel(name = "上行里程数")
... ... @@ -226,11 +214,6 @@ public class LineHistoryReport extends BaseEntity
226 214 @Excel(name = "原下行里程数")
227 215 private String mileageDownOld;
228 216  
229   - @Excel(name = "平均里程数")
230   - private String averageMileage;
231   - @Excel(name = "原平均里程数")
232   - private String averageMileageOld;
233   -
234 217 @Excel(name = "站级数(上行)")
235 218 private String stationUp;
236 219 @Excel(name = "原站级数(上行)")
... ... @@ -291,9 +274,9 @@ public class LineHistoryReport extends BaseEntity
291 274 @Excel(name = "原车辆自编号")
292 275 private String carPlateOld;
293 276  
294   - @Excel(name = "线路总配人数")
  277 + @Excel(name = "线路配档数")
295 278 private Long numberPerson;
296   - @Excel(name = "原线路总配人数")
  279 + @Excel(name = "原线路配档数")
297 280 private Long numberPersonOld;
298 281  
299 282 @Excel(name = "司机人数")
... ... @@ -317,26 +300,11 @@ public class LineHistoryReport extends BaseEntity
317 300 @Excel(name = "原线路走向")
318 301 private String directionsOld;
319 302  
320   - @Excel(name = "经营权证数")
321   - private String numberOfManage;
322   - @Excel(name = "原经营权证数")
323   - private String numberOfManageOld;
324   -
325 303 @Excel(name = "站点名称")
326 304 private String halfwayStation;
327 305 @Excel(name = "原站点名称")
328 306 private String halfwayStationOld;
329 307  
330   - @Excel(name = "高峰系数")
331   - private Long fullCustomerPercent;
332   - @Excel(name = "原高峰系数")
333   - private Long fullCustomerPercentOld;
334   -
335   - @Excel(name = "低谷系数")
336   - private Long lowCustomerPercent;
337   - @Excel(name = "原低谷系数")
338   - private Long lowCustomerPercentOld;
339   -
340 308 @Excel(name = "间隔等级")
341 309 private String divideLevel;
342 310 @Excel(name = "原间隔等级")
... ... @@ -362,14 +330,6 @@ public class LineHistoryReport extends BaseEntity
362 330 @Excel(name = "原冷僻线路补贴类型")
363 331 private String coldBonusTypeOld;
364 332  
365   - @Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd")
366   - private Date startDate;
367   - @Excel(name = "原启用日期", width = 30, dateFormat = "yyyy-MM-dd")
368   - private Date startDateOld;
369   -
370   -
371   -
372   -
373 333 //营收类型（公交线路/机场专线/特约车线路/零星特约车线路/交通车线路/团客车线路/其他线路
374 334 @Excel(name = "营收类型")
375 335 private String revenueType;
... ... @@ -625,7 +585,7 @@ public class LineHistoryReport extends BaseEntity
625 585 this.lineDistanceOld = lineDistanceOld;
626 586 }
627 587  
628   - public String getLineCode() {
  588 +/* public String getLineCode() {
629 589 return lineCode;
630 590 }
631 591  
... ... @@ -639,7 +599,7 @@ public class LineHistoryReport extends BaseEntity
639 599  
640 600 public void setLineCodeOld(String lineCodeOld) {
641 601 this.lineCodeOld = lineCodeOld;
642   - }
  602 + }*/
643 603  
644 604 public Long getWarrantYear() {
645 605 return warrantYear;
... ... @@ -721,22 +681,6 @@ public class LineHistoryReport extends BaseEntity
721 681 this.cancelTimeOld = cancelTimeOld;
722 682 }
723 683  
724   - public String getCancelReason() {
725   - return cancelReason;
726   - }
727   -
728   - public void setCancelReason(String cancelReason) {
729   - this.cancelReason = cancelReason;
730   - }
731   -
732   - public String getCancelReasonOld() {
733   - return cancelReasonOld;
734   - }
735   -
736   - public void setCancelReasonOld(String cancelReasonOld) {
737   - this.cancelReasonOld = cancelReasonOld;
738   - }
739   -
740 684 @Override
741 685 public String getRemark() {
742 686 return remark;
... ... @@ -771,7 +715,7 @@ public class LineHistoryReport extends BaseEntity
771 715 this.timeScheduleOld = timeScheduleOld;
772 716 }
773 717  
774   - public String getPark() {
  718 + /*public String getPark() {
775 719 return park;
776 720 }
777 721  
... ... @@ -785,7 +729,7 @@ public class LineHistoryReport extends BaseEntity
785 729  
786 730 public void setParkOld(String parkOld) {
787 731 this.parkOld = parkOld;
788   - }
  732 + }*/
789 733  
790 734 public String getIsWarrant() {
791 735 return isWarrant;
... ... @@ -803,22 +747,6 @@ public class LineHistoryReport extends BaseEntity
803 747 this.isWarrantOld = isWarrantOld;
804 748 }
805 749  
806   - public Date getIsWarrantStartTime() {
807   - return isWarrantStartTime;
808   - }
809   -
810   - public void setIsWarrantStartTime(Date isWarrantStartTime) {
811   - this.isWarrantStartTime = isWarrantStartTime;
812   - }
813   -
814   - public Date getIsWarrantStartTimeOld() {
815   - return isWarrantStartTimeOld;
816   - }
817   -
818   - public void setIsWarrantStartTimeOld(Date isWarrantStartTimeOld) {
819   - this.isWarrantStartTimeOld = isWarrantStartTimeOld;
820   - }
821   -
822 750 public Date getIsWarrantEndTime() {
823 751 return isWarrantEndTime;
824 752 }
... ... @@ -964,22 +892,6 @@ public class LineHistoryReport extends BaseEntity
964 892 this.mileageDownOld = mileageDownOld;
965 893 }
966 894  
967   - public String getAverageMileage() {
968   - return averageMileage;
969   - }
970   -
971   - public void setAverageMileage(String averageMileage) {
972   - this.averageMileage = averageMileage;
973   - }
974   -
975   - public String getAverageMileageOld() {
976   - return averageMileageOld;
977   - }
978   -
979   - public void setAverageMileageOld(String averageMileageOld) {
980   - this.averageMileageOld = averageMileageOld;
981   - }
982   -
983 895 public String getStationUp() {
984 896 return stationUp;
985 897 }
... ... @@ -1252,22 +1164,6 @@ public class LineHistoryReport extends BaseEntity
1252 1164 this.directionsOld = directionsOld;
1253 1165 }
1254 1166  
1255   - public String getNumberOfManage() {
1256   - return numberOfManage;
1257   - }
1258   -
1259   - public void setNumberOfManage(String numberOfManage) {
1260   - this.numberOfManage = numberOfManage;
1261   - }
1262   -
1263   - public String getNumberOfManageOld() {
1264   - return numberOfManageOld;
1265   - }
1266   -
1267   - public void setNumberOfManageOld(String numberOfManageOld) {
1268   - this.numberOfManageOld = numberOfManageOld;
1269   - }
1270   -
1271 1167 public String getHalfwayStation() {
1272 1168 return halfwayStation;
1273 1169 }
... ... @@ -1284,37 +1180,6 @@ public class LineHistoryReport extends BaseEntity
1284 1180 this.halfwayStationOld = halfwayStationOld;
1285 1181 }
1286 1182  
1287   - public Long getFullCustomerPercent() {
1288   - return fullCustomerPercent;
1289   - }
1290   -
1291   - public void setFullCustomerPercent(Long fullCustomerPercent) {
1292   - this.fullCustomerPercent = fullCustomerPercent;
1293   - }
1294   -
1295   - public Long getFullCustomerPercentOld() {
1296   - return fullCustomerPercentOld;
1297   - }
1298   -
1299   - public void setFullCustomerPercentOld(Long fullCustomerPercentOld) {
1300   - this.fullCustomerPercentOld = fullCustomerPercentOld;
1301   - }
1302   -
1303   - public Long getLowCustomerPercent() {
1304   - return lowCustomerPercent;
1305   - }
1306   -
1307   - public void setLowCustomerPercent(Long lowCustomerPercent) {
1308   - this.lowCustomerPercent = lowCustomerPercent;
1309   - }
1310   -
1311   - public Long getLowCustomerPercentOld() {
1312   - return lowCustomerPercentOld;
1313   - }
1314   -
1315   - public void setLowCustomerPercentOld(Long lowCustomerPercentOld) {
1316   - this.lowCustomerPercentOld = lowCustomerPercentOld;
1317   - }
1318 1183  
1319 1184 public String getDivideLevel() {
1320 1185 return divideLevel;
... ... @@ -1396,24 +1261,6 @@ public class LineHistoryReport extends BaseEntity
1396 1261 this.coldBonusTypeOld = coldBonusTypeOld;
1397 1262 }
1398 1263  
1399   - public Date getStartDate() {
1400   - return startDate;
1401   - }
1402   -
1403   - public void setStartDate(Date startDate) {
1404   - this.startDate = startDate;
1405   - }
1406   -
1407   - public Date getStartDateOld() {
1408   - return startDateOld;
1409   - }
1410   -
1411   - public void setStartDateOld(Date startDateOld) {
1412   - this.startDateOld = startDateOld;
1413   - }
1414   -
1415   -
1416   -
1417 1264 public String getLineUpdateType() {
1418 1265 return lineUpdateType;
1419 1266 }
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
  View file @df14b31
... ... @@ -55,7 +55,6 @@ public interface BsthTLineMapper
55 55  
56 56 BsthTLine selectBsthTLineHistoryAndisNeedUpdate(BsthTLine bsthTLine);
57 57  
58   - List<BsthTLine> findNeedUpdateHistory();
59 58  
60 59 BsthTLine selectHistoryByLineNameAndUpdateStatus(BsthTLine bsthTLine);
61 60  
... ...
bsthLineProfiles/src/main/resources/application-druid.yml
  View file @df14b31
... ... @@ -13,7 +13,7 @@ spring:
13 13 master:
14 14 url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
15 15 username: root
16   - password: Aa123456
  16 + password: 1995627a
17 17 # 从库数据源
18 18 slave:
19 19 # 从数据源开关/默认关闭
... ...
bsthLineProfiles/src/main/resources/application.yml
  View file @df14b31
... ... @@ -80,7 +80,7 @@ spring:
80 80 # 数据库索引
81 81 database: 0
82 82 # 密码
83   - password: test123
  83 + #password: test123
84 84 # 连接超时时间
85 85 timeout: 10s
86 86 lettuce:
... ...
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @df14b31
... ... @@ -30,9 +30,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
30 30 <result property="warrantEndTime" column="warrant_end_time" />
31 31 <result property="planCancelTime" column="plan_cancel_time" />
32 32 <result property="cancelTime" column="cancel_time" />
33   - <result property="cancelReason" column="cancel_reason" />
34 33 <result property="remark" column="remark" />
35   - <result property="isLogicDelete" column="is_logic_delete" />
36 34 <result property="createTime" column="create_time" />
37 35 <result property="updateBy" column="update_by" />
38 36 <result property="updateTime" column="update_time" />
... ... @@ -40,8 +38,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
40 38 <result property="timeSchedule" column="time_schedule" />
41 39 <result property="park" column="park" />
42 40 <result property="isWarrant" column="is_warrant" />
43   - <result property="isWarrantStartTime" column="isWarrant_start_time" />
44   - <result property="isWarrantEndTime" column="isWarrant_End_time" />
45 41 <result property="roadType" column="road_type" />
46 42 <result property="ticketPrice" column="ticket_price" />
47 43 <result property="firstStation" column="first_station" />
... ... @@ -50,7 +46,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
50 46 <result property="lastTime" column="last_time" />
51 47 <result property="mileageUp" column="mileage_up" />
52 48 <result property="mileageDown" column="mileage_down" />
53   - <result property="averageMileage" column="average_mileage" />
54 49 <result property="stationUp" column="station_up" />
55 50 <result property="stationDown" column="station_down" />
56 51 <result property="travelTimeUp" column="travel_time_up" />
... ... @@ -68,28 +63,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
68 63 <result property="numberPersonSales" column="number_person_sales" />
69 64 <result property="busEvNumber" column="bus_ev_number" />
70 65 <result property="directions" column="directions" />
71   - <result property="numberOfManage" column="number_of_manage" />
72 66 <result property="halfwayStation" column="halfway_station" />
73   - <result property="fullCustomerPercent" column="full_customer_percent" />
74   - <result property="lowCustomerPercent" column="low_customer_percent" />
75 67 <result property="divideLevel" column="divide_level" />
76 68 <result property="hasTimelists" column="has_timelists" />
77 69 <result property="isMetro" column="is_metro" />
78 70 <result property="metroTime" column="metro_time" />
79 71 <result property="coldBonusType" column="cold_bonus_type" />
80   - <result property="revenuesMonth" column="revenues_month" />
81   - <result property="personMonth" column="person_month" />
82   - <result property="mileageMonth" column="mileage_month" />
83   - <result property="personMonthAvg" column="person_month_avg" />
84   - <result property="revenues" column="revenues" />
85   - <result property="persons" column="persons" />
86   - <result property="mileages" column="mileages" />
87   - <result property="personAvg" column="person_avg" />
88   - <result property="startDate" column="start_date" />
89   - <result property="startReason" column="start_reason" />
90   - <result property="nightParking" column="night_parking" />
91 72 <result property="files" column="files" />
92   - <result property="startReason" column="start_reason" />
93 73 <result property="revenueType" column="revenue_type" />
94 74 <result property="updateStatus" column="update_status" />
95 75 <result property="lineUpdateType" column="line_update_type" />
... ... @@ -109,7 +89,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
109 89 <result property="vehiclesNumberBefore" column="vehicles_number_before" />
110 90 <result property="numberPersonBefore" column="number_person_before" />
111 91 <result property="createTime" column="create_time" />
112   - <result property="startDate" column="start_date" />
113 92 <result property="lineUpdateType" column="line_update_type" />
114 93 <result property="files" column="files" />
115 94 </resultMap>
... ... @@ -153,8 +132,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
153 132 <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
154 133 <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
155 134 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
156   - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
157   - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
158 135 <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
159 136 <if test="updateTime != null "> and update_time = #{updateTime}</if>
160 137 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
... ... @@ -168,7 +145,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
168 145 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
169 146 <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
170 147 <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
171   - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
172 148 <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
173 149 <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
174 150 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
... ... @@ -186,25 +162,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
186 162 <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
187 163 <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
188 164 <if test="directions != null and directions != ''"> and directions = #{directions}</if>
189   - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
190 165 <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
191   - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
192   - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
193 166 <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
194 167 <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
195 168 <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
196 169 <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
197 170 <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
198   - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
199   - <if test="personMonth != null "> and person_month = #{personMonth}</if>
200   - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
201   - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
202   - <if test="revenues != null "> and revenues = #{revenues}</if>
203   - <if test="persons != null "> and persons = #{persons}</if>
204   - <if test="mileages != null "> and mileages = #{mileages}</if>
205   - <if test="personAvg != null "> and person_avg = #{personAvg}</if>
206   - <if test="startDate != null "> and start_date = #{startDate}</if>
207   - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
208 171 <if test="lineUpdateType != null and lineUpdateType != ''"> and line_update_type= #{lineUpdateType}</if>
209 172 <if test="revenueType != null and revenueType != ''"> and revenue_type= #{revenueType}</if>
210 173 <if test="createTimeEnd != null and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
... ... @@ -266,15 +229,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
266 229 <if test="warrantEndTime != null">warrant_end_time,</if>
267 230 <if test="planCancelTime != null">plan_cancel_time,</if>
268 231 <if test="cancelTime != null">cancel_time,</if>
269   - <if test="cancelReason != null">cancel_reason,</if>
270 232 <if test="remark != null">remark,</if>
271   - <if test="isLogicDelete != null">is_logic_delete,</if>
272 233 <if test="createBy != null">create_by,</if>
273 234 <if test="timeSchedule != null">time_schedule,</if>
274 235 <if test="park != null">park,</if>
275 236 <if test="isWarrant != null">is_warrant,</if>
276   - <if test="isWarrantStartTime != null">isWarrant_start_time,</if>
277   - <if test="isWarrantEndTime != null">isWarrant_end_time,</if>
278 237 <if test="roadType != null">road_type,</if>
279 238 <if test="ticketPrice != null">ticket_price,</if>
280 239 <if test="firstStation != null">first_station,</if>
... ... @@ -283,7 +242,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
283 242 <if test="lastTime != null">last_time,</if>
284 243 <if test="mileageUp != null">mileage_up,</if>
285 244 <if test="mileageDown != null">mileage_down,</if>
286   - <if test="averageMileage != null">average_mileage,</if>
287 245 <if test="stationUp != null">station_up,</if>
288 246 <if test="stationDown != null">station_down,</if>
289 247 <if test="travelTimeUp != null">travel_time_up,</if>
... ... @@ -301,27 +259,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
301 259 <if test="numberPersonSales != null">number_person_sales,</if>
302 260 <if test="busEvNumber != null">bus_ev_number,</if>
303 261 <if test="directions != null">directions,</if>
304   - <if test="numberOfManage != null">number_of_manage,</if>
305 262 <if test="halfwayStation != null">halfway_station,</if>
306   - <if test="fullCustomerPercent != null">full_customer_percent,</if>
307   - <if test="lowCustomerPercent != null">low_customer_percent,</if>
308 263 <if test="divideLevel != null">divide_level,</if>
309 264 <if test="hasTimelists != null">has_timelists,</if>
310 265 <if test="isMetro != null">is_metro,</if>
311 266 <if test="metroTime != null">metro_time,</if>
312 267 <if test="coldBonusType != null">cold_bonus_type,</if>
313   - <if test="revenuesMonth != null">revenues_month,</if>
314   - <if test="personMonth != null">person_month,</if>
315   - <if test="mileageMonth != null">mileage_month,</if>
316   - <if test="personMonthAvg != null">person_month_avg,</if>
317   - <if test="revenues != null">revenues,</if>
318   - <if test="persons != null">persons,</if>
319   - <if test="mileages != null">mileages,</if>
320   - <if test="personAvg != null">person_avg,</if>
321   - <if test="nightParking != null">night_parking,</if>
322 268 <if test="files != null">files,</if>
323   - <if test="startDate != null">start_date,</if>
324   - <if test="startReason != null">start_reason,</if>
325 269 <if test="lineUpdateType != null">line_update_type,</if>
326 270 <if test="revenueType != null">revenue_type,</if>
327 271 create_time,
... ... @@ -350,15 +294,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
350 294 <if test="warrantEndTime != null">#{warrantEndTime},</if>
351 295 <if test="planCancelTime != null">#{planCancelTime},</if>
352 296 <if test="cancelTime != null">#{cancelTime},</if>
353   - <if test="cancelReason != null">#{cancelReason},</if>
354 297 <if test="remark != null">#{remark},</if>
355   - <if test="isLogicDelete != null">#{isLogicDelete},</if>
356 298 <if test="createBy != null">#{createBy},</if>
357 299 <if test="timeSchedule != null">#{timeSchedule},</if>
358 300 <if test="park != null">#{park},</if>
359 301 <if test="isWarrant != null">#{isWarrant},</if>
360   - <if test="isWarrantStartTime != null">#{isWarrantStartTime},</if>
361   - <if test="isWarrantEndTime != null">#{isWarrantEndTime},</if>
362 302 <if test="roadType != null">#{roadType},</if>
363 303 <if test="ticketPrice != null">#{ticketPrice},</if>
364 304 <if test="firstStation != null">#{firstStation},</if>
... ... @@ -367,7 +307,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
367 307 <if test="lastTime != null">#{lastTime},</if>
368 308 <if test="mileageUp != null">#{mileageUp},</if>
369 309 <if test="mileageDown != null">#{mileageDown},</if>
370   - <if test="averageMileage != null">#{averageMileage},</if>
371 310 <if test="stationUp != null">#{stationUp},</if>
372 311 <if test="stationDown != null">#{stationDown},</if>
373 312 <if test="travelTimeUp != null">#{travelTimeUp},</if>
... ... @@ -385,27 +324,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
385 324 <if test="numberPersonSales != null">#{numberPersonSales},</if>
386 325 <if test="busEvNumber != null">#{busEvNumber},</if>
387 326 <if test="directions != null">#{directions},</if>
388   - <if test="numberOfManage != null">#{numberOfManage},</if>
389 327 <if test="halfwayStation != null">#{halfwayStation},</if>
390   - <if test="fullCustomerPercent != null">#{fullCustomerPercent},</if>
391   - <if test="lowCustomerPercent != null">#{lowCustomerPercent},</if>
392 328 <if test="divideLevel != null">#{divideLevel},</if>
393 329 <if test="hasTimelists != null">#{hasTimelists},</if>
394 330 <if test="isMetro != null">#{isMetro},</if>
395 331 <if test="metroTime != null">#{metroTime},</if>
396 332 <if test="coldBonusType != null">#{coldBonusType},</if>
397   - <if test="revenuesMonth != null">#{revenuesMonth},</if>
398   - <if test="personMonth != null">#{personMonth},</if>
399   - <if test="mileageMonth != null">#{mileageMonth},</if>
400   - <if test="personMonthAvg != null">#{personMonthAvg},</if>
401   - <if test="revenues != null">#{revenues},</if>
402   - <if test="persons != null">#{persons},</if>
403   - <if test="mileages != null">#{mileages},</if>
404   - <if test="personAvg != null">#{personAvg},</if>
405   - <if test="nightParking != null">#{nightParking},</if>
406 333 <if test="files != null">#{files},</if>
407   - <if test="startDate != null">#{startDate},</if>
408   - <if test="startReason != null">#{startReason},</if>
409 334 <if test="lineUpdateType != null">#{lineUpdateType},</if>
410 335 <if test="revenueType != null">#{revenueType},</if>
411 336 sysdate(),
... ... @@ -440,16 +365,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
440 365 <if test="warrantEndTime != null">warrant_end_time = #{warrantEndTime},</if>
441 366 <if test="planCancelTime != null">plan_cancel_time = #{planCancelTime},</if>
442 367 <if test="cancelTime != null">cancel_time = #{cancelTime},</if>
443   - <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>
444 368 <if test="remark != null">remark = #{remark},</if>
445   - <if test="isLogicDelete != null">is_logic_delete = #{isLogicDelete},</if>
446 369 <if test="updateBy != null">update_by = #{updateBy},</if>
447 370 update_time = sysdate(),
448 371 <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
449 372 <if test="park != null">park = #{park},</if>
450 373 <if test="isWarrant != null">is_warrant = #{isWarrant},</if>
451   - <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>
452   - <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>
453 374 <if test="roadType != null">road_type = #{roadType},</if>
454 375 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
455 376 <if test="firstStation != null">first_station = #{firstStation},</if>
... ... @@ -458,7 +379,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
458 379 <if test="lastTime != null">last_time = #{lastTime},</if>
459 380 <if test="mileageUp != null">mileage_up = #{mileageUp},</if>
460 381 <if test="mileageDown != null">mileage_down = #{mileageDown},</if>
461   - <if test="averageMileage != null">average_mileage = #{averageMileage},</if>
462 382 <if test="stationUp != null">station_up = #{stationUp},</if>
463 383 <if test="stationDown != null">station_down = #{stationDown},</if>
464 384 <if test="travelTimeUp != null">travel_time_up = #{travelTimeUp},</if>
... ... @@ -476,28 +396,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
476 396 <if test="numberPersonSales != null">number_person_sales = #{numberPersonSales},</if>
477 397 <if test="busEvNumber != null">bus_ev_number = #{busEvNumber},</if>
478 398 <if test="directions != null">directions = #{directions},</if>
479   - <if test="numberOfManage != null">number_of_manage = #{numberOfManage},</if>
480 399 <if test="halfwayStation != null">halfway_station = #{halfwayStation},</if>
481   - <if test="fullCustomerPercent != null">full_customer_percent = #{fullCustomerPercent},</if>
482   - <if test="lowCustomerPercent != null">low_customer_percent = #{lowCustomerPercent},</if>
483 400 <if test="divideLevel != null">divide_level = #{divideLevel},</if>
484 401 <if test="hasTimelists != null">has_timelists = #{hasTimelists},</if>
485 402 <if test="isMetro != null">is_metro = #{isMetro},</if>
486 403 <if test="metroTime != null">metro_time = #{metroTime},</if>
487 404 <if test="coldBonusType != null">cold_bonus_type = #{coldBonusType},</if>
488   - <if test="revenuesMonth != null">revenues_month = #{revenuesMonth},</if>
489   - <if test="personMonth != null">person_month = #{personMonth},</if>
490   - <if test="mileageMonth != null">mileage_month = #{mileageMonth},</if>
491   - <if test="personMonthAvg != null">person_month_avg = #{personMonthAvg},</if>
492   - <if test="revenues != null">revenues = #{revenues},</if>
493   - <if test="persons != null">persons = #{persons},</if>
494   - <if test="mileages != null">mileages = #{mileages},</if>
495   - <if test="personAvg != null">person_avg = #{personAvg},</if>
496   - <if test="startDate != null">start_date = #{startDate},</if>
497   - <if test="nightParking != null">night_parking = #{nightParking},</if>
498 405 <if test="files != null">files = #{files},</if>
499 406 <if test="revenueType != null">revenue_type = #{revenueType},</if>
500   - <if test="startReason != null">start_reason = #{startReason},</if>
501 407 <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
502 408 </trim>
503 409 where id = #{id}
... ... @@ -529,16 +435,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
529 435 <if test="warrantEndTime != null">warrant_end_time = #{warrantEndTime},</if>
530 436 <if test="planCancelTime != null">plan_cancel_time = #{planCancelTime},</if>
531 437 <if test="cancelTime != null">cancel_time = #{cancelTime},</if>
532   - <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>
533 438 <if test="remark != null">remark = #{remark},</if>
534   - <if test="isLogicDelete != null">is_logic_delete = #{isLogicDelete},</if>
535 439 <if test="updateBy != null">update_by = #{updateBy},</if>
536 440 update_time = sysdate(),
537 441 <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
538 442 <if test="park != null">park = #{park},</if>
539 443 <if test="isWarrant != null">is_warrant = #{isWarrant},</if>
540   - <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>
541   - <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>
542 444 <if test="roadType != null">road_type = #{roadType},</if>
543 445 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
544 446 <if test="firstStation != null">first_station = #{firstStation},</if>
... ... @@ -547,7 +449,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
547 449 <if test="lastTime != null">last_time = #{lastTime},</if>
548 450 <if test="mileageUp != null">mileage_up = #{mileageUp},</if>
549 451 <if test="mileageDown != null">mileage_down = #{mileageDown},</if>
550   - <if test="averageMileage != null">average_mileage = #{averageMileage},</if>
551 452 <if test="stationUp != null">station_up = #{stationUp},</if>
552 453 <if test="stationDown != null">station_down = #{stationDown},</if>
553 454 <if test="travelTimeUp != null">travel_time_up = #{travelTimeUp},</if>
... ... @@ -565,27 +466,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
565 466 <if test="numberPersonSales != null">number_person_sales = #{numberPersonSales},</if>
566 467 <if test="busEvNumber != null">bus_ev_number = #{busEvNumber},</if>
567 468 <if test="directions != null">directions = #{directions},</if>
568   - <if test="numberOfManage != null">number_of_manage = #{numberOfManage},</if>
569 469 <if test="halfwayStation != null">halfway_station = #{halfwayStation},</if>
570   - <if test="fullCustomerPercent != null">full_customer_percent = #{fullCustomerPercent},</if>
571   - <if test="lowCustomerPercent != null">low_customer_percent = #{lowCustomerPercent},</if>
572 470 <if test="divideLevel != null">divide_level = #{divideLevel},</if>
573 471 <if test="hasTimelists != null">has_timelists = #{hasTimelists},</if>
574 472 <if test="isMetro != null">is_metro = #{isMetro},</if>
575 473 <if test="metroTime != null">metro_time = #{metroTime},</if>
576 474 <if test="coldBonusType != null">cold_bonus_type = #{coldBonusType},</if>
577   - <if test="revenuesMonth != null">revenues_month = #{revenuesMonth},</if>
578   - <if test="personMonth != null">person_month = #{personMonth},</if>
579   - <if test="mileageMonth != null">mileage_month = #{mileageMonth},</if>
580   - <if test="personMonthAvg != null">person_month_avg = #{personMonthAvg},</if>
581   - <if test="revenues != null">revenues = #{revenues},</if>
582   - <if test="persons != null">persons = #{persons},</if>
583   - <if test="mileages != null">mileages = #{mileages},</if>
584   - <if test="personAvg != null">person_avg = #{personAvg},</if>
585   - <if test="nightParking != null">night_parking = #{nightParking},</if>
586 475 <if test="files != null">files = #{files},</if>
587   - <if test="startDate != null">start_date = #{startDate},</if>
588   - <if test="startReason != null">start_reason = #{startReason},</if>
589 476 <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
590 477 <if test="revenueType != null">revenue_type = #{revenueType},</if>
591 478 </trim>
... ... @@ -619,8 +506,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
619 506 <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
620 507 <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
621 508 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
622   - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
623   - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
624 509 <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
625 510 <if test="updateTime != null "> and update_time = #{updateTime}</if>
626 511 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
... ... @@ -634,7 +519,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
634 519 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
635 520 <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
636 521 <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
637   - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
638 522 <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
639 523 <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
640 524 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
... ... @@ -652,25 +536,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
652 536 <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
653 537 <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
654 538 <if test="directions != null and directions != ''"> and directions = #{directions}</if>
655   - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
656 539 <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
657   - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
658   - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
659 540 <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
660 541 <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
661 542 <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
662 543 <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
663 544 <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
664   - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
665   - <if test="personMonth != null "> and person_month = #{personMonth}</if>
666   - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
667   - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
668   - <if test="revenues != null "> and revenues = #{revenues}</if>
669   - <if test="persons != null "> and persons = #{persons}</if>
670   - <if test="mileages != null "> and mileages = #{mileages}</if>
671   - <if test="personAvg != null "> and person_avg = #{personAvg}</if>
672   - <if test="startDate != null "> and start_date = #{startDate}</if>
673   - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
674 545 <if test="examineStatus != null"> and examine_status = #{examineStatus}</if>
675 546 <if test="examineType != null and examineType != ''"> and examine_type = #{examineType}</if>
676 547 <if test="createTimeStr != null and createTimeStr != ''"> and create_time >= #{createTimeStr}</if>
... ... @@ -707,15 +578,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
707 578 <if test="warrantEndTime != null">warrant_end_time,</if>
708 579 <if test="planCancelTime != null">plan_cancel_time,</if>
709 580 <if test="cancelTime != null">cancel_time,</if>
710   - <if test="cancelReason != null">cancel_reason,</if>
711 581 <if test="remark != null">remark,</if>
712   - <if test="isLogicDelete != null">is_logic_delete,</if>
713 582 <if test="createBy != null">create_by,</if>
714 583 <if test="timeSchedule != null">time_schedule,</if>
715 584 <if test="park != null">park,</if>
716 585 <if test="isWarrant != null">is_warrant,</if>
717   - <if test="isWarrantStartTime != null">isWarrant_start_time,</if>
718   - <if test="isWarrantEndTime != null">isWarrant_end_time,</if>
719 586 <if test="roadType != null">road_type,</if>
720 587 <if test="ticketPrice != null">ticket_price,</if>
721 588 <if test="firstStation != null">first_station,</if>
... ... @@ -724,7 +591,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
724 591 <if test="lastTime != null">last_time,</if>
725 592 <if test="mileageUp != null">mileage_up,</if>
726 593 <if test="mileageDown != null">mileage_down,</if>
727   - <if test="averageMileage != null">average_mileage,</if>
728 594 <if test="stationUp != null">station_up,</if>
729 595 <if test="stationDown != null">station_down,</if>
730 596 <if test="travelTimeUp != null">travel_time_up,</if>
... ... @@ -742,29 +608,15 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
742 608 <if test="numberPersonSales != null">number_person_sales,</if>
743 609 <if test="busEvNumber != null">bus_ev_number,</if>
744 610 <if test="directions != null">directions,</if>
745   - <if test="numberOfManage != null">number_of_manage,</if>
746 611 <if test="halfwayStation != null">halfway_station,</if>
747   - <if test="fullCustomerPercent != null">full_customer_percent,</if>
748   - <if test="lowCustomerPercent != null">low_customer_percent,</if>
749 612 <if test="divideLevel != null">divide_level,</if>
750 613 <if test="hasTimelists != null">has_timelists,</if>
751 614 <if test="isMetro != null">is_metro,</if>
752 615 <if test="metroTime != null">metro_time,</if>
753 616 <if test="coldBonusType != null">cold_bonus_type,</if>
754   - <if test="revenuesMonth != null">revenues_month,</if>
755   - <if test="personMonth != null">person_month,</if>
756   - <if test="mileageMonth != null">mileage_month,</if>
757   - <if test="personMonthAvg != null">person_month_avg,</if>
758   - <if test="revenues != null">revenues,</if>
759   - <if test="persons != null">persons,</if>
760   - <if test="mileages != null">mileages,</if>
761   - <if test="personAvg != null">person_avg,</if>
762   - <if test="startDate != null">start_date,</if>
763   - <if test="nightParking != null">night_parking,</if>
764 617 <if test="files != null">files,</if>
765 618 <if test="revenueType != null">revenue_type,</if>
766 619 <if test="examineType != null">examine_type,</if>
767   - <if test="startReason != null">start_reason,</if>
768 620 <if test="lineUpdateType != null">line_update_type,</if>
769 621 <if test="examineStatus != null">examine_status,</if>
770 622 create_time,
... ... @@ -793,15 +645,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
793 645 <if test="warrantEndTime != null">#{warrantEndTime},</if>
794 646 <if test="planCancelTime != null">#{planCancelTime},</if>
795 647 <if test="cancelTime != null">#{cancelTime},</if>
796   - <if test="cancelReason != null">#{cancelReason},</if>
797 648 <if test="remark != null">#{remark},</if>
798   - <if test="isLogicDelete != null">#{isLogicDelete},</if>
799 649 <if test="createBy != null">#{createBy},</if>
800 650 <if test="timeSchedule != null">#{timeSchedule},</if>
801 651 <if test="park != null">#{park},</if>
802 652 <if test="isWarrant != null">#{isWarrant},</if>
803   - <if test="isWarrantStartTime != null">#{isWarrantStartTime},</if>
804   - <if test="isWarrantEndTime != null">#{isWarrantEndTime},</if>
805 653 <if test="roadType != null">#{roadType},</if>
806 654 <if test="ticketPrice != null">#{ticketPrice},</if>
807 655 <if test="firstStation != null">#{firstStation},</if>
... ... @@ -810,7 +658,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
810 658 <if test="lastTime != null">#{lastTime},</if>
811 659 <if test="mileageUp != null">#{mileageUp},</if>
812 660 <if test="mileageDown != null">#{mileageDown},</if>
813   - <if test="averageMileage != null">#{averageMileage},</if>
814 661 <if test="stationUp != null">#{stationUp},</if>
815 662 <if test="stationDown != null">#{stationDown},</if>
816 663 <if test="travelTimeUp != null">#{travelTimeUp},</if>
... ... @@ -828,29 +675,15 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
828 675 <if test="numberPersonSales != null">#{numberPersonSales},</if>
829 676 <if test="busEvNumber != null">#{busEvNumber},</if>
830 677 <if test="directions != null">#{directions},</if>
831   - <if test="numberOfManage != null">#{numberOfManage},</if>
832 678 <if test="halfwayStation != null">#{halfwayStation},</if>
833   - <if test="fullCustomerPercent != null">#{fullCustomerPercent},</if>
834   - <if test="lowCustomerPercent != null">#{lowCustomerPercent},</if>
835 679 <if test="divideLevel != null">#{divideLevel},</if>
836 680 <if test="hasTimelists != null">#{hasTimelists},</if>
837 681 <if test="isMetro != null">#{isMetro},</if>
838 682 <if test="metroTime != null">#{metroTime},</if>
839 683 <if test="coldBonusType != null">#{coldBonusType},</if>
840   - <if test="revenuesMonth != null">#{revenuesMonth},</if>
841   - <if test="personMonth != null">#{personMonth},</if>
842   - <if test="mileageMonth != null">#{mileageMonth},</if>
843   - <if test="personMonthAvg != null">#{personMonthAvg},</if>
844   - <if test="revenues != null">#{revenues},</if>
845   - <if test="persons != null">#{persons},</if>
846   - <if test="mileages != null">#{mileages},</if>
847   - <if test="personAvg != null">#{personAvg},</if>
848   - <if test="startDate != null">#{startDate},</if>
849   - <if test="nightParking != null">#{nightParking},</if>
850 684 <if test="files != null">#{files},</if>
851 685 <if test="revenueType != null">#{revenueType},</if>
852 686 <if test="examineType != null">#{examineType},</if>
853   - <if test="startReason != null">#{startReason},</if>
854 687 <if test="lineUpdateType != null">#{lineUpdateType},</if>
855 688 <if test="examineStatus != null">#{examineStatus},</if>
856 689 sysdate(),
... ... @@ -902,16 +735,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
902 735 <if test="warrantEndTime != null">warrant_end_time = #{warrantEndTime},</if>
903 736 <if test="planCancelTime != null">plan_cancel_time = #{planCancelTime},</if>
904 737 <if test="cancelTime != null">cancel_time = #{cancelTime},</if>
905   - <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>
906 738 <if test="remark != null">remark = #{remark},</if>
907   - <if test="isLogicDelete != null">is_logic_delete = #{isLogicDelete},</if>
908 739 <if test="updateBy != null">update_by = #{updateBy},</if>
909 740 update_time = sysdate(),
910 741 <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
911 742 <if test="park != null">park = #{park},</if>
912 743 <if test="isWarrant != null">is_warrant = #{isWarrant},</if>
913   - <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>
914   - <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>
915 744 <if test="roadType != null">road_type = #{roadType},</if>
916 745 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
917 746 <if test="firstStation != null">first_station = #{firstStation},</if>
... ... @@ -920,7 +749,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
920 749 <if test="lastTime != null">last_time = #{lastTime},</if>
921 750 <if test="mileageUp != null">mileage_up = #{mileageUp},</if>
922 751 <if test="mileageDown != null">mileage_down = #{mileageDown},</if>
923   - <if test="averageMileage != null">average_mileage = #{averageMileage},</if>
924 752 <if test="stationUp != null">station_up = #{stationUp},</if>
925 753 <if test="stationDown != null">station_down = #{stationDown},</if>
926 754 <if test="travelTimeUp != null">travel_time_up = #{travelTimeUp},</if>
... ... @@ -938,27 +766,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
938 766 <if test="numberPersonSales != null">number_person_sales = #{numberPersonSales},</if>
939 767 <if test="busEvNumber != null">bus_ev_number = #{busEvNumber},</if>
940 768 <if test="directions != null">directions = #{directions},</if>
941   - <if test="numberOfManage != null">number_of_manage = #{numberOfManage},</if>
942 769 <if test="halfwayStation != null">halfway_station = #{halfwayStation},</if>
943   - <if test="fullCustomerPercent != null">full_customer_percent = #{fullCustomerPercent},</if>
944   - <if test="lowCustomerPercent != null">low_customer_percent = #{lowCustomerPercent},</if>
945 770 <if test="divideLevel != null">divide_level = #{divideLevel},</if>
946 771 <if test="hasTimelists != null">has_timelists = #{hasTimelists},</if>
947 772 <if test="isMetro != null">is_metro = #{isMetro},</if>
948 773 <if test="metroTime != null">metro_time = #{metroTime},</if>
949 774 <if test="coldBonusType != null">cold_bonus_type = #{coldBonusType},</if>
950   - <if test="revenuesMonth != null">revenues_month = #{revenuesMonth},</if>
951   - <if test="personMonth != null">person_month = #{personMonth},</if>
952   - <if test="mileageMonth != null">mileage_month = #{mileageMonth},</if>
953   - <if test="personMonthAvg != null">person_month_avg = #{personMonthAvg},</if>
954   - <if test="revenues != null">revenues = #{revenues},</if>
955   - <if test="persons != null">persons = #{persons},</if>
956   - <if test="mileages != null">mileages = #{mileages},</if>
957   - <if test="personAvg != null">person_avg = #{personAvg},</if>
958   - <if test="nightParking != null">night_parking = #{nightParking},</if>
959 775 <if test="files != null">files = #{files},</if>
960   - start_date = #{startDate},
961   - <if test="startReason != null">start_reason = #{startReason},</if>
962 776 <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
963 777 <if test="revenueType != null">revenue_type = #{revenueType},</if>
964 778 <if test="examineType != null">examine_type = #{examineType},</if>
... ... @@ -1006,8 +820,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1006 820 <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
1007 821 <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
1008 822 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
1009   - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
1010   - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
1011 823 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
1012 824 <if test="park != null and park != ''"> and park = #{park}</if>
1013 825 <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
... ... @@ -1019,7 +831,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1019 831 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
1020 832 <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
1021 833 <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
1022   - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
1023 834 <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
1024 835 <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
1025 836 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
... ... @@ -1037,26 +848,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1037 848 <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
1038 849 <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
1039 850 <if test="directions != null and directions != ''"> and directions = #{directions}</if>
1040   - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
1041 851 <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
1042   - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
1043   - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
1044 852 <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
1045 853 <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
1046 854 <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
1047 855 <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
1048 856 <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
1049   - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
1050   - <if test="personMonth != null "> and person_month = #{personMonth}</if>
1051   - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
1052   - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
1053   - <if test="revenues != null "> and revenues = #{revenues}</if>
1054   - <if test="persons != null "> and persons = #{persons}</if>
1055   - <if test="mileages != null "> and mileages = #{mileages}</if>
1056   - <if test="personAvg != null "> and person_avg = #{personAvg}</if>
1057   - <if test="startDate != null "> and start_date > #{startDate}</if>
1058   - <if test="startReason != null "> and start_reason = #{startReason}</if>
1059   - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
1060 857 <if test="createTimeStr != null and createTimeStr != ''"> and create_time >= #{createTimeStr}</if>
1061 858 <if test="createTimeEnd != null and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
1062 859 <if test="historyId != null and historyId != ''"> and history_id is not null</if>
... ... @@ -1110,15 +907,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1110 907 <if test="warrantEndTime != null">warrant_end_time,</if>
1111 908 <if test="planCancelTime != null">plan_cancel_time,</if>
1112 909 <if test="cancelTime != null">cancel_time,</if>
1113   - <if test="cancelReason != null">cancel_reason,</if>
1114 910 <if test="remark != null">remark,</if>
1115   - <if test="isLogicDelete != null">is_logic_delete,</if>
1116 911 <if test="createBy != null">create_by,</if>
1117 912 <if test="timeSchedule != null">time_schedule,</if>
1118 913 <if test="park != null">park,</if>
1119 914 <if test="isWarrant != null">is_warrant,</if>
1120   - <if test="isWarrantStartTime != null">isWarrant_start_time,</if>
1121   - <if test="isWarrantEndTime != null">isWarrant_end_time,</if>
1122 915 <if test="roadType != null">road_type,</if>
1123 916 <if test="ticketPrice != null">ticket_price,</if>
1124 917 <if test="firstStation != null">first_station,</if>
... ... @@ -1127,7 +920,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1127 920 <if test="lastTime != null">last_time,</if>
1128 921 <if test="mileageUp != null">mileage_up,</if>
1129 922 <if test="mileageDown != null">mileage_down,</if>
1130   - <if test="averageMileage != null">average_mileage,</if>
1131 923 <if test="stationUp != null">station_up,</if>
1132 924 <if test="stationDown != null">station_down,</if>
1133 925 <if test="travelTimeUp != null">travel_time_up,</if>
... ... @@ -1145,27 +937,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1145 937 <if test="numberPersonSales != null">number_person_sales,</if>
1146 938 <if test="busEvNumber != null">bus_ev_number,</if>
1147 939 <if test="directions != null">directions,</if>
1148   - <if test="numberOfManage != null">number_of_manage,</if>
1149 940 <if test="halfwayStation != null">halfway_station,</if>
1150   - <if test="fullCustomerPercent != null">full_customer_percent,</if>
1151   - <if test="lowCustomerPercent != null">low_customer_percent,</if>
1152 941 <if test="divideLevel != null">divide_level,</if>
1153 942 <if test="hasTimelists != null">has_timelists,</if>
1154 943 <if test="isMetro != null">is_metro,</if>
1155 944 <if test="metroTime != null">metro_time,</if>
1156 945 <if test="coldBonusType != null">cold_bonus_type,</if>
1157   - <if test="revenuesMonth != null">revenues_month,</if>
1158   - <if test="personMonth != null">person_month,</if>
1159   - <if test="mileageMonth != null">mileage_month,</if>
1160   - <if test="personMonthAvg != null">person_month_avg,</if>
1161   - <if test="revenues != null">revenues,</if>
1162   - <if test="persons != null">persons,</if>
1163   - <if test="mileages != null">mileages,</if>
1164   - <if test="personAvg != null">person_avg,</if>
1165   - <if test="nightParking != null">night_parking,</if>
1166 946 <if test="files != null">files,</if>
1167   - <if test="startDate != null">start_date,</if>
1168   - <if test="startReason != null">start_reason,</if>
1169 947 <if test="lineUpdateType != null">line_update_type,</if>
1170 948 <if test="revenueType != null">revenue_type,</if>
1171 949 <if test="updateStatus != null">update_status,</if>
... ... @@ -1196,15 +974,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1196 974 <if test="warrantEndTime != null">#{warrantEndTime},</if>
1197 975 <if test="planCancelTime != null">#{planCancelTime},</if>
1198 976 <if test="cancelTime != null">#{cancelTime},</if>
1199   - <if test="cancelReason != null">#{cancelReason},</if>
1200 977 <if test="remark != null">#{remark},</if>
1201   - <if test="isLogicDelete != null">#{isLogicDelete},</if>
1202 978 <if test="createBy != null">#{createBy},</if>
1203 979 <if test="timeSchedule != null">#{timeSchedule},</if>
1204 980 <if test="park != null">#{park},</if>
1205 981 <if test="isWarrant != null">#{isWarrant},</if>
1206   - <if test="isWarrantStartTime != null">#{isWarrantStartTime},</if>
1207   - <if test="isWarrantEndTime != null">#{isWarrantEndTime},</if>
1208 982 <if test="roadType != null">#{roadType},</if>
1209 983 <if test="ticketPrice != null">#{ticketPrice},</if>
1210 984 <if test="firstStation != null">#{firstStation},</if>
... ... @@ -1213,7 +987,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1213 987 <if test="lastTime != null">#{lastTime},</if>
1214 988 <if test="mileageUp != null">#{mileageUp},</if>
1215 989 <if test="mileageDown != null">#{mileageDown},</if>
1216   - <if test="averageMileage != null">#{averageMileage},</if>
1217 990 <if test="stationUp != null">#{stationUp},</if>
1218 991 <if test="stationDown != null">#{stationDown},</if>
1219 992 <if test="travelTimeUp != null">#{travelTimeUp},</if>
... ... @@ -1231,27 +1004,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1231 1004 <if test="numberPersonSales != null">#{numberPersonSales},</if>
1232 1005 <if test="busEvNumber != null">#{busEvNumber},</if>
1233 1006 <if test="directions != null">#{directions},</if>
1234   - <if test="numberOfManage != null">#{numberOfManage},</if>
1235 1007 <if test="halfwayStation != null">#{halfwayStation},</if>
1236   - <if test="fullCustomerPercent != null">#{fullCustomerPercent},</if>
1237   - <if test="lowCustomerPercent != null">#{lowCustomerPercent},</if>
1238 1008 <if test="divideLevel != null">#{divideLevel},</if>
1239 1009 <if test="hasTimelists != null">#{hasTimelists},</if>
1240 1010 <if test="isMetro != null">#{isMetro},</if>
1241 1011 <if test="metroTime != null">#{metroTime},</if>
1242 1012 <if test="coldBonusType != null">#{coldBonusType},</if>
1243   - <if test="revenuesMonth != null">#{revenuesMonth},</if>
1244   - <if test="personMonth != null">#{personMonth},</if>
1245   - <if test="mileageMonth != null">#{mileageMonth},</if>
1246   - <if test="personMonthAvg != null">#{personMonthAvg},</if>
1247   - <if test="revenues != null">#{revenues},</if>
1248   - <if test="persons != null">#{persons},</if>
1249   - <if test="mileages != null">#{mileages},</if>
1250   - <if test="personAvg != null">#{personAvg},</if>
1251   - <if test="nightParking != null">#{nightParking},</if>
1252 1013 <if test="files != null">#{files},</if>
1253   - <if test="startDate != null">#{startDate},</if>
1254   - <if test="startReason != null">#{startReason},</if>
1255 1014 <if test="lineUpdateType != null">#{lineUpdateType},</if>
1256 1015 <if test="revenueType != null">#{revenueType},</if>
1257 1016 <if test="updateStatus != null">#{updateStatus},</if>
... ... @@ -1287,9 +1046,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1287 1046 <if test="warrantEndTime != null">warrant_end_time = #{warrantEndTime},</if>
1288 1047 <if test="planCancelTime != null">plan_cancel_time = #{planCancelTime},</if>
1289 1048 <if test="cancelTime != null">cancel_time = #{cancelTime},</if>
1290   - <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>
1291 1049 <if test="remark != null">remark = #{remark},</if>
1292   - <if test="isLogicDelete != null">is_logic_delete = #{isLogicDelete},</if>
1293 1050 <if test="updateBy != null">update_by = #{updateBy},</if>
1294 1051 update_time = sysdate(),
1295 1052 <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
... ... @@ -1303,7 +1060,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1303 1060 <if test="lastTime != null">last_time = #{lastTime},</if>
1304 1061 <if test="mileageUp != null">mileage_up = #{mileageUp},</if>
1305 1062 <if test="mileageDown != null">mileage_down = #{mileageDown},</if>
1306   - <if test="averageMileage != null">average_mileage = #{averageMileage},</if>
1307 1063 <if test="stationUp != null">station_up = #{stationUp},</if>
1308 1064 <if test="stationDown != null">station_down = #{stationDown},</if>
1309 1065 <if test="travelTimeUp != null">travel_time_up = #{travelTimeUp},</if>
... ... @@ -1321,27 +1077,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1321 1077 <if test="numberPersonSales != null">number_person_sales = #{numberPersonSales},</if>
1322 1078 <if test="busEvNumber != null">bus_ev_number = #{busEvNumber},</if>
1323 1079 <if test="directions != null">directions = #{directions},</if>
1324   - <if test="numberOfManage != null">number_of_manage = #{numberOfManage},</if>
1325 1080 <if test="halfwayStation != null">halfway_station = #{halfwayStation},</if>
1326   - <if test="fullCustomerPercent != null">full_customer_percent = #{fullCustomerPercent},</if>
1327   - <if test="lowCustomerPercent != null">low_customer_percent = #{lowCustomerPercent},</if>
1328 1081 <if test="divideLevel != null">divide_level = #{divideLevel},</if>
1329 1082 <if test="hasTimelists != null">has_timelists = #{hasTimelists},</if>
1330 1083 <if test="isMetro != null">is_metro = #{isMetro},</if>
1331 1084 <if test="metroTime != null">metro_time = #{metroTime},</if>
1332 1085 <if test="coldBonusType != null">cold_bonus_type = #{coldBonusType},</if>
1333   - <if test="revenuesMonth != null">revenues_month = #{revenuesMonth},</if>
1334   - <if test="personMonth != null">person_month = #{personMonth},</if>
1335   - <if test="mileageMonth != null">mileage_month = #{mileageMonth},</if>
1336   - <if test="personMonthAvg != null">person_month_avg = #{personMonthAvg},</if>
1337   - <if test="revenues != null">revenues = #{revenues},</if>
1338   - <if test="persons != null">persons = #{persons},</if>
1339   - <if test="mileages != null">mileages = #{mileages},</if>
1340   - <if test="personAvg != null">person_avg = #{personAvg},</if>
1341   - <if test="nightParking != null">night_parking = #{nightParking},</if>
1342 1086 <if test="files != null">files = #{files},</if>
1343   - <if test="startDate != null">start_date = #{startDate},</if>
1344   - <if test="startReason != null ">start_reason = #{startReason},</if>
1345 1087 <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
1346 1088 <if test="revenueType != null">revenue_type = #{revenueType},</if>
1347 1089 <if test="updateStatus != null ">update_status = #{updateStatus},</if>
... ... @@ -1376,8 +1118,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1376 1118 <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
1377 1119 <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
1378 1120 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
1379   - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
1380   - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
1381 1121 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
1382 1122 <if test="park != null and park != ''"> and park = #{park}</if>
1383 1123 <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
... ... @@ -1389,7 +1129,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1389 1129 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
1390 1130 <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
1391 1131 <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
1392   - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
1393 1132 <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
1394 1133 <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
1395 1134 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
... ... @@ -1407,38 +1146,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1407 1146 <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
1408 1147 <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
1409 1148 <if test="directions != null and directions != ''"> and directions = #{directions}</if>
1410   - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
1411 1149 <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
1412   - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
1413   - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
1414 1150 <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
1415 1151 <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
1416 1152 <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
1417 1153 <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
1418 1154 <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
1419   - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
1420   - <if test="personMonth != null "> and person_month = #{personMonth}</if>
1421   - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
1422   - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
1423   - <if test="revenues != null "> and revenues = #{revenues}</if>
1424   - <if test="persons != null "> and persons = #{persons}</if>
1425   - <if test="mileages != null "> and mileages = #{mileages}</if>
1426   - <if test="personAvg != null "> and person_avg = #{personAvg}</if>
1427   - <if test="startDate != null "> and start_date = #{startDate}</if>
1428   - <if test="startReason != null "> and start_reason = #{startReason}</if>
1429   - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
1430 1155 and update_status != "-1"
1431 1156 </where>
1432 1157 </select>
1433 1158  
1434 1159  
1435   - <select id="findNeedUpdateHistory" resultMap="BsthTLineResult">
1436   - select * from
1437   - bsth_t_line_history where start_date &lt; sysdate() and update_status
1438   - = "1"
1439   - </select>
1440   -
1441   -
1442 1160 <select id="selectHistoryByLineNameAndUpdateStatus" parameterType="BsthTLine"
1443 1161 resultMap="BsthTLineResult">
1444 1162 <include refid="selectBsthTLineHistoryVo" />
... ... @@ -1473,8 +1191,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1473 1191 <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
1474 1192 <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
1475 1193 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
1476   - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
1477   - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
1478 1194 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
1479 1195 <if test="park != null and park != ''"> and park = #{park}</if>
1480 1196 <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
... ... @@ -1486,7 +1202,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1486 1202 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
1487 1203 <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
1488 1204 <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
1489   - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
1490 1205 <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
1491 1206 <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
1492 1207 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
... ... @@ -1504,26 +1219,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1504 1219 <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
1505 1220 <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
1506 1221 <if test="directions != null and directions != ''"> and directions = #{directions}</if>
1507   - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
1508 1222 <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
1509   - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
1510   - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
1511 1223 <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
1512 1224 <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
1513 1225 <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
1514 1226 <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
1515 1227 <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
1516   - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
1517   - <if test="personMonth != null "> and person_month = #{personMonth}</if>
1518   - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
1519   - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
1520   - <if test="revenues != null "> and revenues = #{revenues}</if>
1521   - <if test="persons != null "> and persons = #{persons}</if>
1522   - <if test="mileages != null "> and mileages = #{mileages}</if>
1523   - <if test="personAvg != null "> and person_avg = #{personAvg}</if>
1524   - <if test="startDate != null "> and start_date > #{startDate}</if>
1525   - <if test="startReason != null "> and start_reason = #{startReason}</if>
1526   - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
1527 1228 </where>
1528 1229 group by line_name
1529 1230 </select>
... ... @@ -1566,8 +1267,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1566 1267 <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
1567 1268 <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
1568 1269 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
1569   - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
1570   - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
1571 1270 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
1572 1271 <if test="park != null and park != ''"> and park = #{park}</if>
1573 1272 <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
... ... @@ -1579,7 +1278,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1579 1278 <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
1580 1279 <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
1581 1280 <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
1582   - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
1583 1281 <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
1584 1282 <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
1585 1283 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
... ... @@ -1597,26 +1295,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1597 1295 <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
1598 1296 <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
1599 1297 <if test="directions != null and directions != ''"> and directions = #{directions}</if>
1600   - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
1601 1298 <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
1602   - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
1603   - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
1604 1299 <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
1605 1300 <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
1606 1301 <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
1607 1302 <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
1608 1303 <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
1609   - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
1610   - <if test="personMonth != null "> and person_month = #{personMonth}</if>
1611   - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
1612   - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
1613   - <if test="revenues != null "> and revenues = #{revenues}</if>
1614   - <if test="persons != null "> and persons = #{persons}</if>
1615   - <if test="mileages != null "> and mileages = #{mileages}</if>
1616   - <if test="personAvg != null "> and person_avg = #{personAvg}</if>
1617   - <if test="startDate != null "> and start_date = #{startDate}</if>
1618   - <if test="startReason != null "> and start_reason = #{startReason}</if>
1619   - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
1620 1304 and update_status = "1"
1621 1305 </where>
1622 1306 </select>
... ... @@ -1663,36 +1347,36 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1663 1347 h1.inout_district inoutDistrict,h1.service_state serviceState,h1.bus_type busType,h1.air_conditioner_type airConditionerType,
1664 1348 h1.sell_ticket_type sellTicketType,h1.service_time serviceTime,h1.line_distance lineDistance,h1.line_code lineCode,
1665 1349 h1.warrant_year warrantYear,h1.warrant_start_time warrantStartTime,h1.warrant_end_time warrantEndTime,
1666   - h1.plan_cancel_time planCancelTime,h1.cancel_time cancelTime,h1.cancel_reason cancelReason,h1.remark remark,
1667   - h1.time_schedule timeSchedule,h1.park park,h1.is_warrant isWarrant,h1.isWarrant_start_time isWarrantStartTime,
1668   - h1.isWarrant_end_time isWarrantEndTime,h1.road_type roadType,h1.ticket_price ticketPrice,h1.first_station firstStation,
  1350 + h1.plan_cancel_time planCancelTime,h1.cancel_time cancelTime,h1.remark remark,
  1351 + h1.time_schedule timeSchedule,h1.park park,h1.is_warrant isWarrant,
  1352 + h1.road_type roadType,h1.ticket_price ticketPrice,h1.first_station firstStation,
1669 1353 h1.first_time firstTime, h1.last_station lastStation, h1.last_time lastTime, h1.mileage_up mileageUp,
1670   - h1.mileage_down mileageDown,h1.average_mileage averageMileage,h1.station_up stationUp,h1.station_down stationDown,
  1354 + h1.mileage_down mileageDown,h1.station_up stationUp,h1.station_down stationDown,
1671 1355 h1.travel_time_up travelTimeUp,h1.travel_time_down travelTimeDown,h1.travel_interval_up travelIntervalUp,
1672 1356 h1.travel_interval_down travelIntervalDown,h1.warrant_vehicles_large warrantVehiclesLarge,h1.warrant_vehicles_middle warrantVehiclesMiddle,
1673 1357 h1.vehicles_number vehiclesNumber,h1.number_vehicles_large numberVehiclesLarge,h1.number_vehicles_middle numberVehiclesMiddle,
1674 1358 h1.car_plate carPlate,h1.number_person numberPerson,h1.number_person_driver numberPersonDriver,h1.number_person_sales numberPersonSales,
1675   - h1.bus_ev_number busEvNumber,h1.directions directions,h1.number_of_manage numberOfManage,h1.halfway_station halfwayStation,
1676   - h1.full_customer_percent fullCustomerPercent,h1.low_customer_percent lowCustomerPercent,h1.divide_level divideLevel,
1677   - h1.has_timelists hasTimelists,h1.is_metro isMetro,h1.metro_time metroTime,h1.cold_bonus_type coldBonusType,h1.start_date startDate,
  1359 + h1.bus_ev_number busEvNumber,h1.directions directions,h1.halfway_station halfwayStation,
  1360 + h1.divide_level divideLevel,
  1361 + h1.has_timelists hasTimelists,h1.is_metro isMetro,h1.metro_time metroTime,h1.cold_bonus_type coldBonusType,
1678 1362 h1.line_update_type lineUpdateType,h1.revenue_type revenueType,
1679 1363 h2.id idOld,h2.line_name lineNameOld,h2.company companyOld,h2.f_company fCompanyOld,h2.p_line_id pLineIdOld,
1680 1364 h2.service_type serviceTypeOld,h2.line_level lineLevelOld,h2.line_type lineTypeOld,h2.district districtOld,
1681 1365 h2.inout_district inoutDistrictOld,h2.service_state serviceStateOld,h2.bus_type busTypeOld,h2.air_conditioner_type airConditionerTypeOld,
1682 1366 h2.sell_ticket_type sellTicketTypeOld,h2.service_time serviceTimeOld,h2.line_distance lineDistanceOld,h2.line_code lineCodeOld,
1683 1367 h2.warrant_year warrantYearOld,h2.warrant_start_time warrantStartTimeOld,h2.warrant_end_time warrantEndTimeOld,
1684   - h2.plan_cancel_time planCancelTimeOld,h2.cancel_time cancelTimeOld,h2.cancel_reason cancelReasonOld,h2.remark remarkOld,
1685   - h2.time_schedule timeScheduleOld,h2.park parkOld,h2.is_warrant isWarrantOld,h2.isWarrant_start_time isWarrantStartTimeOld,
1686   - h2.isWarrant_end_time isWarrantEndTimeOld,h2.road_type roadTypeOld,h2.ticket_price ticketPriceOld,h2.first_station firstStationOld,
  1368 + h2.plan_cancel_time planCancelTimeOld,h2.cancel_time cancelTimeOld,h2.remark remarkOld,
  1369 + h2.time_schedule timeScheduleOld,h2.park parkOld,h2.is_warrant isWarrantOld,
  1370 + h2.road_type roadTypeOld,h2.ticket_price ticketPriceOld,h2.first_station firstStationOld,
1687 1371 h2.first_time firstTimeOld, h2.last_station lastStationOld, h2.last_time lastTimeOld, h2.mileage_up mileageUpOld,
1688   - h2.mileage_down mileageDownOld,h2.average_mileage averageMileageOld,h2.station_up stationUpOld,h2.station_down stationDownOld,
  1372 + h2.mileage_down mileageDownOld,h2.station_up stationUpOld,h2.station_down stationDownOld,
1689 1373 h2.travel_time_up travelTimeUpOld,h2.travel_time_down travelTimeDownOld,h2.travel_interval_up travelIntervalUpOld,
1690 1374 h2.travel_interval_down travelIntervalDownOld,h2.warrant_vehicles_large warrantVehiclesLargeOld,h2.warrant_vehicles_middle warrantVehiclesMiddleOld,
1691 1375 h2.vehicles_number vehiclesNumberOld,h2.number_vehicles_large numberVehiclesLargeOld,h2.number_vehicles_middle numberVehiclesMiddleOld,
1692 1376 h2.car_plate carPlateOld,h2.number_person numberPersonOld,h2.number_person_driver numberPersonDriverOld,h2.number_person_sales numberPersonSalesOld,
1693   - h2.bus_ev_number busEvNumberOld,h2.directions directionsOld,h2.number_of_manage numberOfManageOld,h2.halfway_station halfwayStationOld,
1694   - h2.full_customer_percent fullCustomerPercentOld,h2.low_customer_percent lowCustomerPercentOld,h2.divide_level divideLevelOld,
1695   - h2.has_timelists hasTimelistsOld,h2.is_metro isMetroOld,h2.metro_time metroTimeOld,h2.cold_bonus_type coldBonusTypeOld,h2.start_date startDateOld,
  1377 + h2.bus_ev_number busEvNumberOld,h2.directions directionsOld,h2.halfway_station halfwayStationOld,
  1378 + h2.divide_level divideLevelOld,
  1379 + h2.has_timelists hasTimelistsOld,h2.is_metro isMetroOld,h2.metro_time metroTimeOld,h2.cold_bonus_type coldBonusTypeOld,
1696 1380 h2.line_update_type lineUpdateTypeOld,h2.revenue_type revenueTypeOld
1697 1381 FROM bsth_t_line_history h1 LEFT JOIN bsth_t_line_history h2 on h1.history_id=h2.id
1698 1382 <where>
... ...
bsthLineProfiles/src/main/resources/templates/system/historyReport/historyReport.html
  View file @df14b31
... ... @@ -132,7 +132,7 @@
132 132 },
133 133 {
134 134 field: 'numberPerson',
135   - title: '线路总配人数'
  135 + title: '线路配档数'
136 136 },{
137 137 field: 'createTime',
138 138 title: '审批日期',
... ... @@ -142,16 +142,6 @@
142 142 value = "";
143 143 return value.substring(0,10);
144 144 }
145   - },
146   - {
147   - field: 'startDate',
148   - title: '开通日期',
149   - align: 'center',
150   - formatter: function(value, row, index) {
151   - if(!value)
152   - value = "";
153   - return value.substring(0,10);
154   - }
155 145 }]
156 146 };
157 147 $.table.init(options);
... ...
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
  View file @df14b31
... ... @@ -171,11 +171,11 @@
171 171 </div>
172 172 </span>
173 173 <!---------------------------------->
174   - <span id="lineCode">
  174 + <!--<span id="lineCode">
175 175 <label class="col-sm-1 control-label">线路编码：</label>
176 176 <div class="col-sm-2">
177 177 <input name="lineCode" th:field="*{lineCode}" class="form-control" type="text" disabled>
178   - </div></span>
  178 + </div></span>-->
179 179 </div>
180 180  
181 181 <div class="form-group">
... ... @@ -216,24 +216,24 @@
216 216 </div></span>
217 217 <!---------------------------------->
218 218 <span id="firstTime">
219   - <label class="col-sm-1 control-label">首站时间：</label>
  219 + <label class="col-sm-1 control-label">起点站首末班：</label>
220 220 <div class="col-sm-2">
221 221 <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text" disabled>
222 222 </div></span>
223 223 <!---------------------------------->
224 224 <span id="lastTime">
225   - <label class="col-sm-1 control-label">末站首站时间：</label>
  225 + <label class="col-sm-1 control-label">终点站首末班：</label>
226 226 <div class="col-sm-2">
227 227 <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text" disabled>
228 228 </div></span>
229 229 </div>
230 230  
231 231 <div class="form-group">
232   - <span id="park">
  232 + <!--<span id="park">
233 233 <label class="col-sm-1 control-label">停车场：</label>
234 234 <div class="col-sm-2">
235 235 <input name="park" th:field="*{park}" class="form-control" type="text" disabled>
236   - </div></span>
  236 + </div></span>-->
237 237 <!---------------------------------->
238 238 <span id="warrantYear">
239 239 <label class="col-sm-1 control-label">授权年限：</label>
... ... @@ -265,7 +265,7 @@
265 265  
266 266 <div class="form-group">
267 267 <span id="planCancelTime">
268   - <label class="col-sm-1 control-label">撤销日期：</label>
  268 + <label class="col-sm-1 control-label">线路暂停日期：</label>
269 269 <div class="col-sm-2">
270 270 <div class="input-group date">
271 271 <input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
... ... @@ -284,14 +284,8 @@
284 284 </div>
285 285 </div></span>
286 286 <!---------------------------------->
287   - <span id="cancelReason">
288   - <label class="col-sm-1 control-label">撤销原因：</label>
289   - <div class="col-sm-2">
290   - <textarea name="cancelReason" class="form-control" disabled>[[*{cancelReason}]]</textarea>
291   - </div></span>
292   - <!---------------------------------->
293 287 <span id="timeSchedule">
294   - <label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
  288 + <label class="col-sm-1 control-label">实施时间：</label>
295 289 <div class="col-sm-2">
296 290 <div class="input-group date">
297 291 <input name="timeSchedule" th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
... ... @@ -311,26 +305,6 @@
311 305 </select>
312 306 </div></span>
313 307 <!---------------------------------->
314   - <span id="isWarrantStartTime">
315   - <label class="col-sm-1 control-label">权证开通日期：</label>
316   - <div class="col-sm-2">
317   - <div class="input-group date">
318   - <input name="isWarrantStartTime" th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
319   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
320   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
321   - </div>
322   - </div></span>
323   - <!---------------------------------->
324   - <span id="isWarrantEndTime">
325   - <label class="col-sm-1 control-label">权证到期日期：</label>
326   - <div class="col-sm-2">
327   - <div class="input-group date">
328   - <input name="isWarrantEndTime" th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
329   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
330   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
331   - </div>
332   - </div></span>
333   - <!---------------------------------->
334 308 <span id="warrantVehiclesLarge">
335 309 <label class="col-sm-1 control-label">经营权证（大巴）：</label>
336 310 <div class="col-sm-2">
... ... @@ -378,12 +352,6 @@
378 352 <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text"disabled>
379 353 </div></span>
380 354 <!---------------------------------->
381   - <span id="averageMileage">
382   - <label class="col-sm-1 control-label">平均里程数：</label>
383   - <div class="col-sm-2">
384   - <input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text" disabled>
385   - </div></span>
386   - <!---------------------------------->
387 355 <span id="stationUp">
388 356 <label class="col-sm-1 control-label">站级数(上行)：</label>
389 357 <div class="col-sm-2">
... ... @@ -424,18 +392,6 @@
424 392 <input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text" disabled>
425 393 </div></span>
426 394 <!---------------------------------->
427   - <span id="fullCustomerPercent">
428   - <label class="col-sm-1 control-label">高峰系数：</label>
429   - <div class="col-sm-2">
430   - <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text" disabled>
431   - </div></span>
432   - <!---------------------------------->
433   - <span id="lowCustomerPercent">
434   - <label class="col-sm-1 control-label">低谷系数：</label>
435   - <div class="col-sm-2">
436   - <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text" disabled>
437   - </div></span>
438   - <!---------------------------------->
439 395 <span id="divideLevel">
440 396 <label class="col-sm-1 control-label">间隔等级：</label>
441 397 <div class="col-sm-2">
... ... @@ -451,7 +407,7 @@
451 407 </div></span>
452 408 <!---------------------------------->
453 409 <span id="numberPerson">
454   - <label class="col-sm-1 control-label">线路总配人数：</label>
  410 + <label class="col-sm-1 control-label">线路配档数：</label>
455 411 <div class="col-sm-2">
456 412 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text" disabled>
457 413 </div></span>
... ... @@ -507,11 +463,6 @@
507 463 </span>
508 464 </div>
509 465 <div class="form-group">
510   - <span id="numberOfManage">
511   - <label class="col-sm-1 control-label">经营权证数：</label>
512   - <div class="col-sm-2">
513   - <input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text" disabled>
514   - </div></span>
515 466 <!---------------------------------->
516 467 <span id="serviceState">
517 468 <label class="col-sm-1 control-label">营运状态：</label>
... ... @@ -551,14 +502,6 @@
551 502 </select>
552 503 </div></span>
553 504 <!---------------------------------->
554   - <span id="startDate">
555   - <label class="col-sm-1 control-label">启用时间：</label>
556   - <div class="col-sm-2">
557   - <div class="input-group date">
558   - <input name="startDate" type="text" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd HH:mm:ss')}">
559   - </div>
560   - </div></span>
561   - <!---------------------------------->
562 505 <span id="remark">
563 506 <label class="col-sm-1 control-label">备注：</label>
564 507 <div class="col-sm-2">
... ... @@ -706,35 +649,13 @@
706 649 }
707 650  
708 651 $("#form-line-edit").validate({
709   - rules:{
710   - isWarrantStartTime:{
711   - required:function (){
712   - return $('#isWarrant').val()==='1';
713   - },
714   - },
715   - isWarrantEndTime:{
716   - required:function (){
717   - return $('#isWarrant').val()==='1';
718   - },
719   - },
720   - },
721   - messages: {
722   - isWarrantStartTime: {
723   - required: "请选择日期",
724   - },
725   - isWarrantEndTime: {
726   - required: "请选择日期",
727   - }
728   - },
729 652 focusCleanup : true
730 653 });
731 654  
732 655 function submitHandler() {
733   - console.log($("input[name='startDate']").val());
734 656 console.log($("select[name='lineUpdateType']").val());
735 657  
736   - if ($("input[name='startDate']").val()
737   - && $("select[name='lineUpdateType']").val() == "") {
  658 + if ($("select[name='lineUpdateType']").val() == "") {
738 659 $.modal.msg("未选择线路性质");
739 660 return;
740 661 }
... ... @@ -781,22 +702,7 @@
781 702 autoclose : true
782 703 });
783 704  
784   - $("input[name='startDate']").datetimepicker({
785   - format: "yyyy-mm-dd hh:ii:ss",
786   - autoclose: true
787   - });
788 705  
789   - $("input[name='isWarrantStartTime']").datetimepicker({
790   - format : "yyyy-mm-dd",
791   - minView : "month",
792   - autoclose : true
793   - });
794   -
795   - $("input[name='isWarrantEndTime']").datetimepicker({
796   - format : "yyyy-mm-dd",
797   - minView : "month",
798   - autoclose : true
799   - });
800 706  
801 707 </script>
802 708 </body>
... ...
bsthLineProfiles/src/main/resources/templates/system/line/line.html
  View file @df14b31
... ... @@ -6,6 +6,13 @@
6 6 <th:block th:include="include :: select2-css" />
7 7 <th:block th:include="include :: datetimepicker-css" />
8 8 </head>
  9 +<style>
  10 + .select-list li {
  11 + color: #333;
  12 + margin: 5px 15px 5px 0px;
  13 + height: 40px;
  14 + }
  15 +</style>
9 16 <body class="gray-bg">
10 17 <div class="container-div" id="context">
11 18 <div class="row">
... ... @@ -13,205 +20,195 @@
13 20 <form id="formId">
14 21 <div class="select-list">
15 22 <ul>
16   - <li><label>公司：</label>
17   - <select id='company' >
  23 + <li><label>公司：</label><select id='company' ></select></li>
  24 + <!---------------------------------->
  25 + <li><label>分公司：</label><select id='fCompany' ></select></li>
  26 + <!---------------------------------->
  27 + <li><label>线路名称：</label> <input type="text" name="lineName" /></li>
  28 + <!---------------------------------->
  29 + <li><label>营运方式：</label>
  30 + <select name="serviceType" th:with="type=${@dict.getType('serviceType')}">
  31 + <option value=""></option>
  32 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  33 + </select>
  34 + </li>
  35 + <!---------------------------------->
  36 + <li><label>线路属性：</label>
  37 + <select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}">
  38 + <option value=""></option>
  39 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
18 40 </select>
19 41 </li>
20   - <li><label>分公司：</label>
21   - <select id='fCompany' >
  42 + <!---------------------------------->
  43 + <li><label>线路类型：</label>
  44 + <select name="lineType" th:with="type=${@dict.getType('lineType')}">
  45 + <option value=""></option>
  46 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
22 47 </select>
23 48 </li>
24   - <li><label>线路名称：</label> <input type="text" name="lineName" />
  49 + <!---------------------------------->
  50 + <li><label>区属：</label>
  51 + <select name="district" th:with="type=${@dict.getType('district')}">
  52 + <option value=""></option>
  53 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  54 + </select>
25 55 </li>
26   - <li><label>主线路id：</label> <input type="text" name="pLineId" />
  56 + <!---------------------------------->
  57 + <li><label>是否区内：</label>
  58 + <select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}">
  59 + <option value=""></option>
  60 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  61 + </select>
27 62 </li>
28   - <li><label>营运方式：</label> <select name="serviceType"
29   - th:with="type=${@dict.getType('serviceType')}">
30   - <option value=""></option>
31   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
32   - th:value="${dict.dictValue}"></option>
33   - </select></li>
34   - <li><label>线路属性：</label>
35   - <select name="lineLevel"
36   - th:with="type=${@dict.getType('lineLevel')}">
  63 + <!---------------------------------->
  64 + <li><label>营运状态：</label>
  65 + <select name="serviceState" th:with="type=${@dict.getType('serviceState')}">
37 66 <option value=""></option>
38   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
39   - th:value="${dict.dictValue}"></option>
  67 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
40 68 </select>
41 69 </li>
42   - <li><label>线路类型：</label> <select name="lineType"
43   - th:with="type=${@dict.getType('lineType')}">
44   - <option value=""></option>
45   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
46   - th:value="${dict.dictValue}"></option>
47   - </select></li>
48   - <li><label>区属：</label> <select name="district"
49   - th:with="type=${@dict.getType('district')}">
50   - <option value=""></option>
51   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
52   - th:value="${dict.dictValue}"></option>
53   - </select></li>
54   - <li><label>是否区内：</label> <select name="inoutDistrict"
55   - th:with="type=${@dict.getType('trueFalse')}">
56   - <option value=""></option>
57   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
58   - th:value="${dict.dictValue}"></option>
59   - </select></li>
60   - <li><label>营运状态：</label> <select name="serviceState"
61   - th:with="type=${@dict.getType('serviceState')}">
62   - <option value=""></option>
63   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
64   - th:value="${dict.dictValue}"></option>
65   - </select></li>
66   - <li><label>车辆类型：</label> <select name="busType"
67   - th:with="type=${@dict.getType('busType')}">
68   - <option value=""></option>
69   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
70   - th:value="${dict.dictValue}"></option>
71   - </select></li>
72   - <li><label>是否空调：</label> <select name="airConditionerType"
73   - th:with="type=${@dict.getType('airConditionerType')}">
74   - <option value=""></option>
75   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
76   - th:value="${dict.dictValue}"></option>
77   - </select></li>
78   - <li><label>售票类型：</label> <select name="sellTicketType"
79   - th:with="type=${@dict.getType('sellTicketType')}">
80   - <option value=""></option>
81   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
82   - th:value="${dict.dictValue}"></option>
83   - </select></li>
84   - <li><label>运营时间：</label> <select name="serviceTime"
85   - th:with="type=${@dict.getType('serviceTime')}">
86   - <option value=""></option>
87   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
88   - th:value="${dict.dictValue}"></option>
89   - </select></li>
90   - <li><label>线路长度：</label> <input type="text"
91   - name="lineDistance" /></li>
92   - <li><label>线路编码：</label> <input type="text" name="lineCode" />
  70 + <!---------------------------------->
  71 + <li><label>车辆类型：</label>
  72 + <select name="busType" th:with="type=${@dict.getType('busType')}">
  73 + <option value=""></option>
  74 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  75 + </select>
93 76 </li>
94   - <li><label>授权年限：</label> <input type="text"
95   - name="warrantYear" /></li>
96   - <li><label>授权起始：</label> <input type="text"
97   - class="time-input" placeholder="请选择授权起始日期"
98   - name="warrantStartTime" /></li>
99   - <li><label>授权结束：</label> <input type="text"
100   - class="time-input" placeholder="请选择授权结束日期" name="warrantEndTime" />
  77 + <!---------------------------------->
  78 + <li><label>是否空调：</label>
  79 + <select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}">
  80 + <option value=""></option>
  81 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  82 + </select>
  83 + </li>
  84 + <!---------------------------------->
  85 + <li><label>售票类型：</label>
  86 + <select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}">
  87 + <option value=""></option>
  88 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  89 + </select>
101 90 </li>
102   - <li><label>撤销日期：</label> <input type="text"
103   - class="time-input" placeholder="请选择撤销日期" name="planCancelTime" />
  91 + <!---------------------------------->
  92 + <li><label>运营时间：</label>
  93 + <select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}">
  94 + <option value=""></option>
  95 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  96 + </select>
104 97 </li>
105   - <li><label>实际撤销：</label> <input type="text"
106   - class="time-input" placeholder="请选择实际撤销日期" name="cancelTime" />
  98 + <!---------------------------------->
  99 + <li><label>线路长度：</label> <input type="text" name="lineDistance" /></li>
  100 + <!---------------------------------->
  101 + <li><label>授权年限：</label> <input type="text" name="warrantYear" /></li>
  102 + <!---------------------------------->
  103 + <li><label>授权起始：</label> <input type="text" class="time-input" placeholder="请选择授权起始日期" name="warrantStartTime" /></li>
  104 + <!---------------------------------->
  105 + <li><label>授权结束：</label> <input type="text" class="time-input" placeholder="请选择授权结束日期" name="warrantEndTime" /></li>
  106 + <!---------------------------------->
  107 + <li><label>暂停日期：</label> <input type="text" class="time-input" placeholder="请选择线路暂停日期" name="planCancelTime" /></li>
  108 + <!---------------------------------->
  109 + <li><label>实际撤销：</label> <input type="text" class="time-input" placeholder="请选择实际撤销日期" name="cancelTime" /></li>
  110 + <!---------------------------------->
  111 + <li><label>更新人：</label> <input type="text" name="updateBy" /></li>
  112 + <!---------------------------------->
  113 + <li><label>更新时间：</label> <input type="text" class="time-input" placeholder="请选择更新时间" name="updateTime" /></li>
  114 + <!---------------------------------->
  115 + <li><label>实施时间：</label> <input type="text" class="time-input" placeholder="请选择实施时间" name="timeSchedule" /></li>
  116 + <!---------------------------------->
  117 + <li><label>是否权证：</label>
  118 + <select name="isWarrant" th:with="type=${@dict.getType('trueFalse')}">
  119 + <option value=""></option>
  120 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  121 + </select>
107 122 </li>
108   - <li><label>更新人：</label> <input type="text" name="updateBy" />
  123 + <!---------------------------------->
  124 + <li><label>道路类型：</label>
  125 + <select name="roadType" th:with="type=${@dict.getType('roadType')}">
  126 + <option value=""></option>
  127 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  128 + </select>
109 129 </li>
110   - <li><label>更新时间：</label> <input type="text"
111   - class="time-input" placeholder="请选择更新时间" name="updateTime" /></li>
112   - <li><label>行车作业计划表报备时间：</label> <input type="text"
113   - class="time-input" placeholder="请选择行车作业计划表报备时间"
114   - name="timeSchedule" /></li>
115   - <li><label>停车场：</label> <input type="text" name="park" /></li>
116   - <li><label>是否权证：</label> <select name="isWarrant"
117   - th:with="type=${@dict.getType('trueFalse')}">
118   - <option value=""></option>
119   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
120   - th:value="${dict.dictValue}"></option>
121   - </select></li>
122   - <li><label>道路类型：</label> <select name="roadType"
123   - th:with="type=${@dict.getType('roadType')}">
124   - <option value=""></option>
125   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
126   - th:value="${dict.dictValue}"></option>
127   - </select></li>
  130 + <!---------------------------------->
128 131 <li><label>票价：</label> <input type="text" name="ticketPrice" /></li>
129   - <li><label>首站：</label> <input type="text"
130   - name="firstStation" /></li>
131   - <li><label>首站时间：</label> <input type="text" name="firstTime" />
132   - </li>
133   - <li><label>末站：</label> <input type="text" name="lastStation" />
  132 + <!---------------------------------->
  133 + <li><label>首站：</label> <input type="text" name="firstStation" /></li>
  134 + <!---------------------------------->
  135 + <li><label>起点站首末班：</label> <input type="text" name="firstTime" /></li>
  136 + <!---------------------------------->
  137 + <li><label>末站：</label> <input type="text" name="lastStation" /></li>
  138 + <!---------------------------------->
  139 + <li><label>终点站首末班：</label> <input type="text" name="lastTime" /></li>
  140 + <!---------------------------------->
  141 + <li><label>上行里程：</label> <input type="text" name="mileageUp" /></li>
  142 + <!---------------------------------->
  143 + <li><label>下行里程：</label> <input type="text" name="mileageDown" /></li>
  144 + <!---------------------------------->
  145 + <li><label>站级数(上行)：</label> <input type="text" name="stationUp" /></li>
  146 + <!---------------------------------->
  147 + <li><label>站级数(下行)：</label> <input type="text" name="stationDown" /></li>
  148 + <!---------------------------------->
  149 + <li><label>行驶时间(上行)：</label> <input type="text" name="travelTimeUp" /></li>
  150 + <!---------------------------------->
  151 + <li><label>行驶时间(下行)：</label> <input type="text" name="travelTimeDown" /></li>
  152 + <!---------------------------------->
  153 + <li><label>行驶间隔(高峰)：</label> <input type="text" name="travelIntervalUp" /></li>
  154 + <!---------------------------------->
  155 + <li><label>行驶间隔(低谷)：</label> <input type="text" name="travelIntervalDown" /></li>
  156 + <!---------------------------------->
  157 + <li><label>经营权证(大巴)：</label> <input type="text" name="warrantVehiclesLarge" /></li>
  158 + <!---------------------------------->
  159 + <li><label>经营权证(中巴)：</label> <input type="text" name="warrantVehiclesMiddle" /></li>
  160 + <!---------------------------------->
  161 + <li><label>实际配车数：</label> <input type="text" name="vehiclesNumber" /></li>
  162 + <!---------------------------------->
  163 + <li><label>实际车辆数(大巴)：</label> <input type="text" name="numberVehiclesLarge" /></li>
  164 + <!---------------------------------->
  165 + <li><label>实际车辆数(中巴)：</label> <input type="text" name="numberVehiclesMiddle" /></li>
  166 + <!---------------------------------->
  167 + <li><label>车辆自编号：</label> <input type="text" name="carPlate" /></li>
  168 + <!---------------------------------->
  169 + <li><label>线路配档数：</label> <input type="text" name="numberPerson" /></li>
  170 + <!---------------------------------->
  171 + <li><label>司机人数：</label> <input type="text" name="numberPersonDriver" /></li>
  172 + <!---------------------------------->
  173 + <li><label>售票员数：</label> <input type="text" name="numberPersonSales" /></li>
  174 + <!---------------------------------->
  175 + <li><label>新能源车数：</label> <input type="text" name="busEvNumber" /></li>
  176 + <!---------------------------------->
  177 + <li><label>间隔等级：</label> <input type="text" name="divideLevel" /></li>
  178 + <!---------------------------------->
  179 + <li><label>是否挂牌：</label> <input type="text" name="hasTimelists" /></li>
  180 + <!---------------------------------->
  181 + <li><label>是否轨交末班车衔接：</label>
  182 + <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}">
  183 + <option value=""></option>
  184 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  185 + </select>
134 186 </li>
135   - <li><label>末站首站：</label> <input type="text"
136   - name="lastTime" /></li>
137   - <li><label>上行里程：</label> <input type="text"
138   - name="mileageUp" /></li>
139   - <li><label>下行里程：</label> <input type="text"
140   - name="mileageDown" /></li>
141   - <li><label>平均里程：</label> <input type="text"
142   - name="averageMileage" /></li>
143   - <li><label>上行站级：</label> <input type="text"
144   - name="stationUp" /></li>
145   - <li><label>下行站级数()：</label> <input type="text"
146   - name="stationDown" /></li>
147   - <li><label>行驶时间(上行)：</label> <input type="text"
148   - name="travelTimeUp" /></li>
149   - <li><label>行驶时间(下行)：</label> <input type="text"
150   - name="travelTimeDown" /></li>
151   - <li><label>行驶间隔(高峰)：</label> <input type="text"
152   - name="travelIntervalUp" /></li>
153   - <li><label>行驶间隔(低谷)：</label> <input type="text"
154   - name="travelIntervalDown" /></li>
155   - <li><label>经营权证：</label> <input type="text"
156   - name="warrantVehiclesLarge" /></li>
157   - <li><label>经营权证：</label> <input type="text"
158   - name="warrantVehiclesMiddle" /></li>
159   - <li><label>实际配车数：</label> <input type="text"
160   - name="vehiclesNumber" /></li>
161   - <li><label>实际车辆数(大巴)：</label> <input type="text"
162   - name="numberVehiclesLarge" /></li>
163   - <li><label>实际车辆数(中巴)：</label> <input type="text"
164   - name="numberVehiclesMiddle" /></li>
165   - <li><label>车辆自编号：</label> <input type="text" name="carPlate" />
  187 + <!---------------------------------->
  188 + <li><label>轨交时间：</label> <input type="text" class="time-input" placeholder="请选择轨交时间" name="metroTime" /></li>
  189 + <!---------------------------------->
  190 + <li><label>冷僻补贴：</label> <input type="text" name="coldBonusType" /></li>
  191 + <!---------------------------------->
  192 + <li><label>日期截点：</label> <input type="text" class="time-input" placeholder="日期截点" name="createTimeEnd" id="createTimeEnd"/></li>
  193 + <!---------------------------------->
  194 + <li><label>性质：</label>
  195 + <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}">
  196 + <option value=""></option>
  197 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  198 + </select>
166 199 </li>
167   - <li><label>线路总配人数：</label> <input type="text"
168   - name="numberPerson" /></li>
169   - <li><label>司机人数：</label> <input type="text"
170   - name="numberPersonDriver" /></li>
171   - <li><label>售票员数：</label> <input type="text"
172   - name="numberPersonSales" /></li>
173   - <li><label>新能源车数：</label> <input type="text"
174   - name="busEvNumber" /></li>
175   - <li><label>经营权证数：</label> <input type="text"
176   - name="numberOfManage" /></li>
177   - <li><label>高峰系数：</label> <input type="text"
178   - name="fullCustomerPercent" /></li>
179   - <li><label>低谷系数：</label> <input type="text"
180   - name="lowCustomerPercent" /></li>
181   - <li><label>间隔等级：</label> <input type="text"
182   - name="divideLevel" /></li>
183   - <li><label>是否挂牌：</label> <input type="text"
184   - name="hasTimelists" /></li>
185   - <li><label>是否轨交末班车衔接：</label> <select name="isMetro"
186   - th:with="type=${@dict.getType('trueFalse')}">
187   - <option value=""></option>
188   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
189   - th:value="${dict.dictValue}"></option>
190   - </select></li>
191   - <li><label>轨交时间：</label> <input type="text"
192   - class="time-input" placeholder="请选择轨交时间" name="metroTime" /></li>
193   - <li><label>冷僻补贴：</label> <input type="text"
194   - name="coldBonusType" /></li>
195   - <li><label>日期截点：</label> <input type="text"
196   - class="time-input" placeholder="日期截点" name="createTimeEnd" id="createTimeEnd"/>
  200 + <!---------------------------------->
  201 + <li><label>营收类型：</label>
  202 + <select name="revenueType" th:with="type=${@dict.getType('revenueType')}">
  203 + <option value=""></option>
  204 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  205 + </select>
197 206 </li>
198   - <li><label>性质：</label> <select name="lineUpdateType"
199   - th:with="type=${@dict.getType('lineUpdateType')}">
200   - <option value=""></option>
201   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
202   - th:value="${dict.dictValue}"></option>
203   - </select></li>
204   - <li><label>营收类型：</label> <select name="revenueType"
205   - th:with="type=${@dict.getType('revenueType')}">
206   - <option value=""></option>
207   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
208   - th:value="${dict.dictValue}"></option>
209   - </select></li>
  207 + <!---------------------------------->
210 208 <li>
211 209 <el-button size="mini" type="primary" icon="el-icon-search" onClick="$.table.search();">搜索</el-button>
212 210 <el-button size="mini" icon="el-icon-refresh" onClick="$.form.reset();">重置</el-button>
213 211 </li>
214   -
215 212 </ul>
216 213  
217 214 </div>
... ... @@ -274,12 +271,9 @@
274 271 $('#company').on('change.select2', function (e) {
275 272 fCompanySelect()
276 273 });
277   - console.log(type);
278 274 if(type==2){
279   - console.log("show");
280 275 $('#export').css("display", "show");
281 276 }else {
282   - console.log("none");
283 277 $('#export').css("display", "none");
284 278 }
285 279 });
... ... @@ -399,7 +393,6 @@
399 393 return "";
400 394 },
401 395 onDblClickRow:function (row,index){
402   - /*$.operate.full=true;*/
403 396 $.operate.detail(row.id);
404 397 }
405 398 };
... ... @@ -418,9 +411,7 @@
418 411 visible:objs[i].checked,
419 412 align: 'center',
420 413 formatter: function(value, row, index) {
421   -
422   -
423   - if(this.field == "roadType" || this.field == "busType"){
  414 + if(this.field == "roadType" || this.field == "busType" || this.field == "district"){
424 415 if(value != null){
425 416  
426 417 var arr = value.split(",");
... ... @@ -433,13 +424,12 @@
433 424 break;
434 425 }
435 426 }
436   -
437 427 }
438 428 return $.table.tooltip(value.substring(0,value.length -1), 5);
439 429 }
440 430 }
441 431  
442   - if(this.field == "isLogicDelete" || this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists" || this.field == "isWarrant"){
  432 + if(this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists" || this.field == "isWarrant"){
443 433 for(var j in dicts["trueFalse"]){
444 434 if(dicts["trueFalse"][j].dictValue == value){
445 435 value = dicts["trueFalse"][j].dictLabel;
... ... @@ -546,10 +536,10 @@
546 536 field: 'lineName',
547 537 title: '线路名称'
548 538 },
549   - {
  539 + /*{
550 540 field: 'pLineId',
551 541 title: '主线路id'
552   - },
  542 + },*/
553 543 {
554 544 field: 'serviceType',
555 545 title: '营运方式'
... ... @@ -612,25 +602,17 @@
612 602 },
613 603 {
614 604 field: 'planCancelTime',
615   - title: '撤销日期'
  605 + title: '线路暂停日期'
616 606 },
617 607 {
618 608 field: 'cancelTime',
619 609 title: '实际撤销日期'
620 610 },
621 611 {
622   - field: 'cancelReason',
623   - title: '撤销原因'
624   - },
625   - {
626 612 field: 'remark',
627 613 title: '备注'
628 614 },
629 615 {
630   - field: 'isLogicDelete',
631   - title: '是否逻辑删除'
632   - },
633   - {
634 616 field: 'updateBy',
635 617 title: '更新人'
636 618 },
... ... @@ -640,25 +622,17 @@
640 622 },
641 623 {
642 624 field: 'timeSchedule',
643   - title: '行车作业计划表报备时间'
  625 + title: '实施时间'
644 626 },
645   - {
  627 + /*{
646 628 field: 'park',
647 629 title: '停车场'
648   - },
  630 + },*/
649 631 {
650 632 field: 'isWarrant',
651 633 title: '是否权证'
652 634 },
653 635 {
654   - field: 'isWarrantStartTime',
655   - title: '权证开通日期'
656   - },
657   - {
658   - field: 'isWarrantEndTime',
659   - title: '权证到期日期'
660   - },
661   - {
662 636 field: 'roadType',
663 637 title: '道路类型'
664 638 },
... ... @@ -672,7 +646,7 @@
672 646 },
673 647 {
674 648 field: 'firstTime',
675   - title: '首站时间'
  649 + title: '起点站首末班'
676 650 },
677 651 {
678 652 field: 'lastStation',
... ... @@ -680,7 +654,7 @@
680 654 },
681 655 {
682 656 field: 'lastTime',
683   - title: '末站首站时间'
  657 + title: '终点站首末班'
684 658 },
685 659 {
686 660 field: 'mileageUp',
... ... @@ -691,10 +665,6 @@
691 665 title: '下行里程数'
692 666 },
693 667 {
694   - field: 'averageMileage',
695   - title: '平均里程数'
696   - },
697   - {
698 668 field: 'stationUp',
699 669 title: '站级数(上行)'
700 670 },
... ... @@ -733,7 +703,7 @@
733 703 title: '车辆自编号'
734 704 },{
735 705 field: 'numberPerson',
736   - title: '线路总配人数'
  706 + title: '线路配档数'
737 707 },{
738 708 field: 'numberPersonDriver',
739 709 title: '司机人数'
... ... @@ -747,18 +717,9 @@
747 717 field: 'directions',
748 718 title: '线路走向'
749 719 },{
750   - field: 'numberOfManage',
751   - title: '经营权证数'
752   - },{
753 720 field: 'halfwayStation',
754 721 title: '站点名称'
755 722 },{
756   - field: 'fullCustomerPercent',
757   - title: '高峰系数'
758   - },{
759   - field: 'lowCustomerPercent',
760   - title: '低谷系数'
761   - }, {
762 723 field: 'divideLevel',
763 724 title: '间隔等级'
764 725 },{
... ... @@ -779,12 +740,6 @@
779 740 },{
780 741 field: 'lineUpdateType',
781 742 title: '性质'
782   - },{
783   - field: 'startDate',
784   - title: '启用时间'
785   - },{
786   - field: 'files',
787   - title: '附件'
788 743 }];
789 744  
790 745 for(var i =0 ; i < cols.length ;i++){
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
  View file @df14b31
1 1 <!DOCTYPE html>
2   -<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
3 3 <head>
4   - <th:block th:include="include :: header('添加线路档案信息')" />
5   - <th:block th:include="include :: datetimepicker-css" />
6   - <th:block th:include="include :: bootstrap-fileinput-css" />
7   - <th:block th:include="include :: bootstrap-select-css" />
  4 + <th:block th:include="include :: header('添加线路档案信息')"/>
  5 + <th:block th:include="include :: datetimepicker-css"/>
  6 + <th:block th:include="include :: bootstrap-fileinput-css"/>
  7 + <th:block th:include="include :: bootstrap-select-css"/>
  8 + <th:block th:include="include :: select2-css"/>
8 9 </head>
9 10 <body class="white-bg">
10   - <div class="wrapper wrapper-content animated fadeInRight ibox-content">
11   - <form class="form-horizontal m" id="form-line-add">
12   - <div class="form-group">
  11 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  12 + <form class="form-horizontal m" id="form-line-add">
  13 + <div id="lw">
  14 + <h3>路务</h3>
  15 + <div class="form-group">
13 16 <label class="col-sm-1 control-label">线路名称：</label>
14 17 <div class="col-sm-2">
15 18 <input name="lineName" class="form-control" type="text" onblur="isExist(this.value)">
16 19 </div>
17 20 <!---------------------------------->
18   - <!-- <label class="col-sm-1 control-label">主线路id：</label>
19   - <div class="col-sm-2">
20   - <input name="pLineId" class="form-control" type="text">
21   - </div>-->
22   - <!---------------------------------->
23 21 <label class="col-sm-1 control-label">公司：</label>
24 22 <div class="col-sm-2">
25   - <input name="company" class="form-control" type="text">
  23 + <select id='company' name="company"></select>
26 24 </div>
27 25 <!---------------------------------->
28 26 <label class="col-sm-1 control-label">分公司：</label>
29 27 <div class="col-sm-2">
30   - <input name="fCompany" class="form-control" type="text">
  28 + <select id='fCompany' name="fCompany"></select>
31 29 </div>
32   -
33   - </div>
34   -
35   - <div class="form-group">
36   - <label class="col-sm-1 control-label">营运方式：</label>
  30 + <!---------------------------------->
  31 + <label class="col-sm-1 control-label">线路类型：</label>
37 32 <div class="col-sm-2">
38   - <select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
  33 + <select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
39 34 <option value=""></option>
40 35 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
41 36 </option>
42 37 </select>
43 38 </div>
44   - <!---------------------------------->
  39 + </div>
  40 + <!---------------------------------->
  41 + <div class="form-group">
45 42 <label class="col-sm-1 control-label">线路属性：</label>
46 43 <div class="col-sm-2">
47 44 <select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
... ... @@ -51,34 +48,35 @@
51 48 </select>
52 49 </div>
53 50 <!---------------------------------->
54   - <label class="col-sm-1 control-label">线路类型：</label>
  51 + <label class="col-sm-1 control-label">营运方式：</label>
55 52 <div class="col-sm-2">
56   - <select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
  53 + <select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
57 54 <option value=""></option>
58 55 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
59 56 </option>
60 57 </select>
61 58 </div>
62 59 <!---------------------------------->
63   - <label class="col-sm-1 control-label">道路类型：</label>
64   - <div class="col-sm-2" >
65   - <!--data-max-options="2" 限制多选数量-->
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}">
68   - </option>
  60 + <label class="col-sm-1 control-label">营收类型：</label>
  61 + <div class="col-sm-2">
  62 + <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
  63 + <option value=""></option>
  64 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  65 + th:value="${dict.dictValue}"></option>
69 66 </select>
70 67 </div>
71   - </div>
72   -
73   - <div class="form-group">
  68 + <!---------------------------------->
74 69 <label class="col-sm-1 control-label">区属：</label>
75 70 <div class="col-sm-2">
76   - <select name="district" th:with="type=${@dict.getType('district')}" class="selectpicker form-control" multiple title="">
  71 + <select name="district" th:with="type=${@dict.getType('district')}"
  72 + class="selectpicker form-control" multiple title="">
77 73 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
78 74 </option>
79 75 </select>
80 76 </div>
81   - <!---------------------------------->
  77 + </div>
  78 + <!---------------------------------->
  79 + <div class="form-group">
82 80 <label class="col-sm-1 control-label">是否区内：</label>
83 81 <div class="col-sm-2">
84 82 <select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
... ... @@ -88,18 +86,30 @@
88 86 </select>
89 87 </div>
90 88 <!---------------------------------->
91   - <label class="col-sm-1 control-label">车辆类型：</label>
92   - <div class="col-sm-2" th:with="type=${@dict.getType('busType')}">
  89 + <label class="col-sm-1 control-label">道路类型：</label>
  90 + <div class="col-sm-2">
93 91 <!--data-max-options="2" 限制多选数量-->
94   - <select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control" multiple title="" >
95   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
  92 + <select name="roadType" th:with="type=${@dict.getType('roadType')}"
  93 + class="selectpicker form-control" multiple title="">
  94 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
  95 + </option>
  96 + </select>
  97 + </div>
  98 + <!---------------------------------->
  99 + <label class="col-sm-1 control-label">运营时间：</label>
  100 + <div class="col-sm-2">
  101 + <select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
  102 + <option value=""></option>
  103 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  104 + th:value="${dict.dictValue}">
96 105 </option>
97 106 </select>
98 107 </div>
99 108 <!---------------------------------->
100 109 <label class="col-sm-1 control-label">是否空调：</label>
101 110 <div class="col-sm-2">
102   - <select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b">
  111 + <select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}"
  112 + class="form-control m-b">
103 113 <option value=""></option>
104 114 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
105 115 th:value="${dict.dictValue}">
... ... @@ -107,11 +117,12 @@
107 117 </select>
108 118 </div>
109 119 </div>
110   -
  120 + <!---------------------------------->
111 121 <div class="form-group">
112 122 <label class="col-sm-1 control-label">售票类型：</label>
113 123 <div class="col-sm-2">
114   - <select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b">
  124 + <select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}"
  125 + class="form-control m-b">
115 126 <option value=""></option>
116 127 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
117 128 th:value="${dict.dictValue}">
... ... @@ -122,32 +133,33 @@
122 133 <label class="col-sm-1 control-label">票价：</label>
123 134 <div class="col-sm-2" th:with="type=${@dict.getType('ticketPrice')}">
124 135 <!--data-max-options="2" 限制多选数量-->
125   - <select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control" multiple title="" >
126   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
  136 + <select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}"
  137 + class="selectpicker form-control" multiple title="">
  138 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
127 139 </option>
128 140 </select>
129 141 </div>
130 142 <!---------------------------------->
131   - <label class="col-sm-1 control-label">运营时间：</label>
  143 + <label class="col-sm-1 control-label">站点名称：</label>
132 144 <div class="col-sm-2">
133   - <select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
134   - <option value=""></option>
135   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
136   - th:value="${dict.dictValue}">
137   - </option>
138   - </select>
  145 + <textarea name="halfwayStation" class="form-control"></textarea>
139 146 </div>
140 147 <!---------------------------------->
141   - <!--<label class="col-sm-1 control-label">线路编码：</label>
  148 + <label class="col-sm-1 control-label">线路走向：</label>
142 149 <div class="col-sm-2">
143   - <input name="lineCode" class="form-control" type="text">
144   - </div>-->
  150 + <textarea name="directions" class="form-control"></textarea>
  151 + </div>
145 152 </div>
146   -
  153 + <!---------------------------------->
147 154 <div class="form-group">
148   - <label class="col-sm-1 control-label">线路长度：</label>
  155 + <label class="col-sm-1 control-label">站级数(上行)：</label>
149 156 <div class="col-sm-2">
150   - <input name="lineDistance" class="form-control" type="text">
  157 + <input name="stationUp" class="form-control" type="text">
  158 + </div>
  159 + <!---------------------------------->
  160 + <label class="col-sm-1 control-label">站级数(下行)：</label>
  161 + <div class="col-sm-2">
  162 + <input name="stationDown" class="form-control" type="text">
151 163 </div>
152 164 <!---------------------------------->
153 165 <label class="col-sm-1 control-label">首站：</label>
... ... @@ -159,46 +171,51 @@
159 171 <div class="col-sm-2">
160 172 <input name="lastStation" class="form-control" type="text">
161 173 </div>
162   - <!---------------------------------->
163 174 </div>
164   -
  175 + <!---------------------------------->
165 176 <div class="form-group">
166   - <label class="col-sm-1 control-label">站点名称：</label>
  177 + <label class="col-sm-1 control-label">起点站首末班：</label>
167 178 <div class="col-sm-2">
168   - <textarea name="halfwayStation" class="form-control"></textarea>
  179 + <input name="firstTime" class="form-control" type="text">
169 180 </div>
170 181 <!---------------------------------->
171   - <label class="col-sm-1 control-label">线路走向：</label>
  182 + <label class="col-sm-1 control-label">终点站首末班：</label>
172 183 <div class="col-sm-2">
173   - <textarea name="directions" class="form-control"></textarea>
  184 + <input name="lastTime" class="form-control" type="text">
174 185 </div>
175 186 <!---------------------------------->
176   - <label class="col-sm-1 control-label">起点站首末班：</label>
  187 + <label class="col-sm-1 control-label">上行里程数：</label>
177 188 <div class="col-sm-2">
178   - <input name="firstTime" class="form-control" type="text">
  189 + <input name="mileageUp" class="form-control" type="text">
179 190 </div>
180 191 <!---------------------------------->
181   - <label class="col-sm-1 control-label">终点站首末班：</label>
  192 + <label class="col-sm-1 control-label">下行里程数：</label>
182 193 <div class="col-sm-2">
183   - <input name="lastTime" class="form-control" type="text">
  194 + <input name="mileageDown" class="form-control" type="text">
184 195 </div>
185 196 </div>
186   -
  197 + <!---------------------------------->
187 198 <div class="form-group">
188   - <!--<label class="col-sm-1 control-label">停车场：</label>
  199 + <label class="col-sm-1 control-label">线路长度：</label>
189 200 <div class="col-sm-2">
190   - <input name="park" class="form-control" type="text">
191   - </div>-->
  201 + <input name="lineDistance" class="form-control" type="text">
  202 + </div>
192 203 <!---------------------------------->
193   - <label class="col-sm-1 control-label">授权年限：</label>
  204 + <label class="col-sm-1 control-label">是否权证：</label>
194 205 <div class="col-sm-2">
195   - <input name="warrantYear" class="form-control" type="text">
  206 + <select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}"
  207 + class="form-control m-b">
  208 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  209 + th:selected="${dict.dictValue=='1'}">
  210 + </option>
  211 + </select>
196 212 </div>
197 213 <!---------------------------------->
198 214 <label class="col-sm-1 control-label">授权起始日期：</label>
199 215 <div class="col-sm-2">
200 216 <div class="input-group date">
201   - <input name="warrantStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  217 + <input name="warrantStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text"
  218 + autocomplete="off">
202 219 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
203 220 </div>
204 221 </div>
... ... @@ -206,440 +223,462 @@
206 223 <label class="col-sm-1 control-label">授权结束日期：</label>
207 224 <div class="col-sm-2">
208 225 <div class="input-group date">
209   - <input name="warrantEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  226 + <input name="warrantEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text"
  227 + autocomplete="off">
210 228 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
211 229 </div>
212 230 </div>
213 231 </div>
214   -
  232 + <!---------------------------------->
215 233 <div class="form-group">
216   - <label class="col-sm-1 control-label">线路暂停日期：</label>
217   - <div class="col-sm-2">
218   - <div class="input-group date">
219   - <input name="planCancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
220   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
221   - </div>
222   - </div>
223   - <!---------------------------------->
224   - <label class="col-sm-1 control-label">实际撤销日期：</label>
  234 + <label class="col-sm-1 control-label">授权年限：</label>
225 235 <div class="col-sm-2">
226   - <div class="input-group date">
227   - <input name="cancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
228   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
229   - </div>
  236 + <input name="warrantYear" class="form-control" type="text">
230 237 </div>
231 238 <!---------------------------------->
232 239 <label class="col-sm-1 control-label">实施时间：</label>
233 240 <div class="col-sm-2">
234 241 <div class="input-group date">
235   - <input name="timeSchedule" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  242 + <input name="timeSchedule" class="form-control" placeholder="yyyy-MM-dd" type="text"
  243 + autocomplete="off">
236 244 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
237 245 </div>
238 246 </div>
239   - </div>
240   -
241   - <div class="form-group">
242   - <label class="col-sm-1 control-label">是否权证：</label>
243   - <div class="col-sm-2">
244   - <select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
245   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue=='1'}">
246   - </option>
247   - </select>
248   - </div>
249 247 <!---------------------------------->
250 248 <label class="col-sm-1 control-label">经营权证（大巴）：</label>
251 249 <div class="col-sm-2">
252   - <input name="warrantVehiclesLarge" class="form-control" type="text">
253   - </div>
254   - </div>
255   -
256   - <div class="form-group">
257   - <label class="col-sm-1 control-label">经营权证（中巴）：</label>
258   - <div class="col-sm-2">
259   - <input name="warrantVehiclesMiddle" class="form-control" type="text">
  250 + <input name="warrantVehiclesLarge" class="form-control" type="text">
260 251 </div>
261 252 <!---------------------------------->
262   - <label class="col-sm-1 control-label">实际配车数：</label>
263   - <div class="col-sm-2">
264   - <input name="vehiclesNumber" class="form-control" type="text">
265   - </div>
266   - <!---------------------------------->
267   - <label class="col-sm-1 control-label">实际车辆数（大）：</label>
268   - <div class="col-sm-2">
269   - <input name="numberVehiclesLarge" class="form-control" type="text">
270   - </div>
271   - <!---------------------------------->
272   - <label class="col-sm-1 control-label">实际车辆数（中）：</label>
  253 + <label class="col-sm-1 control-label">经营权证（中巴）：</label>
273 254 <div class="col-sm-2">
274   - <input name="numberVehiclesMiddle" class="form-control" type="text">
  255 + <input name="warrantVehiclesMiddle" class="form-control" type="text">
275 256 </div>
276 257 </div>
277   -
  258 + <!---------------------------------->
278 259 <div class="form-group">
279   - <label class="col-sm-1 control-label">上行里程数：</label>
  260 + <label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
280 261 <div class="col-sm-2">
281   - <input name="mileageUp" class="form-control" type="text">
  262 + <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
  263 + <option value=""></option>
  264 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  265 + th:value="${dict.dictValue}"></option>
  266 + </select>
282 267 </div>
283 268 <!---------------------------------->
284   - <label class="col-sm-1 control-label">下行里程数：</label>
  269 + <label class="col-sm-1 control-label">轨交时间：</label>
285 270 <div class="col-sm-2">
286   - <input name="mileageDown" class="form-control" type="text">
  271 + <div class="input-group date">
  272 + <input name="metroTime" class="form-control" placeholder="HH:mm:ss">
  273 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  274 + </div>
287 275 </div>
288 276 <!---------------------------------->
289   - <label class="col-sm-1 control-label">平均里程数：</label>
  277 + <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
290 278 <div class="col-sm-2">
291   - <input name="averageMileage" class="form-control" type="text">
  279 + <input name="coldBonusType" class="form-control" type="text">
292 280 </div>
293 281 <!---------------------------------->
294   - <label class="col-sm-1 control-label">站级数(上行)：</label>
  282 + <label class="col-sm-1 control-label">营运状态：</label>
295 283 <div class="col-sm-2">
296   - <input name="stationUp" class="form-control" type="text">
  284 + <select name="serviceState" th:with="type=${@dict.getType('serviceState')}"
  285 + class="form-control m-b">
  286 + <option value=""></option>
  287 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
  288 + </option>
  289 + </select>
297 290 </div>
298 291 </div>
299   -
  292 + <!---------------------------------->
300 293 <div class="form-group">
301   - <label class="col-sm-1 control-label">站级数(下行)：</label>
  294 + <label class="col-sm-1 control-label">线路暂停日期：</label>
302 295 <div class="col-sm-2">
303   - <input name="stationDown" class="form-control" type="text">
  296 + <div class="input-group date">
  297 + <input name="planCancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text"
  298 + autocomplete="off">
  299 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  300 + </div>
304 301 </div>
305 302 <!---------------------------------->
306   - <label class="col-sm-1 control-label">行驶时间(上行)：</label>
  303 + <label class="col-sm-1 control-label">实际撤销日期：</label>
307 304 <div class="col-sm-2">
308   - <input name="travelTimeUp" class="form-control" type="text">
  305 + <div class="input-group date">
  306 + <input name="cancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text"
  307 + autocomplete="off">
  308 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  309 + </div>
309 310 </div>
310 311 <!---------------------------------->
311   - <label class="col-sm-1 control-label">行驶时间(下行)：</label>
  312 + <label class="col-sm-1 control-label">性质：</label>
312 313 <div class="col-sm-2">
313   - <input name="travelTimeDown" class="form-control" type="text">
  314 + <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}"
  315 + class="form-control m-b" readonly>
  316 + <option value="0" selected="selected">新辟</option>
  317 + </select>
314 318 </div>
315 319 <!---------------------------------->
316   - <label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
  320 + <label class="col-sm-1 control-label">备注：</label>
317 321 <div class="col-sm-2">
318   - <input name="travelIntervalUp" class="form-control" type="text">
  322 + <textarea name="remark" class="form-control"></textarea>
319 323 </div>
320 324 </div>
321   -
  325 + <!---------------------------------->
322 326 <div class="form-group">
323   - <label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
324   - <div class="col-sm-2">
325   - <input name="travelIntervalDown" class="form-control" type="text">
326   - </div>
327   - <!---------------------------------->
328   - <label class="col-sm-1 control-label">间隔等级：</label>
329   - <div class="col-sm-2">
330   - <input name="divideLevel" class="form-control" type="text">
  327 + <label class="col-sm-1 control-label">附件：</label>
  328 + <div class="col-sm-5">
  329 + <div class="file-loading" id="uploadDiv">
  330 + <input id="fileinput" type="file" multiple>
  331 + </div>
331 332 </div>
332 333 </div>
333   -
  334 + </div>
  335 + <div id="dd">
  336 + <div class="hr-line-dashed"></div>
  337 + <h3>调度</h3>
334 338 <div class="form-group">
335 339 <label class="col-sm-1 control-label">车辆自编号：</label>
336 340 <div class="col-sm-2">
337 341 <input name="carPlate" class="form-control" type="text">
338 342 </div>
339 343 <!---------------------------------->
340   - <label class="col-sm-1 control-label">线路配档数：</label>
  344 + <label class="col-sm-1 control-label">是否挂牌：</label>
341 345 <div class="col-sm-2">
342   - <input name="numberPerson" class="form-control" type="text">
  346 + <select name="hasTimelists" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
  347 + <option value=""></option>
  348 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
  349 + </option>
  350 + </select>
343 351 </div>
344 352 <!---------------------------------->
345   - <label class="col-sm-1 control-label">司机人数：</label>
  353 + <label class="col-sm-1 control-label">行驶时间(上行)：</label>
346 354 <div class="col-sm-2">
347   - <input name="numberPersonDriver" class="form-control" type="text">
  355 + <input name="travelTimeUp" class="form-control" type="text">
348 356 </div>
349 357 <!---------------------------------->
350   - <label class="col-sm-1 control-label">售票员数：</label>
  358 + <label class="col-sm-1 control-label">行驶时间(下行)：</label>
351 359 <div class="col-sm-2">
352   - <input name="numberPersonSales" class="form-control" type="text">
  360 + <input name="travelTimeDown" class="form-control" type="text">
353 361 </div>
354 362 </div>
355   -
  363 + <!---------------------------------->
356 364 <div class="form-group">
357   - <label class="col-sm-1 control-label">新能源车数：</label>
  365 + <label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
358 366 <div class="col-sm-2">
359   - <input name="busEvNumber" class="form-control" type="text">
  367 + <input name="travelIntervalUp" class="form-control" type="text">
360 368 </div>
361 369 <!---------------------------------->
362   - <label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
  370 + <label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
363 371 <div class="col-sm-2">
364   - <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
365   - <option value=""></option>
366   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
367   - </select>
  372 + <input name="travelIntervalDown" class="form-control" type="text">
368 373 </div>
369 374 <!---------------------------------->
370   - <label class="col-sm-1 control-label">轨交时间：</label>
  375 + <label class="col-sm-1 control-label">间隔等级：</label>
371 376 <div class="col-sm-2">
372   - <div class="input-group date">
373   - <input name="metroTime" class="form-control" placeholder="HH:mm:ss" >
374   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
375   - </div>
  377 + <input name="divideLevel" class="form-control" type="text">
376 378 </div>
377 379 <!---------------------------------->
378   - <label class="col-sm-1 control-label">是否挂牌：</label>
  380 + <label class="col-sm-1 control-label">实际配车数：</label>
379 381 <div class="col-sm-2">
380   - <select name="hasTimelists" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
381   - <option value=""></option>
382   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
383   - </option>
384   - </select>
  382 + <input name="vehiclesNumber" class="form-control" type="text">
385 383 </div>
386 384 </div>
387 385  
388 386 <div class="form-group">
389 387 <!---------------------------------->
390   - <label class="col-sm-1 control-label">营运状态：</label>
  388 + <label class="col-sm-1 control-label">实际车辆数（大）：</label>
391 389 <div class="col-sm-2">
392   - <select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
393   - <option value=""></option>
394   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
395   - </option>
396   - </select>
  390 + <input name="numberVehiclesLarge" class="form-control" type="text">
397 391 </div>
398 392 <!---------------------------------->
399   - <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
  393 + <label class="col-sm-1 control-label">实际车辆数（中）：</label>
400 394 <div class="col-sm-2">
401   - <input name="coldBonusType" class="form-control" type="text">
  395 + <input name="numberVehiclesMiddle" class="form-control" type="text">
402 396 </div>
403 397 <!---------------------------------->
404   - <label class="col-sm-1 control-label">营收类型：</label>
  398 + <label class="col-sm-1 control-label">新能源车数：</label>
405 399 <div class="col-sm-2">
406   - <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
407   - <option value=""></option>
408   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
409   - </select>
  400 + <input name="busEvNumber" class="form-control" type="text">
410 401 </div>
411   - </div>
412 402  
  403 + <label class="col-sm-1 control-label">线路配档数：</label>
  404 + <div class="col-sm-2">
  405 + <input name="numberPerson" class="form-control" type="text">
  406 + </div>
  407 + </div>
  408 + <!---------------------------------->
413 409 <div class="form-group">
414   - <label class="col-sm-1 control-label">性质：</label>
  410 + <label class="col-sm-1 control-label">司机人数：</label>
415 411 <div class="col-sm-2">
416   - <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" readonly>
417   - <option value="0" selected="selected">新辟</option>
418   - </select>
  412 + <input name="numberPersonDriver" class="form-control" type="text">
419 413 </div>
420 414 <!---------------------------------->
421   - <label class="col-sm-1 control-label">备注：</label>
  415 + <label class="col-sm-1 control-label">售票员数：</label>
422 416 <div class="col-sm-2">
423   - <textarea name="remark" class="form-control"></textarea>
424   - </div>
425   - </div>
426   - <div class="form-group">
427   - <label class="col-sm-1 control-label">附件：</label>
428   - <div class="col-sm-5">
429   - <div class="file-loading" id="uploadDiv">
430   - <input id="fileinput" type="file" multiple>
  417 + <input name="numberPersonSales" class="form-control" type="text">
431 418 </div>
432 419 </div>
433   - </div>
434 420 <input type="hidden" id="examineStatus">
435   - </form>
436   - </div>
437   - <th:block th:include="include :: footer" />
438   - <th:block th:include="include :: datetimepicker-js" />
439   - <th:block th:include="include :: bootstrap-fileinput-js" />
440   - <th:block th:include="include :: bootstrap-select-js" />
441   - <script th:inline="javascript">
442   - var prefix = ctx + "system/lineAdd"
443   -
444   - $(function() {
445   - $("#fileinput").fileinput({
446   - 'theme' : 'explorer-fas',
447   - 'uploadUrl' : '/common/upload',
448   - overwriteInitial : false,
449   - initialPreviewAsData : false
450   - });
451   -
452   - $("#fileinput").on("fileuploaded",
453   - function(event, data, proviewId, index) {
454   -
455   - var obj = '<div><input name="files" type="hidden" value='+data.files[index].name + ':' + data.response.url + '>'+
456   - '<a href='+data.response.url+'>'+ data.files[index].name +
457   - '</a><button onclick="deleteFile(this);">删除</button></div>';
458   -
459   -
460   - $(".file-input").before(obj);
461   -
462   - });
463   - })
464   -
465   - function deleteFile(obj){
466   - $(obj).parent().remove();
  421 + </div>
  422 + </form>
  423 +</div>
  424 +<th:block th:include="include :: footer"/>
  425 +<th:block th:include="include :: datetimepicker-js"/>
  426 +<th:block th:include="include :: bootstrap-fileinput-js"/>
  427 +<th:block th:include="include :: bootstrap-select-js"/>
  428 +<th:block th:include="include :: select2-js"/>
  429 +<script th:inline="javascript">
  430 + var prefix = ctx + "system/lineAdd"
  431 +
  432 + //公司分公司联动
  433 + var companyList = [[${companyList}]];
  434 + var companies = new Array();
  435 + var fCompanies = new Array();
  436 + $(function () {
  437 + for (let i in companyList) {
  438 + companies[i] = companyList[i].company;
  439 + fCompanies[i] = companyList[i].fCompany;
467 440 }
468   -
469   - $("#form-line-add").validate({
470   - rules:{
471   - isWarrantStartTime:{
472   - required:function (){
473   - return $('#isWarrant').val()==='1';
474   - },
475   - },
476   - isWarrantEndTime:{
477   - required:function (){
478   - return $('#isWarrant').val()==='1';
479   - },
480   - },
481   - remark:{
482   - required:true,
483   - },
484   - startDate:{
485   - required:true,
486   - },
487   -
488   - },
489   - messages: {
490   - isWarrantStartTime: {
491   - required: "请选择日期",
492   - },
493   - isWarrantEndTime: {
494   - required: "请选择日期",
495   - },
496   - remark: {
497   - required: "请写入备注",
498   - },
499   - startDate: {
500   - required: "请选择时间",
501   - }
502   - },focusCleanup: true
  441 + companies = Array.from(new Set(companies));
  442 + companySelect();
  443 + fCompanySelect();
  444 + $('#company').on('change.select2', function (e) {
  445 + fCompanySelect()
503 446 });
504 447  
505   - function submitHandler() {
506   - if ($.validate.form()) {
507   - $.operate.save(prefix + "/add", $('#form-line-add').serialize());
508   - }
509   - }
  448 + console.log([[${user}]]);
510 449  
511   - function submitHandlerCommit() {
512   - if ($.validate.form()) {
513   - $.operate.save(prefix + "/add", $('#form-line-add').serialize()+'&examineStatus=1');
  450 + // 获取 div 标签下的所有子节点
  451 + /* var pObjs = document.getElementById('lw').getElementsByTagName("*")
  452 + for (var i = 0 ; i <pObjs.length; i++) { // 一定要倒序，正序是删不干净的，可自行尝试
  453 + pObjs[i].setAttribute("disabled",true);
  454 + }
  455 + var pObjs = document.getElementById('dd').getElementsByTagName("*")
  456 + for (var i = 0 ; i <pObjs.length; i++) { // 一定要倒序，正序是删不干净的，可自行尝试
  457 + pObjs[i].setAttribute("disabled",true);
  458 + }*/
  459 + });
  460 +
  461 + function companySelect() {
  462 +
  463 + var arr = new Array();
  464 + var company = new Object();
  465 + company.id = '';
  466 + company.text = '';
  467 + company.value = '';
  468 + arr.push(company)
  469 + for (var i = 0; i < companies.length; i++) {
  470 + company = new Object();
  471 + company.id = companies[i];
  472 + company.text = companies[i];
  473 + company.value = companies[i];
  474 + arr.push(company);
  475 + }
  476 + $("#company").select2({
  477 + data: arr,
  478 + placeholder: '请选择',
  479 + allowClear: true
  480 + })
  481 + }
  482 +
  483 + function fCompanySelect() {
  484 + $('#fCompany').empty();
  485 + var company = $('#company').select2('val');
  486 + var arr = new Array();
  487 + var fCompany = new Object();
  488 + fCompany.id = '';
  489 + fCompany.text = '';
  490 + fCompany.value = '';
  491 + arr.push(fCompany)
  492 + if (company == '') {
  493 + for (let i in companyList) {
  494 + var companyName = companyList[i].company;
  495 + var fCompanyName = companyList[i].fCompany;
  496 + fCompany = new Object();
  497 + fCompany.id = fCompanyName;
  498 + fCompany.text = fCompanyName;
  499 + fCompany.value = fCompanyName;
  500 + arr.push(fCompany);
  501 + }
  502 + } else {
  503 + for (let i in companyList) {
  504 + var companyName = companyList[i].company;
  505 + var fCompanyName = companyList[i].fCompany;
  506 + if (companyName == company) {
  507 + fCompany = new Object();
  508 + fCompany.id = fCompanyName;
  509 + fCompany.text = fCompanyName;
  510 + fCompany.value = fCompanyName;
  511 + arr.push(fCompany);
  512 + }
514 513 }
515 514 }
516   -
517   - $("input[name='warrantStartTime']").datetimepicker({
518   - format: "yyyy-mm-dd",
519   - minView: "month",
520   - autoclose: true
  515 + $("#fCompany").select2({
  516 + data: arr,
  517 + placeholder: '请选择',
  518 + allowClear: true
521 519 });
522   -
523   - $("input[name='warrantEndTime']").datetimepicker({
524   - format: "yyyy-mm-dd",
525   - minView: "month",
526   - autoclose: true
  520 + }
  521 +
  522 + $(function () {
  523 + $("#fileinput").fileinput({
  524 + 'theme': 'explorer-fas',
  525 + 'uploadUrl': '/common/upload',
  526 + overwriteInitial: false,
  527 + initialPreviewAsData: false
527 528 });
528 529  
529   - $("input[name='planCancelTime']").datetimepicker({
530   - format: "yyyy-mm-dd",
531   - minView: "month",
532   - autoclose: true
533   - });
534   -
535   - $("input[name='cancelTime']").datetimepicker({
536   - format: "yyyy-mm-dd",
537   - minView: "month",
538   - autoclose: true
539   - });
  530 + $("#fileinput").on("fileuploaded",
  531 + function (event, data, proviewId, index) {
540 532  
541   - $("input[name='updateTime']").datetimepicker({
542   - format: "yyyy-mm-dd",
543   - minView: "month",
544   - autoclose: true
545   - });
  533 + var obj = '<div><input name="files" type="hidden" value=' + data.files[index].name + ':' + data.response.url + '>' +
  534 + '<a href=' + data.response.url + '>' + data.files[index].name +
  535 + '</a><button onclick="deleteFile(this);">删除</button></div>';
546 536  
547   - $("input[name='timeSchedule']").datetimepicker({
548   - format: "yyyy-mm-dd",
549   - minView: "month",
550   - autoclose: true
551   - });
552 537  
553   - $("input[name='startDate']").datetimepicker({
554   - format: "yyyy-mm-dd hh:ii:ss",
555   - autoclose: true
556   - });
  538 + $(".file-input").before(obj);
557 539  
558   - $("input[name='isWarrantStartTime']").datetimepicker({
559   - format: "yyyy-mm-dd",
560   - minView: "month",
561   - autoclose: true
562   - });
563   - $("input[name='isWarrantEndTime']").datetimepicker({
564   - format: "yyyy-mm-dd",
565   - minView: "month",
566   - autoclose: true
567   - });
  540 + });
  541 + })
568 542  
  543 + function deleteFile(obj) {
  544 + $(obj).parent().remove();
  545 + }
569 546  
570   - function isExist(lineName){
571   - var data={'lineName':lineName,'examineType':'0'};
572   - $.post(prefix + "/isExist",data,function (result){
573   - if(result.id!=null){
574   - layer.confirm("是否修改上一次的记录",{
575   - btn: ['是', '否']
576   - },function (index, layero) {
577   - var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
578   - parent.layer.close(index); //再执行关闭
579   - edit(result.id);
580   - });
581   - }
  547 + $("#form-line-add").validate({
  548 + rules: {
  549 + remark: {
  550 + required: true,
  551 + },
  552 + },
  553 + messages: {
  554 + remark: {
  555 + required: "请写入备注",
  556 + }
  557 + }, focusCleanup: true
  558 + });
582 559  
583   - })
  560 + function submitHandler() {
  561 + if ($.validate.form()) {
  562 + $.operate.save(prefix + "/add", $('#form-line-add').serialize());
584 563 }
  564 + }
585 565  
586   - function edit(id) {
587   - open(id,"修改线路档案信息",(prefix + "/edit/{id}").replace("{id}", id));
  566 + function submitHandlerCommit() {
  567 + if ($.validate.form()) {
  568 + $.operate.save(prefix + "/add", $('#form-line-add').serialize() + '&examineStatus=1');
588 569 }
589   -
590   - function open(id,title, url, width, height, callback) {
591   - console.log(id)
592   - // 如果是移动端，就使用自适应大小弹窗
593   - if ($.common.isMobile()) {
594   - width = 'auto';
595   - height = 'auto';
596   - }
597   - if ($.common.isEmpty(title)) {
598   - title = false;
599   - }
600   - if ($.common.isEmpty(url)) {
601   - url = "/404.html";
602   - }
603   - if ($.common.isEmpty(width)) {
604   - width = 800;
605   - }
606   - if ($.common.isEmpty(height)) {
607   - height = ($(window).height() - 50);
  570 + }
  571 +
  572 + $("input[name='warrantStartTime']").datetimepicker({
  573 + format: "yyyy-mm-dd",
  574 + minView: "month",
  575 + autoclose: true
  576 + });
  577 +
  578 + $("input[name='warrantEndTime']").datetimepicker({
  579 + format: "yyyy-mm-dd",
  580 + minView: "month",
  581 + autoclose: true
  582 + });
  583 +
  584 + $("input[name='planCancelTime']").datetimepicker({
  585 + format: "yyyy-mm-dd",
  586 + minView: "month",
  587 + autoclose: true
  588 + });
  589 +
  590 + $("input[name='cancelTime']").datetimepicker({
  591 + format: "yyyy-mm-dd",
  592 + minView: "month",
  593 + autoclose: true
  594 + });
  595 +
  596 + $("input[name='updateTime']").datetimepicker({
  597 + format: "yyyy-mm-dd",
  598 + minView: "month",
  599 + autoclose: true
  600 + });
  601 +
  602 + $("input[name='timeSchedule']").datetimepicker({
  603 + format: "yyyy-mm-dd",
  604 + minView: "month",
  605 + autoclose: true
  606 + });
  607 +
  608 +
  609 + function isExist(lineName) {
  610 + var data = {'lineName': lineName, 'examineType': '0'};
  611 + $.post(prefix + "/isExist", data, function (result) {
  612 + if (result.id != null) {
  613 + layer.confirm("是否修改上一次的记录", {
  614 + btn: ['是', '否']
  615 + }, function (index, layero) {
  616 + var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
  617 + parent.layer.close(index); //再执行关闭
  618 + edit(result.id);
  619 + });
608 620 }
609   - if ($.common.isEmpty(callback)) {
610   - callback = function(index, layero) {
611   - var iframeWin = layero.find('iframe')[0];
612   - iframeWin.contentWindow.submitHandler(index, layero);
613   - }
  621 +
  622 + })
  623 + }
  624 +
  625 + function edit(id) {
  626 + open(id, "修改线路档案信息", (prefix + "/edit/{id}").replace("{id}", id));
  627 + }
  628 +
  629 + function open(id, title, url, width, height, callback) {
  630 + console.log(id)
  631 + // 如果是移动端，就使用自适应大小弹窗
  632 + if ($.common.isMobile()) {
  633 + width = 'auto';
  634 + height = 'auto';
  635 + }
  636 + if ($.common.isEmpty(title)) {
  637 + title = false;
  638 + }
  639 + if ($.common.isEmpty(url)) {
  640 + url = "/404.html";
  641 + }
  642 + if ($.common.isEmpty(width)) {
  643 + width = 800;
  644 + }
  645 + if ($.common.isEmpty(height)) {
  646 + height = ($(window).height() - 50);
  647 + }
  648 + if ($.common.isEmpty(callback)) {
  649 + callback = function (index, layero) {
  650 + var iframeWin = layero.find('iframe')[0];
  651 + iframeWin.contentWindow.submitHandler(index, layero);
614 652 }
  653 + }
615 654  
616   - var index=parent.layer.open({
617   - type: 2,
618   - area: [width + 'px', height + 'px'],
619   - fix: false,
620   - //不固定
621   - maxmin: true,
622   - shade: 0.3,
623   - title: title,
624   - content: url,
625   - btn: ['保存','提交','删除'],
626   - // 弹层外区域关闭
627   - shadeClose: true,
628   - yes: callback,
629   - btn2: function(index, layero) {
630   - var iframeWin = layero.find('iframe')[0];
631   - iframeWin.contentWindow.submitHandlerCommit(index, layero);
632   - return false;
633   - },
634   - btn3: function(index, layero){
635   - $.operate.remove(id)
636   - }
637   - });
638   - parent.layer.full(index);
  655 + var index = parent.layer.open({
  656 + type: 2,
  657 + area: [width + 'px', height + 'px'],
  658 + fix: false,
  659 + //不固定
  660 + maxmin: true,
  661 + shade: 0.3,
  662 + title: title,
  663 + content: url,
  664 + btn: ['保存', '提交', '删除'],
  665 + // 弹层外区域关闭
  666 + shadeClose: true,
  667 + yes: callback,
  668 + btn2: function (index, layero) {
  669 + var iframeWin = layero.find('iframe')[0];
  670 + iframeWin.contentWindow.submitHandlerCommit(index, layero);
  671 + return false;
  672 + },
  673 + btn3: function (index, layero) {
  674 + $.operate.remove(id)
  675 + }
  676 + });
  677 + parent.layer.full(index);
639 678  
640   - }
  679 + }
641 680  
642 681  
643   - </script>
  682 +</script>
644 683 </body>
645 684 </html>
646 685 \ No newline at end of file
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @df14b31
... ... @@ -142,10 +142,10 @@
142 142 </select>
143 143 </div>
144 144 <!---------------------------------->
145   - <label class="col-sm-1 control-label">线路编码：</label>
146   - <div class="col-sm-2">
147   - <input name="lineCode" th:field="*{lineCode}" class="form-control" type="text">
148   - </div>
  145 +<!-- <label class="col-sm-1 control-label">线路编码：</label>-->
  146 +<!-- <div class="col-sm-2">-->
  147 +<!-- <input name="lineCode" th:field="*{lineCode}" class="form-control" type="text">-->
  148 +<!-- </div>-->
149 149 </div>
150 150  
151 151 <div class="form-group">
... ... @@ -176,22 +176,22 @@
176 176 <textarea name="directions" class="form-control">[[*{directions}]]</textarea>
177 177 </div>
178 178 <!---------------------------------->
179   - <label class="col-sm-1 control-label">首站时间：</label>
  179 + <label class="col-sm-1 control-label">起点站首末班：</label>
180 180 <div class="col-sm-2">
181 181 <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
182 182 </div>
183 183 <!---------------------------------->
184   - <label class="col-sm-1 control-label">末站首站时间：</label>
  184 + <label class="col-sm-1 control-label">终点站首末班：</label>
185 185 <div class="col-sm-2">
186 186 <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
187 187 </div>
188 188 </div>
189 189  
190 190 <div class="form-group">
191   - <label class="col-sm-1 control-label">停车场：</label>
192   - <div class="col-sm-2">
193   - <input name="park" th:field="*{park}" class="form-control" type="text">
194   - </div>
  191 +<!-- <label class="col-sm-1 control-label">停车场：</label>-->
  192 +<!-- <div class="col-sm-2">-->
  193 +<!-- <input name="park" th:field="*{park}" class="form-control" type="text">-->
  194 +<!-- </div>-->
195 195 <!---------------------------------->
196 196 <label class="col-sm-1 control-label">授权年限：</label>
197 197 <div class="col-sm-2">
... ... @@ -218,7 +218,7 @@
218 218 </div>
219 219  
220 220 <div class="form-group">
221   - <label class="col-sm-1 control-label">撤销日期：</label>
  221 + <label class="col-sm-1 control-label">线路暂停日期：</label>
222 222 <div class="col-sm-2">
223 223 <div class="input-group date">
224 224 <input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
... ... @@ -236,12 +236,7 @@
236 236 </div>
237 237 </div>
238 238 <!---------------------------------->
239   - <label class="col-sm-1 control-label">撤销原因：</label>
240   - <div class="col-sm-2">
241   - <textarea name="cancelReason" class="form-control">[[*{cancelReason}]]</textarea>
242   - </div>
243   - <!---------------------------------->
244   - <label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
  239 + <label class="col-sm-1 control-label">实施时间：</label>
245 240 <div class="col-sm-2">
246 241 <div class="input-group date">
247 242 <input name="timeSchedule"
... ... @@ -262,28 +257,6 @@
262 257 </select>
263 258 </div>
264 259 <!---------------------------------->
265   - <label class="col-sm-1 control-label">权证开通日期：</label>
266   - <div class="col-sm-2">
267   - <div class="input-group date">
268   - <input name="isWarrantStartTime" id="isWarrantStartTime"
269   - th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
270   - class="form-control" placeholder="yyyy-MM-dd" type="text"
271   - autocomplete="off"> <span class="input-group-addon"><i
272   - class="fa fa-calendar"></i></span>
273   - </div>
274   - </div>
275   - <!---------------------------------->
276   - <label class="col-sm-1 control-label">权证到期日期：</label>
277   - <div class="col-sm-2">
278   - <div class="input-group date">
279   - <input name="isWarrantEndTime" id="isWarrantEndTime"
280   - th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
281   - class="form-control" placeholder="yyyy-MM-dd" type="text"
282   - autocomplete="off"> <span class="input-group-addon"><i
283   - class="fa fa-calendar"></i></span>
284   - </div>
285   - </div>
286   - <!---------------------------------->
287 260 <label class="col-sm-1 control-label">经营权证（大巴）：</label>
288 261 <div class="col-sm-2">
289 262 <input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
... ... @@ -323,11 +296,6 @@
323 296 <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
324 297 </div>
325 298 <!---------------------------------->
326   - <label class="col-sm-1 control-label">平均里程数：</label>
327   - <div class="col-sm-2">
328   - <input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text">
329   - </div>
330   - <!---------------------------------->
331 299 <label class="col-sm-1 control-label">站级数(上行)：</label>
332 300 <div class="col-sm-2">
333 301 <input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
... ... @@ -362,16 +330,6 @@
362 330 <input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text">
363 331 </div>
364 332 <!---------------------------------->
365   - <label class="col-sm-1 control-label">高峰系数：</label>
366   - <div class="col-sm-2">
367   - <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text">
368   - </div>
369   - <!---------------------------------->
370   - <label class="col-sm-1 control-label">低谷系数：</label>
371   - <div class="col-sm-2">
372   - <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text">
373   - </div>
374   - <!---------------------------------->
375 333 <label class="col-sm-1 control-label">间隔等级：</label>
376 334 <div class="col-sm-2">
377 335 <input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text">
... ... @@ -384,7 +342,7 @@
384 342 <input name="carPlate" th:field="*{carPlate}" class="form-control" type="text">
385 343 </div>
386 344 <!---------------------------------->
387   - <label class="col-sm-1 control-label">线路总配人数：</label>
  345 + <label class="col-sm-1 control-label">线路配档数：</label>
388 346 <div class="col-sm-2">
389 347 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
390 348 </div>
... ... @@ -437,10 +395,6 @@
437 395 </div>
438 396  
439 397 <div class="form-group">
440   - <label class="col-sm-1 control-label">经营权证数：</label>
441   - <div class="col-sm-2">
442   - <input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text">
443   - </div>
444 398 <!---------------------------------->
445 399 <label class="col-sm-1 control-label">营运状态：</label>
446 400 <div class="col-sm-2">
... ... @@ -474,13 +428,6 @@
474 428 </select>
475 429 </div>
476 430 <!---------------------------------->
477   - <label class="col-sm-1 control-label">启用时间：</label>
478   - <div class="col-sm-2">
479   - <div class="input-group date">
480   - <input name="startDate" type="text" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd HH:mm:ss')}">
481   - </div>
482   - </div>
483   - <!---------------------------------->
484 431 <label class="col-sm-1 control-label">备注：</label>
485 432 <div class="col-sm-2">
486 433 <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
... ... @@ -550,43 +497,21 @@
550 497  
551 498 $("#form-line-edit").validate({
552 499 rules:{
553   - isWarrantStartTime:{
554   - required:function (){
555   - return $('#isWarrant').val()==='1';
556   - },
557   - },
558   - isWarrantEndTime:{
559   - required:function (){
560   - return $('#isWarrant').val()==='1';
561   - },
562   - },
  500 +
563 501 remark:{
564 502 required:true,
565   - },
566   - startDate:{
567   - required:true,
568 503 }
569 504 },
570 505 messages: {
571   - isWarrantStartTime: {
572   - required: "请选择日期",
573   - },
574   - isWarrantEndTime: {
575   - required: "请选择日期",
576   - },
577 506 remark: {
578 507 required: "请写入备注",
579   - },
580   - startDate: {
581   - required: "请选择时间",
582 508 }
583 509 },
584 510 focusCleanup : true
585 511 });
586 512  
587 513 function submitHandler() {
588   - if ($("input[name='startDate']").val()
589   - && $("select[name='lineUpdateType']").val() == "") {
  514 + if ($("select[name='lineUpdateType']").val() == "") {
590 515 $.modal.msg("未选择线路性质");
591 516 return;
592 517 }
... ... @@ -638,22 +563,6 @@
638 563 autoclose : true
639 564 });
640 565  
641   - $("input[name='startDate']").datetimepicker({
642   - format: "yyyy-mm-dd hh:ii:ss",
643   - autoclose: true
644   - });
645   -
646   - $("input[name='isWarrantStartTime']").datetimepicker({
647   - format : "yyyy-mm-dd",
648   - minView : "month",
649   - autoclose : true
650   - });
651   -
652   - $("input[name='isWarrantEndTime']").datetimepicker({
653   - format : "yyyy-mm-dd",
654   - minView : "month",
655   - autoclose : true
656   - });
657 566  
658 567 </script>
659 568 </body>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/line.html
  View file @df14b31
... ... @@ -195,7 +195,7 @@
195 195 }
196 196 }
197 197  
198   - if(this.field == "isLogicDelete" || this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists"){
  198 + if(this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists"){
199 199 for(var j in dicts["trueFalse"]){
200 200 if(dicts["trueFalse"][j].dictValue == value){
201 201 value = dicts["trueFalse"][j].dictLabel;
... ...
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @df14b31
... ... @@ -142,10 +142,10 @@
142 142 </select>
143 143 </div>
144 144 <!---------------------------------->
145   - <label class="col-sm-1 control-label">线路编码：</label>
  145 + <!--<label class="col-sm-1 control-label">线路编码：</label>
146 146 <div class="col-sm-2">
147 147 <input name="lineCode" th:field="*{lineCode}" class="form-control" type="text" disabled>
148   - </div>
  148 + </div>-->
149 149 </div>
150 150  
151 151 <div class="form-group">
... ... @@ -176,22 +176,22 @@
176 176 <textarea name="directions" class="form-control" disabled>[[*{directions}]]</textarea>
177 177 </div>
178 178 <!---------------------------------->
179   - <label class="col-sm-1 control-label">首站时间：</label>
  179 + <label class="col-sm-1 control-label">起点站首末班：</label>
180 180 <div class="col-sm-2">
181 181 <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text" disabled>
182 182 </div>
183 183 <!---------------------------------->
184   - <label class="col-sm-1 control-label">末站首站时间：</label>
  184 + <label class="col-sm-1 control-label">终点站首末班：</label>
185 185 <div class="col-sm-2">
186 186 <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text" disabled>
187 187 </div>
188 188 </div>
189 189  
190 190 <div class="form-group">
191   - <label class="col-sm-1 control-label">停车场：</label>
192   - <div class="col-sm-2">
193   - <input name="park" th:field="*{park}" class="form-control" type="text" disabled>
194   - </div>
  191 +<!-- <label class="col-sm-1 control-label">停车场：</label>-->
  192 +<!-- <div class="col-sm-2">-->
  193 +<!-- <input name="park" th:field="*{park}" class="form-control" type="text" disabled>-->
  194 +<!-- </div>-->
195 195 <!---------------------------------->
196 196 <label class="col-sm-1 control-label">授权年限：</label>
197 197 <div class="col-sm-2">
... ... @@ -218,7 +218,7 @@
218 218 </div>
219 219  
220 220 <div class="form-group">
221   - <label class="col-sm-1 control-label">撤销日期：</label>
  221 + <label class="col-sm-1 control-label">线路暂停日期：</label>
222 222 <div class="col-sm-2">
223 223 <div class="input-group date">
224 224 <input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
... ... @@ -236,12 +236,7 @@
236 236 </div>
237 237 </div>
238 238 <!---------------------------------->
239   - <label class="col-sm-1 control-label">撤销原因：</label>
240   - <div class="col-sm-2">
241   - <textarea name="cancelReason" class="form-control" disabled>[[*{cancelReason}]]</textarea>
242   - </div>
243   - <!---------------------------------->
244   - <label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
  239 + <label class="col-sm-1 control-label">实施时间：</label>
245 240 <div class="col-sm-2">
246 241 <div class="input-group date">
247 242 <input name="timeSchedule" th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
... ... @@ -260,24 +255,6 @@
260 255 </select>
261 256 </div>
262 257 <!---------------------------------->
263   - <label class="col-sm-1 control-label">权证开通日期：</label>
264   - <div class="col-sm-2">
265   - <div class="input-group date">
266   - <input name="isWarrantStartTime" id="isWarrantStartTime" th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
267   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
268   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
269   - </div>
270   - </div>
271   - <!---------------------------------->
272   - <label class="col-sm-1 control-label">权证到期日期：</label>
273   - <div class="col-sm-2">
274   - <div class="input-group date">
275   - <input name="isWarrantEndTime" id="isWarrantEndTime" th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
276   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
277   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
278   - </div>
279   - </div>
280   - <!---------------------------------->
281 258 <label class="col-sm-1 control-label">经营权证（大巴）：</label>
282 259 <div class="col-sm-2">
283 260 <input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text" disabled>
... ... @@ -317,11 +294,6 @@
317 294 <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text"disabled>
318 295 </div>
319 296 <!---------------------------------->
320   - <label class="col-sm-1 control-label">平均里程数：</label>
321   - <div class="col-sm-2">
322   - <input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text" disabled>
323   - </div>
324   - <!---------------------------------->
325 297 <label class="col-sm-1 control-label">站级数(上行)：</label>
326 298 <div class="col-sm-2">
327 299 <input name="stationUp" th:field="*{stationUp}" class="form-control" type="text" disabled>
... ... @@ -356,16 +328,6 @@
356 328 <input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text" disabled>
357 329 </div>
358 330 <!---------------------------------->
359   - <label class="col-sm-1 control-label">高峰系数：</label>
360   - <div class="col-sm-2">
361   - <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text" disabled>
362   - </div>
363   - <!---------------------------------->
364   - <label class="col-sm-1 control-label">低谷系数：</label>
365   - <div class="col-sm-2">
366   - <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text" disabled>
367   - </div>
368   - <!---------------------------------->
369 331 <label class="col-sm-1 control-label">间隔等级：</label>
370 332 <div class="col-sm-2">
371 333 <input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text" disabled>
... ... @@ -378,7 +340,7 @@
378 340 <input name="carPlate" th:field="*{carPlate}" class="form-control" type="text" disabled>
379 341 </div>
380 342 <!---------------------------------->
381   - <label class="col-sm-1 control-label">线路总配人数：</label>
  343 + <label class="col-sm-1 control-label">线路配档数：</label>
382 344 <div class="col-sm-2">
383 345 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text" disabled>
384 346 </div>
... ... @@ -428,10 +390,6 @@
428 390 </div>
429 391  
430 392 <div class="form-group">
431   - <label class="col-sm-1 control-label">经营权证数：</label>
432   - <div class="col-sm-2">
433   - <input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text" disabled>
434   - </div>
435 393 <!---------------------------------->
436 394 <label class="col-sm-1 control-label">营运状态：</label>
437 395 <div class="col-sm-2">
... ... @@ -466,13 +424,6 @@
466 424 </select>
467 425 </div>
468 426 <!---------------------------------->
469   - <label class="col-sm-1 control-label">启用时间：</label>
470   - <div class="col-sm-2">
471   - <div class="input-group date">
472   - <input name="startDate" type="text" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd HH:mm:ss')}">
473   - </div>
474   - </div>
475   - <!---------------------------------->
476 427 <label class="col-sm-1 control-label">备注：</label>
477 428 <div class="col-sm-2">
478 429 <textarea name="remark" class="form-control" disabled>[[*{remark}]]</textarea>
... ... @@ -602,35 +553,13 @@
602 553 }
603 554  
604 555 $("#form-line-edit").validate({
605   - rules:{
606   - isWarrantStartTime:{
607   - required:function (){
608   - return $('#isWarrant').val()==='1';
609   - },
610   - },
611   - isWarrantEndTime:{
612   - required:function (){
613   - return $('#isWarrant').val()==='1';
614   - },
615   - },
616   - },
617   - messages: {
618   - isWarrantStartTime: {
619   - required: "请选择日期",
620   - },
621   - isWarrantEndTime: {
622   - required: "请选择日期",
623   - }
624   - },
625 556 focusCleanup : true
626 557 });
627 558  
628 559 function submitHandler() {
629   - console.log($("input[name='startDate']").val());
630 560 console.log($("select[name='lineUpdateType']").val());
631 561  
632   - if ($("input[name='startDate']").val()
633   - && $("select[name='lineUpdateType']").val() == "") {
  562 + if ($("select[name='lineUpdateType']").val() == "") {
634 563 $.modal.msg("未选择线路性质");
635 564 return;
636 565 }
... ... @@ -677,22 +606,7 @@
677 606 autoclose : true
678 607 });
679 608  
680   - $("input[name='startDate']").datetimepicker({
681   - format: "yyyy-mm-dd hh:ii:ss",
682   - autoclose: true
683   - });
684 609  
685   - $("input[name='isWarrantStartTime']").datetimepicker({
686   - format : "yyyy-mm-dd",
687   - minView : "month",
688   - autoclose : true
689   - });
690   -
691   - $("input[name='isWarrantEndTime']").datetimepicker({
692   - format : "yyyy-mm-dd",
693   - minView : "month",
694   - autoclose : true
695   - });
696 610  
697 611 </script>
698 612 </body>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
  View file @df14b31
... ... @@ -231,7 +231,7 @@
231 231 }
232 232 }
233 233  
234   - if(this.field == "isLogicDelete" || this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists"){
  234 + if(this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists"){
235 235 for(var j in dicts["trueFalse"]){
236 236 if(dicts["trueFalse"][j].dictValue == value){
237 237 value = dicts["trueFalse"][j].dictLabel;
... ... @@ -389,20 +389,22 @@
389 389 }
390 390 });
391 391 },
392   - btn2: function(index, layero){
393   - remove(id)
  392 + btn2:function () {
  393 + var url=prefix+'/examine'
  394 + var data={'id':id,'examineType':examineType,'examineStatus':'3'}
  395 + $.post(url, data, function(result) {
  396 + if (result.code == web_status.SUCCESS) {
  397 + $.table.refresh();
  398 + $.modal.alertSuccess(result.msg)
  399 + }else {
  400 + $.modal.alertError(result.msg);
  401 + }
  402 + });
394 403 }
395 404 });
396 405 layer.full(index);
397 406 }
398 407  
399   - function remove(id) {
400   - table.set();
401   - var url = $.common.isEmpty(id) ? table.options.removeUrl : table.options.removeUrl.replace("{id}", id);
402   - var data = { "ids": id };
403   - $.operate.submit(url, "post", "json", data);
404   - }
405   -
406 408 $("input[name='createTimeStr']").datetimepicker({
407 409 format: "yyyy-mm-dd",
408 410 minView: "month",
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @df14b31
... ... @@ -77,8 +77,7 @@
77 77 <div class="form-group">
78 78 <label class="col-sm-1 control-label">区属：</label>
79 79 <div class="col-sm-2">
80   - <select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b">
81   - <option value=""></option>
  80 + <select name="district" th:with="type=${@dict.getType('district')}"class="selectpicker form-control" multiple title="">
82 81 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
83 82 th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
84 83 </select>
... ... @@ -142,10 +141,10 @@
142 141 </select>
143 142 </div>
144 143 <!---------------------------------->
145   - <label class="col-sm-1 control-label">线路编码：</label>
  144 + <!-- <label class="col-sm-1 control-label">线路编码：</label>
146 145 <div class="col-sm-2">
147 146 <input name="lineCode" th:field="*{lineCode}" class="form-control" type="text">
148   - </div>
  147 + </div>-->
149 148 </div>
150 149  
151 150 <div class="form-group">
... ... @@ -177,22 +176,22 @@
177 176 <textarea name="directions" class="form-control">[[*{directions}]]</textarea>
178 177 </div>
179 178 <!---------------------------------->
180   - <label class="col-sm-1 control-label">首站时间：</label>
  179 + <label class="col-sm-1 control-label">起点站首末班：</label>
181 180 <div class="col-sm-2">
182 181 <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
183 182 </div>
184 183 <!---------------------------------->
185   - <label class="col-sm-1 control-label">末站首站时间：</label>
  184 + <label class="col-sm-1 control-label">终点站首末班：</label>
186 185 <div class="col-sm-2">
187 186 <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
188 187 </div>
189 188 </div>
190 189  
191 190 <div class="form-group">
192   - <label class="col-sm-1 control-label">停车场：</label>
193   - <div class="col-sm-2">
194   - <input name="park" th:field="*{park}" class="form-control" type="text">
195   - </div>
  191 +<!-- <label class="col-sm-1 control-label">停车场：</label>-->
  192 +<!-- <div class="col-sm-2">-->
  193 +<!-- <input name="park" th:field="*{park}" class="form-control" type="text">-->
  194 +<!-- </div>-->
196 195 <!---------------------------------->
197 196 <label class="col-sm-1 control-label">授权年限：</label>
198 197 <div class="col-sm-2">
... ... @@ -219,7 +218,7 @@
219 218 </div>
220 219  
221 220 <div class="form-group">
222   - <label class="col-sm-1 control-label">撤销日期：</label>
  221 + <label class="col-sm-1 control-label">线路暂停日期：</label>
223 222 <div class="col-sm-2">
224 223 <div class="input-group date">
225 224 <input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
... ... @@ -237,12 +236,7 @@
237 236 </div>
238 237 </div>
239 238 <!---------------------------------->
240   - <label class="col-sm-1 control-label">撤销原因：</label>
241   - <div class="col-sm-2">
242   - <textarea name="cancelReason" class="form-control">[[*{cancelReason}]]</textarea>
243   - </div>
244   - <!---------------------------------->
245   - <label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
  239 + <label class="col-sm-1 control-label">实施时间：</label>
246 240 <div class="col-sm-2">
247 241 <div class="input-group date">
248 242 <input name="timeSchedule"
... ... @@ -263,28 +257,6 @@
263 257 </select>
264 258 </div>
265 259 <!---------------------------------->
266   - <label class="col-sm-1 control-label">权证开通日期：</label>
267   - <div class="col-sm-2">
268   - <div class="input-group date">
269   - <input name="isWarrantStartTime" id="isWarrantStartTime"
270   - th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
271   - class="form-control" placeholder="yyyy-MM-dd" type="text"
272   - autocomplete="off"> <span class="input-group-addon"><i
273   - class="fa fa-calendar"></i></span>
274   - </div>
275   - </div>
276   - <!---------------------------------->
277   - <label class="col-sm-1 control-label">权证到期日期：</label>
278   - <div class="col-sm-2">
279   - <div class="input-group date">
280   - <input name="isWarrantEndTime" id="isWarrantEndTime"
281   - th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
282   - class="form-control" placeholder="yyyy-MM-dd" type="text"
283   - autocomplete="off"> <span class="input-group-addon"><i
284   - class="fa fa-calendar"></i></span>
285   - </div>
286   - </div>
287   - <!---------------------------------->
288 260 <label class="col-sm-1 control-label">经营权证（大巴）：</label>
289 261 <div class="col-sm-2">
290 262 <input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
... ... @@ -324,11 +296,6 @@
324 296 <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
325 297 </div>
326 298 <!---------------------------------->
327   - <label class="col-sm-1 control-label">平均里程数：</label>
328   - <div class="col-sm-2">
329   - <input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text">
330   - </div>
331   - <!---------------------------------->
332 299 <label class="col-sm-1 control-label">站级数(上行)：</label>
333 300 <div class="col-sm-2">
334 301 <input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
... ... @@ -363,16 +330,6 @@
363 330 <input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text">
364 331 </div>
365 332 <!---------------------------------->
366   - <label class="col-sm-1 control-label">高峰系数：</label>
367   - <div class="col-sm-2">
368   - <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text">
369   - </div>
370   - <!---------------------------------->
371   - <label class="col-sm-1 control-label">低谷系数：</label>
372   - <div class="col-sm-2">
373   - <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text">
374   - </div>
375   - <!---------------------------------->
376 333 <label class="col-sm-1 control-label">间隔等级：</label>
377 334 <div class="col-sm-2">
378 335 <input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text">
... ... @@ -385,7 +342,7 @@
385 342 <input name="carPlate" th:field="*{carPlate}" class="form-control" type="text">
386 343 </div>
387 344 <!---------------------------------->
388   - <label class="col-sm-1 control-label">线路总配人数：</label>
  345 + <label class="col-sm-1 control-label">线路配档数：</label>
389 346 <div class="col-sm-2">
390 347 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
391 348 </div>
... ... @@ -438,10 +395,6 @@
438 395 </div>
439 396  
440 397 <div class="form-group">
441   - <label class="col-sm-1 control-label">经营权证数：</label>
442   - <div class="col-sm-2">
443   - <input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text">
444   - </div>
445 398 <!---------------------------------->
446 399 <label class="col-sm-1 control-label">营运状态：</label>
447 400 <div class="col-sm-2">
... ... @@ -479,13 +432,6 @@
479 432 </select>
480 433 </div>
481 434 <!---------------------------------->
482   - <label class="col-sm-1 control-label">启用时间：</label>
483   - <div class="col-sm-2">
484   - <div class="input-group date">
485   - <input name="startDate" type="text" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd HH:mm:ss')}">
486   - </div>
487   - </div>
488   - <!---------------------------------->
489 435 <label class="col-sm-1 control-label">备注：</label>
490 436 <div class="col-sm-2">
491 437 <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
... ... @@ -611,7 +557,7 @@
611 557 }
612 558  
613 559  
614   - if (i == "startDate" || i == "startReason" || i == "id" || i == "lineUpdateType")
  560 + if (i == "id" || i == "lineUpdateType")
615 561 continue;
616 562  
617 563 var inputValue = "";
... ... @@ -719,20 +665,6 @@
719 665 autoclose : true
720 666 });
721 667  
722   - $("input[name='startDate']").datetimepicker({
723   - format: "yyyy-mm-dd hh:ii:ss",
724   - autoclose: true
725   - });
726   - $("input[name='isWarrantStartTime']").datetimepicker({
727   - format : "yyyy-mm-dd",
728   - minView : "month",
729   - autoclose : true
730   - });
731   - $("input[name='isWarrantEndTime']").datetimepicker({
732   - format : "yyyy-mm-dd",
733   - minView : "month",
734   - autoclose : true
735   - });
736 668 </script>
737 669 </body>
738 670 </html>
739 671 \ No newline at end of file
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
  View file @df14b31
... ... @@ -103,10 +103,10 @@
103 103 <label class="col-sm-3 control-label">线路长度：</label>
104 104 <span class="col-sm-9" id="lineDistance">{{line.lineDistance}}</span>
105 105 </div>
106   - <div class="col-sm-6">
  106 + <!-- <div class="col-sm-6">
107 107 <label class="col-sm-3 control-label">线路编码：</label>
108 108 <span class="col-sm-9" id="lineCode">{{line.lineCode}}</span>
109   - </div>
  109 + </div>-->
110 110 <div class="col-sm-6">
111 111 <label class="col-sm-3 control-label">授权年限：</label>
112 112 <span class="col-sm-9" id="warrantYear">{{line.warrantYear}}</span>
... ... @@ -120,7 +120,7 @@
120 120 <span class="col-sm-9" id="warrantEndTime">{{line.warrantEndTime}}</span>
121 121 </div>
122 122 <div class="col-sm-6">
123   - <label class="col-sm-3 control-label">撤销日期：</label>
  123 + <label class="col-sm-3 control-label">线路暂停日期：</label>
124 124 <span class="col-sm-9" id="planCancelTime">{{line.planCancelTime}}</span>
125 125 </div>
126 126 <div class="col-sm-6">
... ... @@ -128,25 +128,19 @@
128 128 <span class="col-sm-9"id="cancelTime">{{line.cancelTime}}</span>
129 129 </div>
130 130 <div class="col-sm-6">
131   - <label class="col-sm-3 control-label">撤销原因：</label>
132   - <span class="col-sm-9"id="cancelReason">
133   - <textarea name="cancelReason" class="form-control" readonly >{{line.cancelReason}}</textarea>
134   - </span>
135   - </div>
136   - <div class="col-sm-6">
137 131 <label class="col-sm-3 control-label">备注：</label>
138 132 <span class="col-sm-9"id="remark">
139 133 <textarea name="remark" class="form-control" readonly >{{line.remark}}</textarea>
140 134 </span>
141 135 </div>
142 136 <div class="col-sm-6">
143   - <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
  137 + <label class="col-sm-3 control-label">实施时间：</label>
144 138 <span class="col-sm-9" id="timeSchedule">{{line.timeSchedule}}</span>
145 139 </div>
146   - <div class="col-sm-6">
147   - <label class="col-sm-3 control-label">停车场：</label>
148   - <span class="col-sm-9" id="park">{{line.park}}</span>
149   - </div>
  140 +<!-- <div class="col-sm-6">-->
  141 +<!-- <label class="col-sm-3 control-label">停车场：</label>-->
  142 +<!-- <span class="col-sm-9" id="park">{{line.park}}</span>-->
  143 +<!-- </div>-->
150 144 <div class="col-sm-6">
151 145 <label class="col-sm-3 control-label">是否权证：</label>
152 146 <span class="col-sm-9" id="isWarran">{{line.isWarran}}</span>
... ... @@ -164,7 +158,7 @@
164 158 <span class="col-sm-9" id="firstStation">{{line.firstStation}}</span>
165 159 </div>
166 160 <div class="col-sm-6">
167   - <label class="col-sm-3 control-label">首站时间：</label>
  161 + <label class="col-sm-3 control-label">起点站首末班：</label>
168 162 <span class="col-sm-9"id="firstTime">{{line.firstTime}}</span>
169 163 </div>
170 164 <div class="col-sm-6">
... ... @@ -172,7 +166,7 @@
172 166 <span class="col-sm-9"id="lastStation">{{line.lastStation}}</span>
173 167 </div>
174 168 <div class="col-sm-6">
175   - <label class="col-sm-3 control-label">末站首站时间：</label>
  169 + <label class="col-sm-3 control-label">终点站首末班：</label>
176 170 <span class="col-sm-9"id="lastTime">{{line.lastTime}}</span>
177 171 </div>
178 172 <div class="col-sm-6">
... ... @@ -184,10 +178,6 @@
184 178 <span class="col-sm-9"id="mileageDown">{{line.mileageDown}}</span>
185 179 </div>
186 180 <div class="col-sm-6">
187   - <label class="col-sm-3 control-label">平均里程数：</label>
188   - <span class="col-sm-9"id="averageMileage">{{line.averageMileage}}</span>
189   - </div>
190   - <div class="col-sm-6">
191 181 <label class="col-sm-3 control-label">站级数(上行)：</label>
192 182 <span class="col-sm-9"id="stationUp">{{line.stationUp}}</span>
193 183 </div>
... ... @@ -236,7 +226,7 @@
236 226 <span class="col-sm-9"id="carPlate">{{line.carPlate}}</span>
237 227 </div>
238 228 <div class="col-sm-6">
239   - <label class="col-sm-3 control-label">线路总配人数：</label>
  229 + <label class="col-sm-3 control-label">线路配档数：</label>
240 230 <span class="col-sm-9"id="numberPerson">{{line.numberPerson}}</span>
241 231 </div>
242 232 <div class="col-sm-6">
... ... @@ -258,24 +248,12 @@
258 248 </span>
259 249 </div>
260 250 <div class="col-sm-6">
261   - <label class="col-sm-3 control-label">经营权证数：</label>
262   - <span class="col-sm-9"id="numberOfManage">{{line.numberOfManage}}</span>
263   - </div>
264   - <div class="col-sm-6">
265 251 <label class="col-sm-3 control-label">站点名称：</label>
266 252 <span class="col-sm-9" id="halfwayStation">
267 253 <textarea name="halfwayStation" class="form-control" readonly>{{line.halfwayStation}}</textarea>
268 254 </span>
269 255 </div>
270 256 <div class="col-sm-6">
271   - <label class="col-sm-3 control-label">高峰系数：</label>
272   - <span class="col-sm-9" id="fullCustomerPercent">{{line.fullCustomerPercent}}</span>
273   - </div>
274   - <div class="col-sm-6">
275   - <label class="col-sm-3 control-label">低谷系数：</label>
276   - <span class="col-sm-9" id="lowCustomerPercent">{{line.lowCustomerPercent}}</span>
277   - </div>
278   - <div class="col-sm-6">
279 257 <label class="col-sm-3 control-label">间隔等级：</label>
280 258 <span class="col-sm-9"id="divideLevel">{{line.divideLevel}}</span>
281 259 </div>
... ... @@ -394,13 +372,13 @@
394 372 <span class="col-sm-9">
395 373 {{oldLine.lineDistance}}
396 374 </span>
397   - </div>
  375 + <!-- </div>
398 376 <div class="col-sm-6">
399 377 <label class="col-sm-3 control-label">线路编码：</label>
400 378 <span class="col-sm-9">
401 379 {{oldLine.lineCode}}
402 380 </span>
403   - </div>
  381 + </div>-->
404 382 <div class="col-sm-6">
405 383 <label class="col-sm-3 control-label">授权年限：</label>
406 384 <span class="col-sm-9">
... ... @@ -420,7 +398,7 @@
420 398 </span>
421 399 </div>
422 400 <div class="col-sm-6">
423   - <label class="col-sm-3 control-label">撤销日期：</label>
  401 + <label class="col-sm-3 control-label">线路暂停日期：</label>
424 402 <span class="col-sm-9">
425 403 {{oldLine.planCancelTime}}
426 404 </span>
... ... @@ -430,13 +408,7 @@
430 408 <span class="col-sm-9">
431 409 {{oldLine.cancelTime}}
432 410 </span>
433   - </div>
434   - <div class="col-sm-6">
435   - <label class="col-sm-3 control-label">撤销原因：</label>
436   - <span class="col-sm-9">
437   - <textarea name="cancelReason" class="form-control" readonly>{{oldLine.cancelReason}}</textarea>
438   - </span>
439   - </div>
  411 + </div>
440 412 <div class="col-sm-6">
441 413 <label class="col-sm-3 control-label">备注：</label>
442 414 <span class="col-sm-9">
... ... @@ -444,17 +416,17 @@
444 416 </span>
445 417 </div>
446 418 <div class="col-sm-6">
447   - <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
  419 + <label class="col-sm-3 control-label">实施时间：</label>
448 420 <span class="col-sm-9">
449 421 {{oldLine.timeSchedule}}
450 422 </span>
451   - </div>
  423 + <!--</div>
452 424 <div class="col-sm-6">
453 425 <label class="col-sm-3 control-label">停车场：</label>
454 426 <span class="col-sm-9">
455 427 {{oldLine.park}}
456 428 </span>
457   - </div>
  429 + </div>-->
458 430 <div class="col-sm-6">
459 431 <label class="col-sm-3 control-label">是否权证：</label>
460 432 <span class="col-sm-9">
... ... @@ -480,7 +452,7 @@
480 452 </span>
481 453 </div>
482 454 <div class="col-sm-6">
483   - <label class="col-sm-3 control-label">首站时间：</label>
  455 + <label class="col-sm-3 control-label">起点站首末班：</label>
484 456 <span class="col-sm-9">
485 457 {{oldLine.firstTime}}
486 458 </span>
... ... @@ -492,7 +464,7 @@
492 464 </span>
493 465 </div>
494 466 <div class="col-sm-6">
495   - <label class="col-sm-3 control-label">末站首站时间：</label>
  467 + <label class="col-sm-3 control-label">终点站首末班：</label>
496 468 <span class="col-sm-9">
497 469 {{oldLine.lastTime}}
498 470 </span>
... ... @@ -508,13 +480,6 @@
508 480 <span class="col-sm-9">
509 481 {{oldLine.mileageDown}}
510 482 </span>
511   - </div>
512   - <div class="col-sm-6">
513   - <label class="col-sm-3 control-label">平均里程数：</label>
514   - <span class="col-sm-9">
515   - {{oldLine.averageMileage}}
516   - </span>
517   - </div>
518 483 <div class="col-sm-6">
519 484 <label class="col-sm-3 control-label">站级数(上行)：</label>
520 485 <span class="col-sm-9">
... ... @@ -588,7 +553,7 @@
588 553 </span>
589 554 </div>
590 555 <div class="col-sm-6">
591   - <label class="col-sm-3 control-label">线路总配人数：</label>
  556 + <label class="col-sm-3 control-label">线路配档数：</label>
592 557 <span class="col-sm-9">
593 558 {{oldLine.numberPerson}}
594 559 </span>
... ... @@ -618,30 +583,12 @@
618 583 </span>
619 584 </div>
620 585 <div class="col-sm-6">
621   - <label class="col-sm-3 control-label">经营权证数：</label>
622   - <span class="col-sm-9">
623   - {{oldLine.numberOfManage}}
624   - </span>
625   - </div>
626   - <div class="col-sm-6">
627 586 <label class="col-sm-3 control-label">站点名称：</label>
628 587 <span class="col-sm-9">
629 588 <textarea name="halfwayStation" class="form-control" readonly>{{oldLine.halfwayStation}}</textarea>
630 589 </span>
631 590 </div>
632 591 <div class="col-sm-6">
633   - <label class="col-sm-3 control-label">高峰系数：</label>
634   - <span class="col-sm-9">
635   - {{oldLine.fullCustomerPercent}}
636   - </span>
637   - </div>
638   - <div class="col-sm-6">
639   - <label class="col-sm-3 control-label">低谷系数：</label>
640   - <span class="col-sm-9">
641   - {{oldLine.lowCustomerPercent}}
642   - </span>
643   - </div>
644   - <div class="col-sm-6">
645 592 <label class="col-sm-3 control-label">间隔等级：</label>
646 593 <span class="col-sm-9">
647 594 {{oldLine.divideLevel}}
... ... @@ -758,7 +705,7 @@
758 705 continue;
759 706 }
760 707  
761   - if (field == "isLogicDelete" || field == "inoutDistrict" || field == "isMetro" || field == "hasTimelists" || field == "isWarran") {
  708 + if (field == "inoutDistrict" || field == "isMetro" || field == "hasTimelists" || field == "isWarran") {
762 709 for (var j in dicts["trueFalse"]) {
763 710 if (dicts["trueFalse"][j].dictValue == value) {
764 711 value = dicts["trueFalse"][j].dictLabel;
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/line.html
  View file @df14b31
... ... @@ -191,7 +191,7 @@
191 191 formatter: function(value, row, index) {
192 192  
193 193  
194   - if(this.field == "roadType" || this.field == "busType"){
  194 + if(this.field == "district" ||this.field == "roadType" || this.field == "busType"){
195 195 if(value != null){
196 196  
197 197 var arr = value.split(",");
... ... @@ -210,7 +210,7 @@
210 210 }
211 211 }
212 212  
213   - if(this.field == "isLogicDelete" || this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists"){
  213 + if(this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists"){
214 214 for(var j in dicts["trueFalse"]){
215 215 if(dicts["trueFalse"][j].dictValue == value){
216 216 value = dicts["trueFalse"][j].dictLabel;
... ...