线路增加起止里程

business-service/src/main/java/com/ozs/entity/BaseRailwayManagement.java

@@ -45,7 +45,7 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
     /**
      * 线路类型(1普铁2高铁3重载铁路)
      */
-    @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普快,3=重载铁路")
+    @Excel(name = "线路类型", readConverterExp = "1=高铁,2=普快,3=重载铁路")
     private Integer railwayType;
 
     /**
@@ -55,7 +55,7 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
     private String railwayName;
 
     /**
-     *线路类型名称
+     * 线路类型名称
      */
     @TableField(exist = false)
     private String railwayTypeName;
@@ -75,4 +75,21 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
      * 终点站
      */
     private String endPoint;
+    /**
+     * 起始里程
+     */
+    @Excel(name = "起始里程")
+    private Integer initialMileage;
+    /**
+     * 结束里程
+     */
+    @Excel(name = "结束里程")
+    private Integer endMileage;
+
+    /**
+     * 里程范围
+     */
+    @TableField(exist = false)
+    private String milesRange;
+
 }

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -8,6 +8,7 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.enums.BusinessType;
+import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.IdempotenceUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
@@ -79,6 +80,15 @@ public class BaseRailwayManagementController extends BaseController {
                         o.setRailwayTypeName(datum.getDictLabel());
                     }
                 }
+                String end = "";
+                if (!StringUtils.isEmptySunhh(o.getInitialMileage())) {
+                    end = AppendUtils.stringAppend(o.getInitialMileage());
+                }
+                String begin = "";
+                if (!StringUtils.isEmptySunhh(o.getEndMileage())) {
+                    begin = AppendUtils.stringAppend(o.getEndMileage());
+                }
+                o.setMilesRange(begin + "-" + end);
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);
@@ -216,6 +226,15 @@ public class BaseRailwayManagementController extends BaseController {
                 baseRailwayManagement.setRailwayTypeName(datum.getDictLabel());
             }
         }
+        String end = "";
+        if (!StringUtils.isEmptySunhh(baseRailwayManagement.getInitialMileage())) {
+            end = AppendUtils.stringAppend(baseRailwayManagement.getInitialMileage());
+        }
+        String begin = "";
+        if (!StringUtils.isEmptySunhh(baseRailwayManagement.getEndMileage())) {
+            begin = AppendUtils.stringAppend(baseRailwayManagement.getEndMileage());
+        }
+        baseRailwayManagement.setMilesRange(begin + "-" + end);
         return AjaxResult.success(baseRailwayManagement);
     }