调整成绩规则，默认排序

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RoadService.java

@@ -6,7 +6,6 @@ import com.dlbridge.jadp.plugins.cmpt.bean.RoadGpsPoint;
 import com.dlbridge.jadp.plugins.cmpt.dao.mapper.RoadMapper;
 import com.dlbridge.jadp.plugins.cmpt.utils.gps.GpxParserUtil;
 import com.dlbridge.jadp.plugins.cmpt.utils.gps.KmlParserUtil;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -50,8 +49,7 @@ public class RoadService {
             log.info("RoadService api接口 getName:" + road.getName() + " getRoadId：" + road.getRoadId() + " getFileName:" + road.getFileName() + " getFileUrl:" + road.getFileUrl());
         }
         List<Road> localRoads = roadMapper.queryRoads(cmptId);
-        for (Road road :
-                localRoads) {
+        for (Road road : localRoads) {
             log.info("RoadService 数据库接口 getName:" + road.getName() + " getRoadId：" + road.getRoadId() + " getFileName:" + road.getFileName() + " getFileUrl:" + road.getFileUrl());
         }
         for (Road road : roads) { // 更新 插入操作
@@ -73,11 +71,10 @@ public class RoadService {
             }
         }
 
-        for (Road road :
-                localRoads) {
+        for (Road road : localRoads) {
             log.info("RoadService 接口和api更新后数据 getName:" + road.getName() + " getRoadId：" + road.getRoadId() + " getFileName:" + road.getFileName() + " getFileUrl:" + road.getFileUrl());
         }
-        return localRoads;
+        return roadMapper.queryRoads(cmptId);
     }
 
     /**

src/main/webapp/WEB-INF/views/cmpt/scoreSetting.jsp

@@ -109,12 +109,12 @@
                     <input type="radio" name="rule" value="2" ${currentRuleType == 2 ? 'checked':''}>
                     <span style="font-size:20px;color: #333;margin-left: 75px;">允许记录多次成绩，取所有成绩中的最佳成绩作为最终成绩。</span>
                 </div>
-                <div class="setting-item">
-                    <input type="radio" name="rule" value="1" ${currentRuleType == 1 ? 'checked':''}>
-                    <span style="font-size:20px;color: #333;margin-left: 75px;">允许记录多次成绩，取所有成绩之和，即总跑量，作为最终成绩。</span>
-                </div>
-
-
+                <c:if test="${cmpt.cmptType != 7}">
+                    <div class="setting-item">
+                        <input type="radio" name="rule" value="1" ${currentRuleType == 1 ? 'checked':''}>
+                        <span style="font-size:20px;color: #333;margin-left: 75px;">允许记录多次成绩，取所有成绩之和，即总跑量，作为最终成绩。</span>
+                    </div>
+                </c:if>
             </div>
 
         </div>

src/main/webapp/WEB-INF/views/common/menu.jsp

 <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <style>
     .menu-txt {
         font-size: 18px;
@@ -217,12 +218,14 @@
                         <span class="menu-txt">相册设置</span>
                     </a>
                 </li>
+
                 <li class="rule menu-sub-item">
                     <a href="/gk/rule/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                         <span class="left-arrow"></span>
                         <span class="menu-txt">成绩规则</span>
                     </a>
                 </li>
+
                 <li class="review menu-sub-item">
                     <a href="/gk/review/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                         <span class="left-arrow"></span>

src/main/webapp/static/js/road-new.js

@@ -35,15 +35,17 @@ $(document).ready(function () {
         var obj = $(this);
         var param = [];
         var flag = true;
+        var timerCount = 0;
         $.each($('.markers-edit .marker'),function (i,e) {
             var obj = {};
             obj.checkpointId = $(e).attr('data-checkpointid');
             obj.distance = $(e).find('input[type=number]').val();
             obj.isTime = $(e).find('input[type=checkbox]').get(0).checked;
             obj.name = $(e).find('input[type=text]').val();
+            if(obj.isTime) timerCount++;
             if(obj.isTime  && !obj.distance && obj.distance <= 0){
                 flag = false;
-                layer.msg('请用计时点的里程，为必填项,请填入合法数据');
+                layer.msg('请用计时点的里程，为必填项,请填入合法数据',{icon:5});
                 console.log(obj)
                 return true;
             }
@@ -51,6 +53,10 @@ $(document).ready(function () {
             param.push(obj);
 
         })
+        if(timerCount < 3){
+            layer.msg('保存用于计时的打卡点不能少于三个！',{icon:5});
+            return ;
+        }
         if(flag){
             $.ajax({
                 url: '/gk/road/saveCheckPoint',