Merge branch 'dev-szl' of http://gitlab.suntrayoa.com/ztgk/hzsomms into dev

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/MovementRecordsMasterController.java

@@ -21,7 +21,9 @@ import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementCourseInf
 import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementCourseService;
 import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementRecordsMasterService;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.*;
+import org.jeecg.modules.subwayNetwork.entity.LineAlias;
 import org.jeecg.modules.subwayNetwork.entity.SubwaySection;
+import org.jeecg.modules.subwayNetwork.service.ILineAliasService;
 import org.jeecg.modules.subwayNetwork.service.ISubwaySectionService;
 import org.jeecg.modules.utils.BeanCopyUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +58,8 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
     private IMovementCourseInfoService movementCourseInfoService;
     @Autowired
     private ISubwaySectionService subwaySectionService;
+    @Autowired
+    private ILineAliasService lineAliasService;
 
     /**
      * 动静态几何尺寸数据-分页列表查询
@@ -175,7 +179,15 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
             if (bean.getSectionEndMileage() != null) {
                 result.setEndMileage(bean.getSectionEndMileage());
             }
+            if(ObjectUtil.isNotEmpty(bean.getSectionName())){
+                result.setSubwaySectionName(bean.getSectionName());
+            }
+            if(ObjectUtil.isNotEmpty(bean.getLightRailName())){
+                result.setLightRailName(bean.getLightRailName());
+            }
         }
+        //查询区间起始终点里程
+        result.setLineAliasName(lineAliasService.getById(lineAliasId).getLineAliasName());
         //TODO 后期改造完补充逻辑
         result.setRailNum(25);
         result.setCurveNum(30);