Merge remote-tracking branch 'origin/dev' into dev

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

@@ -295,6 +295,8 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
             List<MovementCourseInfo> resultList = new ArrayList<>();
             //初始化里程排序
             int sort = 0;
+            //初始化测点
+            int measurePoint = 0;
             //初始化轨号排序
             int infoSort = 0;
             for (int i = 0; i < column; i++) {
@@ -398,6 +400,7 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
                 }
                 if (ObjectUtil.isNotEmpty(courseId)) {
                     infoSort ++;
+                    measurePoint ++;
                     MovementCourseInfo movementCourseInfo = new MovementCourseInfo();
                     movementCourseInfo.setId(IdWorker.get32UUID());
                     movementCourseInfo.setDelFlag("0");
@@ -408,6 +411,7 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
                     movementCourseInfo.setCreateBy(realname);
                     movementCourseInfo.setUpdateBy(realname);
                     movementCourseInfo.setInfoSort(infoSort);
+                    movementCourseInfo.setMeasurePoint(measurePoint);
                     //获取轨号
                     List<Object> trackCodeList = rowRecords.get(6);
                     String trackCode = trackCodeList.get(i).toString().trim();
@@ -469,6 +473,9 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
                         movementCourseInfo.setRectification(rectification);
                     }
                     resultList.add(movementCourseInfo);
+                    if(measurePoint % 8 == 0){
+                        measurePoint = 0;
+                    }
                 }
                 if ((skipColumnNum+2) % 28 == 0) {
                     i = i+4;