feat:1.人工检查数据导入bug

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/face/impl/MovementRecordsMasterFaceImpl.java

@@ -129,9 +129,6 @@ public class MovementRecordsMasterFaceImpl implements MovementRecordsMasterFace
             // 2.循环列数解析数据
             int column = currentRowHandler.rowRecords.get(0).size();
             int sort = 0;
-            int trackCodeCount = 1;
-            boolean startExist = false;
-            boolean endExist = false;
             for (int i = 0; i < column; i++) {
 
                 // 2.1 解析检查项目 获取 起止里程,曲线半径,超高,加宽,顺坡率,线路全长
@@ -233,16 +230,23 @@ public class MovementRecordsMasterFaceImpl implements MovementRecordsMasterFace
                     movementCourseList.add(movementCourse);
 
                     // 2.2.2  解析项目里面的明细
-                    // 2.2.2.1 单独获取轨号
-                    int trackCodeNum = 2;
-                    List<Object> trackCodeList = currentRowHandler.rowRecords.get(6);
-                    Object trackCode = trackCodeList.get(i + trackCodeNum);
+                    // 2.2.2.1 单独定义轨号
+                    Object trackCode = null;
 
-                    // 2.2.2.2 循环获取 轨距,水平,三角坑,方向,高低,结构,整改
+                    // 2.2.2.2 循环获取 轨号,轨距,水平,三角坑,方向,高低,结构,整改
                     int measurePoint = 1;
                     for (int j = 2; j < 26; j++) {
                         int position = i + j;
 
+                        // 获取轨号,
+                        if (j == 2 || j == 10 || j == 18) {
+                            List<Object> trackCodeList = currentRowHandler.rowRecords.get(6);
+                            trackCode = trackCodeList.get(position);
+                        }
+                        if (ObjectUtil.isEmpty(trackCode)) {
+                            throw JeecgBootException.error("【" + startMileage + "~" + endMileage + "】内请输入轨号");
+                        }
+
                         // 获取轨距
                         List<Object> trackGaugeList = currentRowHandler.rowRecords.get(7);
                         Object trackGauge = trackGaugeList.get(position);
@@ -292,16 +296,7 @@ public class MovementRecordsMasterFaceImpl implements MovementRecordsMasterFace
                         movementCourseInfoList.add(movementCourseInfo);
 
                         if (measurePoint % 8 == 0) {
-                            trackCodeCount++;
                             measurePoint = 1;
-                            trackCodeNum = trackCodeNum + 8;
-                            if (i + trackCodeNum < trackCodeList.size()) {
-                                trackCode = trackCodeList.get(i + trackCodeNum);
-                                // 如果轨号为空，则按照顺序赋值
-                                if (ObjectUtil.isEmpty(trackCode)) {
-                                    trackCode = Convert.toStr(trackCodeCount);
-                                }
-                            }
                         } else {
                             measurePoint++;
                         }

jeecg-module-system/src/main/java/org/jeecg/modules/homePage/face/impl/HomePageFaceImpl.java

@@ -49,7 +49,7 @@ public class HomePageFaceImpl implements HomePageFace {
         vo.setCheckBatchList(checkBatchList);
 
 
-        // 2.查询未派工的分析批次
+        // 2.查询未派工的分析批次&待派工分析结果列表数据中存在不需要派工的记录
         List<ToDoDetailVO> analysisBatchList = analysisBatchService.getTodoList(currentUserId);
         vo.setAnalysisBatchList(analysisBatchList);
 

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/controller/TrainStationController.java

@@ -91,19 +91,19 @@ public class TrainStationController extends JeecgController<TrainStation, ITrain
             // 判断区间是否重叠
             if (currentStartMileage.compareTo(startMileage) >= 0 && currentEndMileage.compareTo(endMileage) <= 0) {
                 throw JeecgBootException.error("你输入的站点里程范围【" + dto.getStartingMileage() + "~" + dto.getEndMileage() + "】;" +
-                        "冲突区间名称:" + record.getStationName() + ",里程范围【" + record.getStartingMileage() + "~" + record.getEndMileage() + "】");
+                        "冲突车站名称:" + record.getStationName() + ",里程范围【" + record.getStartingMileage() + "~" + record.getEndMileage() + "】");
             }
 
             // 判断开始里程是否是否冲突
             if (currentStartMileage.compareTo(startMileage) < 0 && currentEndMileage.compareTo(startMileage) > 0) {
                 throw JeecgBootException.error("你输入的站点里程范围【" + dto.getStartingMileage() + "~" + dto.getEndMileage() + "】;" +
-                        "冲突区间名称:" + record.getStationName() + ",里程范围【" + record.getStartingMileage() + "~" + record.getEndMileage() + "】");
+                        "冲突车站名称:" + record.getStationName() + ",里程范围【" + record.getStartingMileage() + "~" + record.getEndMileage() + "】");
             }
 
             // 判断结束里程是否是否冲突
             if (currentStartMileage.compareTo(endMileage) < 0 && currentEndMileage.compareTo(endMileage) > 0) {
                 throw JeecgBootException.error("你输入的站点里程范围【" + dto.getStartingMileage() + "~" + dto.getEndMileage() + "】;" +
-                        "冲突区间名称:" + record.getStationName() + ",里程范围【" + record.getStartingMileage() + "~" + record.getEndMileage() + "】");
+                        "冲突车站名称:" + record.getStationName() + ",里程范围【" + record.getStartingMileage() + "~" + record.getEndMileage() + "】");
             }
         }
 
@@ -165,7 +165,6 @@ public class TrainStationController extends JeecgController<TrainStation, ITrain
 
         if (totalNum - successNum > 0) {
             message = message + ",未删除" + failNum + "条。未删除" + failMessage + "车站下面有关联区间故不能被删除!";
-//            throw JeecgBootException.error(message.toString());
         }
 
         return Result.batchDelete(message);