bf

yiming
1 parent 1ae1723d
Showing 13 changed files with 52 additions and 27 deletions
bsthLineProfiles/pom.xml
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLineKFK.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
bsthLineProfiles/src/main/resources/logback.xml
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
bsthLineProfiles/src/main/resources/templates/system/line/line.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
@@ -4,9 +4,9 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ruoyi</groupId>
-    <artifactId>ruoyi</artifactId>
+    <artifactId>bsthLineProfiles</artifactId>
     <version>4.6.0</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
@@ -307,7 +307,7 @@ public class BsthTLineController extends BaseController
             bsthTLineKFK.setOperationType("insert");
             bsthTLineKFKS.add(bsthTLineKFK);
         }
-        bsthTLineService.changeCN(bsthTLineKFKS);
+        //bsthTLineService.changeCN(bsthTLineKFKS);
         return bsthTLineKFKS;
     }
@@ -120,9 +120,9 @@ public class BsthTLine extends BaseEntity
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updateTime;
-    /** 实施时间 */
+    /** 行车作业计划报备时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "实施时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "行车作业计划报备时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date timeSchedule;
     /** 停车场 */
@@ -110,7 +110,7 @@ public class BsthTLineKFK
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date cancelTime;
-    /** 实施时间 */
+    /** 行车作业计划报备时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date timeSchedule;
@@ -150,10 +150,10 @@ public class LineHistoryReport extends BaseEntity
 	private String remarkOld;
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	@Excel(name = "实施时间", width = 30, dateFormat = "yyyy-MM-dd")
+	@Excel(name = "行车作业计划报备时间", width = 30, dateFormat = "yyyy-MM-dd")
 	private Date timeSchedule;
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	@Excel(name = "原实施时间", width = 30, dateFormat = "yyyy-MM-dd")
+	@Excel(name = "原行车作业计划报备时间", width = 30, dateFormat = "yyyy-MM-dd")
 	private Date timeScheduleOld;
 	/*@Excel(name = "停车场")
@@ -41,7 +41,7 @@
         <!-- 循环政策：基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/sys-debug.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
             <maxHistory>60</maxHistory>
         </rollingPolicy>
@@ -194,7 +194,7 @@
                 </li>
                 <!---------------------------------->
                 <li id="timeSchedule">
-                    <label>实施时间：</label>
+                    <label>行车作业计划报备时间：</label>
                     <input name="timeSchedule" th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
                            placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
                 </li>
@@ -333,7 +333,12 @@
                 <!---------------------------------->
                 <li id="coldBonusType">
                     <label>冷僻线路补贴类型：</label>
-                    <input name="coldBonusType" th:field="*{coldBonusType}" type="text" disabled>
+                    <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" disabled>
+                        <option value=""></option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option>
+                        </option>></option>
+                    </select>
                 </li>
                 <!---------------------------------->
                 <li id="revenueType">
@@ -342,7 +347,7 @@
                         <option value=""></option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
                                 th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>
-                        ></option>></option>
+                        </option>></option>
                     </select>
                 </li>
                 <!---------------------------------->
@@ -112,7 +112,7 @@
 						<!---------------------------------->
 						<li><label>更新时间：</label> <input type="text" class="time-input" placeholder="请选择更新时间" name="updateTime" /></li>
 						<!---------------------------------->
-						<li><label>实施时间：</label> <input type="text" class="time-input" placeholder="请选择实施时间" name="timeSchedule" /></li>
+						<li><label>行车作业计划报备时间：</label> <input type="text" class="time-input" placeholder="请选择行车作业计划报备时间" name="timeSchedule" /></li>
 						<!---------------------------------->
 						<li><label>是否权证：</label>
 							<select name="isWarrant" th:with="type=${@dict.getType('trueFalse')}">
@@ -187,7 +187,12 @@
 						<!---------------------------------->
 						<li><label>轨交时间：</label> <input type="text" class="time-input" placeholder="请选择轨交时间" name="metroTime" /></li>
 						<!---------------------------------->
-						<li><label>冷僻补贴：</label> <input type="text" name="coldBonusType" /></li>
+						<li><label>冷僻补贴：</label>
+							<select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}">
+								<option value=""></option>
+								<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+							</select>
+						</li>
 						<!---------------------------------->
 						<li><label>日期截点：</label> <input type="text" class="time-input" placeholder="日期截点" name="createTimeEnd" id="createTimeEnd"/></li>
 						<!---------------------------------->
@@ -641,7 +646,7 @@
 			},
 			{
 				field: 'timeSchedule',
-				title: '实施时间'
+				title: '行车作业计划报备时间'
 			},{
 				field: 'travelTimeUp',
 				title: '行驶时间(上行)'
@@ -236,7 +236,7 @@
                     <input name="warrantYear" class="form-control" type="text">
                 </div>
                 <!---------------------------------->
-                <label class="col-sm-1 control-label">实施时间：</label>
+                <label class="col-sm-1 control-label">行车作业计划报备时间：</label>
                 <div class="col-sm-2">
                     <div class="input-group date">
                         <input name="timeSchedule" class="form-control" placeholder="yyyy-MM-dd" type="text"
@@ -276,7 +276,12 @@
                 <!---------------------------------->
                 <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
                 <div class="col-sm-2">
-                    <input name="coldBonusType" class="form-control" type="text">
+                    <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}"
+                            class="form-control m-b">
+                        <option value=""></option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
+                        </option>
+                    </select>
                 </div>
                 <!---------------------------------->
                 <label class="col-sm-1 control-label">营运状态：</label>
@@ -236,7 +236,7 @@
 					</div>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">实施时间：</label>
+				<label class="col-sm-1 control-label">行车作业计划报备时间：</label>
 				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="timeSchedule"
@@ -407,7 +407,11 @@
 				<!---------------------------------->
 				<label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
 				<div class="col-sm-2">
-					<input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text">
+					<select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option>></option>></option>
+					</select>
 				</div>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label">营收类型：</label>
@@ -243,7 +243,7 @@
 					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label"name="timeSchedule">实施时间：</label>
+				<label class="col-sm-1 control-label"name="timeSchedule">行车作业计划报备时间：</label>
 				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="timeSchedule"
@@ -285,9 +285,11 @@
 				</div>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label"name="coldBonusType">冷僻线路补贴类型：</label>
-				<div class="col-sm-2">
-					<input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text">
-				</div>
+				<select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
+					<option value=""></option>
+					<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+							th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option>
+				</select>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label"name="serviceState">营运状态：</label>
 				<div class="col-sm-2">
@@ -238,7 +238,7 @@
                 <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
             </div>
             <!---------------------------------->
-            <label class="col-sm-1 control-label" name="timeSchedule">实施时间：</label>
+            <label class="col-sm-1 control-label" name="timeSchedule">行车作业计划报备时间：</label>
             <div class="col-sm-2">
                 <div class="input-group date">
                     <input name="timeSchedule"
@@ -282,7 +282,11 @@
             <!---------------------------------->
             <label class="col-sm-1 control-label" name="coldBonusType">冷僻线路补贴类型：</label>
             <div class="col-sm-2">
-                <input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text">
+                <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
+                    <option value=""></option>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                            th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option>
+                </select>
             </div>
             <!---------------------------------->
             <label class="col-sm-1 control-label" name="serviceState">营运状态：</label>
@@ -192,7 +192,7 @@
                     </div>
                     <!---------------------------------->
                     <div class="col-sm-6">
-                        <label class="col-sm-3 control-label">实施时间：</label>
+                        <label class="col-sm-3 control-label">行车作业计划报备时间：</label>
                         <span class="col-sm-9" id="timeSchedule">{{line.timeSchedule}}</span>
                     </div>
                     <!---------------------------------->
@@ -465,7 +465,7 @@
                     </div>
                     <!---------------------------------->
                     <div class="col-sm-6">
-                        <label class="col-sm-3 control-label">实施时间：</label>
+                        <label class="col-sm-3 control-label">行车作业计划报备时间：</label>
                         <span class="col-sm-9" >{{oldLine.timeSchedule}}</span>
                     </div>
                     <!---------------------------------->