Commit dcc48b869bcb2ede29b181896c7aa420f33fa43a
1 parent
1ae1723d
bf
Showing
13 changed files
with
52 additions
and
27 deletions
bsthLineProfiles/pom.xml
| ... | ... | @@ -4,9 +4,9 @@ |
| 4 | 4 | <modelVersion>4.0.0</modelVersion> |
| 5 | 5 | |
| 6 | 6 | <groupId>com.ruoyi</groupId> |
| 7 | - <artifactId>ruoyi</artifactId> | |
| 7 | + <artifactId>bsthLineProfiles</artifactId> | |
| 8 | 8 | <version>4.6.0</version> |
| 9 | - <packaging>war</packaging> | |
| 9 | + <packaging>jar</packaging> | |
| 10 | 10 | |
| 11 | 11 | <name>ruoyi</name> |
| 12 | 12 | <url>http://www.ruoyi.vip</url> | ... | ... |
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
| ... | ... | @@ -307,7 +307,7 @@ public class BsthTLineController extends BaseController |
| 307 | 307 | bsthTLineKFK.setOperationType("insert"); |
| 308 | 308 | bsthTLineKFKS.add(bsthTLineKFK); |
| 309 | 309 | } |
| 310 | - bsthTLineService.changeCN(bsthTLineKFKS); | |
| 310 | + //bsthTLineService.changeCN(bsthTLineKFKS); | |
| 311 | 311 | return bsthTLineKFKS; |
| 312 | 312 | } |
| 313 | 313 | ... | ... |
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
| ... | ... | @@ -120,9 +120,9 @@ public class BsthTLine extends BaseEntity |
| 120 | 120 | @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") |
| 121 | 121 | private Date updateTime; |
| 122 | 122 | |
| 123 | - /** 实施时间 */ | |
| 123 | + /** 行车作业计划报备时间 */ | |
| 124 | 124 | @JsonFormat(pattern = "yyyy-MM-dd") |
| 125 | - @Excel(name = "实施时间", width = 30, dateFormat = "yyyy-MM-dd") | |
| 125 | + @Excel(name = "行车作业计划报备时间", width = 30, dateFormat = "yyyy-MM-dd") | |
| 126 | 126 | private Date timeSchedule; |
| 127 | 127 | |
| 128 | 128 | /** 停车场 */ | ... | ... |
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLineKFK.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
| ... | ... | @@ -150,10 +150,10 @@ public class LineHistoryReport extends BaseEntity |
| 150 | 150 | private String remarkOld; |
| 151 | 151 | |
| 152 | 152 | @JsonFormat(pattern = "yyyy-MM-dd") |
| 153 | - @Excel(name = "实施时间", width = 30, dateFormat = "yyyy-MM-dd") | |
| 153 | + @Excel(name = "行车作业计划报备时间", width = 30, dateFormat = "yyyy-MM-dd") | |
| 154 | 154 | private Date timeSchedule; |
| 155 | 155 | @JsonFormat(pattern = "yyyy-MM-dd") |
| 156 | - @Excel(name = "原实施时间", width = 30, dateFormat = "yyyy-MM-dd") | |
| 156 | + @Excel(name = "原行车作业计划报备时间", width = 30, dateFormat = "yyyy-MM-dd") | |
| 157 | 157 | private Date timeScheduleOld; |
| 158 | 158 | |
| 159 | 159 | /*@Excel(name = "停车场") | ... | ... |
bsthLineProfiles/src/main/resources/logback.xml
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 | <!-- 循环政策：基于时间创建日志文件 --> |
| 42 | 42 | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> |
| 43 | 43 | <!-- 日志文件名格式 --> |
| 44 | - <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern> | |
| 44 | + <fileNamePattern>${log.path}/sys-debug.%d{yyyy-MM-dd}.log</fileNamePattern> | |
| 45 | 45 | <!-- 日志最大的历史 60天 --> |
| 46 | 46 | <maxHistory>60</maxHistory> |
| 47 | 47 | </rollingPolicy> | ... | ... |
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
| ... | ... | @@ -194,7 +194,7 @@ |
| 194 | 194 | </li> |
| 195 | 195 | <!----------------------------------> |
| 196 | 196 | <li id="timeSchedule"> |
| 197 | - <label>实施时间：</label> | |
| 197 | + <label>行车作业计划报备时间：</label> | |
| 198 | 198 | <input name="timeSchedule" th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}" |
| 199 | 199 | placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled> |
| 200 | 200 | </li> |
| ... | ... | @@ -333,7 +333,12 @@ |
| 333 | 333 | <!----------------------------------> |
| 334 | 334 | <li id="coldBonusType"> |
| 335 | 335 | <label>冷僻线路补贴类型：</label> |
| 336 | - <input name="coldBonusType" th:field="*{coldBonusType}" type="text" disabled> | |
| 336 | + <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" disabled> | |
| 337 | + <option value=""></option> | |
| 338 | + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" | |
| 339 | + th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option> | |
| 340 | + </option>></option> | |
| 341 | + </select> | |
| 337 | 342 | </li> |
| 338 | 343 | <!----------------------------------> |
| 339 | 344 | <li id="revenueType"> |
| ... | ... | @@ -342,7 +347,7 @@ |
| 342 | 347 | <option value=""></option> |
| 343 | 348 | <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" |
| 344 | 349 | th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option> |
| 345 | - ></option>></option> | |
| 350 | + </option>></option> | |
| 346 | 351 | </select> |
| 347 | 352 | </li> |
| 348 | 353 | <!----------------------------------> | ... | ... |
bsthLineProfiles/src/main/resources/templates/system/line/line.html
| ... | ... | @@ -112,7 +112,7 @@ |
| 112 | 112 | <!----------------------------------> |
| 113 | 113 | <li><label>更新时间：</label> <input type="text" class="time-input" placeholder="请选择更新时间" name="updateTime" /></li> |
| 114 | 114 | <!----------------------------------> |
| 115 | - <li><label>实施时间：</label> <input type="text" class="time-input" placeholder="请选择实施时间" name="timeSchedule" /></li> | |
| 115 | + <li><label>行车作业计划报备时间：</label> <input type="text" class="time-input" placeholder="请选择行车作业计划报备时间" name="timeSchedule" /></li> | |
| 116 | 116 | <!----------------------------------> |
| 117 | 117 | <li><label>是否权证：</label> |
| 118 | 118 | <select name="isWarrant" th:with="type=${@dict.getType('trueFalse')}"> |
| ... | ... | @@ -187,7 +187,12 @@ |
| 187 | 187 | <!----------------------------------> |
| 188 | 188 | <li><label>轨交时间：</label> <input type="text" class="time-input" placeholder="请选择轨交时间" name="metroTime" /></li> |
| 189 | 189 | <!----------------------------------> |
| 190 | - <li><label>冷僻补贴：</label> <input type="text" name="coldBonusType" /></li> | |
| 190 | + <li><label>冷僻补贴：</label> | |
| 191 | + <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}"> | |
| 192 | + <option value=""></option> | |
| 193 | + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> | |
| 194 | + </select> | |
| 195 | + </li> | |
| 191 | 196 | <!----------------------------------> |
| 192 | 197 | <li><label>日期截点：</label> <input type="text" class="time-input" placeholder="日期截点" name="createTimeEnd" id="createTimeEnd"/></li> |
| 193 | 198 | <!----------------------------------> |
| ... | ... | @@ -641,7 +646,7 @@ |
| 641 | 646 | }, |
| 642 | 647 | { |
| 643 | 648 | field: 'timeSchedule', |
| 644 | - title: '实施时间' | |
| 649 | + title: '行车作业计划报备时间' | |
| 645 | 650 | },{ |
| 646 | 651 | field: 'travelTimeUp', |
| 647 | 652 | title: '行驶时间(上行)' | ... | ... |
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
| ... | ... | @@ -236,7 +236,7 @@ |
| 236 | 236 | <input name="warrantYear" class="form-control" type="text"> |
| 237 | 237 | </div> |
| 238 | 238 | <!----------------------------------> |
| 239 | - <label class="col-sm-1 control-label">实施时间：</label> | |
| 239 | + <label class="col-sm-1 control-label">行车作业计划报备时间：</label> | |
| 240 | 240 | <div class="col-sm-2"> |
| 241 | 241 | <div class="input-group date"> |
| 242 | 242 | <input name="timeSchedule" class="form-control" placeholder="yyyy-MM-dd" type="text" |
| ... | ... | @@ -276,7 +276,12 @@ |
| 276 | 276 | <!----------------------------------> |
| 277 | 277 | <label class="col-sm-1 control-label">冷僻线路补贴类型：</label> |
| 278 | 278 | <div class="col-sm-2"> |
| 279 | - <input name="coldBonusType" class="form-control" type="text"> | |
| 279 | + <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" | |
| 280 | + class="form-control m-b"> | |
| 281 | + <option value=""></option> | |
| 282 | + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"> | |
| 283 | + </option> | |
| 284 | + </select> | |
| 280 | 285 | </div> |
| 281 | 286 | <!----------------------------------> |
| 282 | 287 | <label class="col-sm-1 control-label">营运状态：</label> | ... | ... |
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
| ... | ... | @@ -236,7 +236,7 @@ |
| 236 | 236 | </div> |
| 237 | 237 | </div> |
| 238 | 238 | <!----------------------------------> |
| 239 | - <label class="col-sm-1 control-label">实施时间：</label> | |
| 239 | + <label class="col-sm-1 control-label">行车作业计划报备时间：</label> | |
| 240 | 240 | <div class="col-sm-2"> |
| 241 | 241 | <div class="input-group date"> |
| 242 | 242 | <input name="timeSchedule" |
| ... | ... | @@ -407,7 +407,11 @@ |
| 407 | 407 | <!----------------------------------> |
| 408 | 408 | <label class="col-sm-1 control-label">冷僻线路补贴类型：</label> |
| 409 | 409 | <div class="col-sm-2"> |
| 410 | - <input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text"> | |
| 410 | + <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b"> | |
| 411 | + <option value=""></option> | |
| 412 | + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" | |
| 413 | + th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option>></option>></option> | |
| 414 | + </select> | |
| 411 | 415 | </div> |
| 412 | 416 | <!----------------------------------> |
| 413 | 417 | <label class="col-sm-1 control-label">营收类型：</label> | ... | ... |
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
| ... | ... | @@ -243,7 +243,7 @@ |
| 243 | 243 | <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text"> |
| 244 | 244 | </div> |
| 245 | 245 | <!----------------------------------> |
| 246 | - <label class="col-sm-1 control-label"name="timeSchedule">实施时间：</label> | |
| 246 | + <label class="col-sm-1 control-label"name="timeSchedule">行车作业计划报备时间：</label> | |
| 247 | 247 | <div class="col-sm-2"> |
| 248 | 248 | <div class="input-group date"> |
| 249 | 249 | <input name="timeSchedule" |
| ... | ... | @@ -285,9 +285,11 @@ |
| 285 | 285 | </div> |
| 286 | 286 | <!----------------------------------> |
| 287 | 287 | <label class="col-sm-1 control-label"name="coldBonusType">冷僻线路补贴类型：</label> |
| 288 | - <div class="col-sm-2"> | |
| 289 | - <input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text"> | |
| 290 | - </div> | |
| 288 | + <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b"> | |
| 289 | + <option value=""></option> | |
| 290 | + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" | |
| 291 | + th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option> | |
| 292 | + </select> | |
| 291 | 293 | <!----------------------------------> |
| 292 | 294 | <label class="col-sm-1 control-label"name="serviceState">营运状态：</label> |
| 293 | 295 | <div class="col-sm-2"> | ... | ... |
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
| ... | ... | @@ -238,7 +238,7 @@ |
| 238 | 238 | <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text"> |
| 239 | 239 | </div> |
| 240 | 240 | <!----------------------------------> |
| 241 | - <label class="col-sm-1 control-label" name="timeSchedule">实施时间：</label> | |
| 241 | + <label class="col-sm-1 control-label" name="timeSchedule">行车作业计划报备时间：</label> | |
| 242 | 242 | <div class="col-sm-2"> |
| 243 | 243 | <div class="input-group date"> |
| 244 | 244 | <input name="timeSchedule" |
| ... | ... | @@ -282,7 +282,11 @@ |
| 282 | 282 | <!----------------------------------> |
| 283 | 283 | <label class="col-sm-1 control-label" name="coldBonusType">冷僻线路补贴类型：</label> |
| 284 | 284 | <div class="col-sm-2"> |
| 285 | - <input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text"> | |
| 285 | + <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b"> | |
| 286 | + <option value=""></option> | |
| 287 | + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" | |
| 288 | + th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option> | |
| 289 | + </select> | |
| 286 | 290 | </div> |
| 287 | 291 | <!----------------------------------> |
| 288 | 292 | <label class="col-sm-1 control-label" name="serviceState">营运状态：</label> | ... | ... |
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
| ... | ... | @@ -192,7 +192,7 @@ |
| 192 | 192 | </div> |
| 193 | 193 | <!----------------------------------> |
| 194 | 194 | <div class="col-sm-6"> |
| 195 | - <label class="col-sm-3 control-label">实施时间：</label> | |
| 195 | + <label class="col-sm-3 control-label">行车作业计划报备时间：</label> | |
| 196 | 196 | <span class="col-sm-9" id="timeSchedule">{{line.timeSchedule}}</span> |
| 197 | 197 | </div> |
| 198 | 198 | <!----------------------------------> |
| ... | ... | @@ -465,7 +465,7 @@ |
| 465 | 465 | </div> |
| 466 | 466 | <!----------------------------------> |
| 467 | 467 | <div class="col-sm-6"> |
| 468 | - <label class="col-sm-3 control-label">实施时间：</label> | |
| 468 | + <label class="col-sm-3 control-label">行车作业计划报备时间：</label> | |
| 469 | 469 | <span class="col-sm-9" >{{oldLine.timeSchedule}}</span> |
| 470 | 470 | </div> |
| 471 | 471 | <!----------------------------------> | ... | ... |