Skip to content

G
gk
Commit f7a072de authored by yangshuxing's avatar yangshuxing
Browse files
Options

自动提交代码

parent 9670bdd9
Show whitespace changes
Inline Side-by-side
Showing with 283 additions and 5 deletions
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptMapper.xml
View file @ f7a072de
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
</select> </select>
<select id="getGeeRunnerMobile" resultType="java.lang.String"> <select id="getGeeRunnerMobile" resultType="java.lang.String">
SELECT user_id from geerunner.sys_admin where id=#{id} limit 1 SELECT user_id from geerunner_test.sys_admin where id=#{id} limit 1
</select> </select>
<select id="getRaceEnrollUserId" resultType="java.lang.Integer"> <select id="getRaceEnrollUserId" resultType="java.lang.Integer">
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleMapper.xml
View file @ f7a072de
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
from gksite.gk_cmpt_score_rule rule from gksite.gk_cmpt_score_rule rule
inner join gksite.gk_cmpt_score_rule_map rulemap on rule.id = rulemap.rule_id inner join gksite.gk_cmpt_score_rule_map rulemap on rule.id = rulemap.rule_id
inner join geexekscore.cmpt_subsection_score score on rulemap.score_item_id = score.id inner join geexekscore.cmpt_subsection_score score on rulemap.score_item_id = score.id
inner join geerunner.cmpt_enroll enroll on rule.cmpt_id=enroll.cmpt_id and rulemap.mark_no=enroll.nick_id and enroll.del_flg=0 inner join geerunner_test.cmpt_enroll enroll on rule.cmpt_id=enroll.cmpt_id and rulemap.mark_no=enroll.nick_id and enroll.del_flg=0
where rule.cmpt_id=#{cmptId} and rule.id=#{ruleId} where rule.cmpt_id=#{cmptId} and rule.id=#{ruleId}
and enroll.cmpt_item=#{roadId} and enroll.cmpt_item=#{roadId}
</select> </select>
...@@ -109,11 +109,11 @@ ...@@ -109,11 +109,11 @@
enroll.nick_id user_markNo,rulemap.rule_id score_ruleId, enroll.nick_id user_markNo,rulemap.rule_id score_ruleId,
score.id score_scoreId,score.subsectionscore score_duration,score.subsectionTime score_date, score.id score_scoreId,score.subsectionscore score_duration,score.subsectionTime score_date,
fv.id score_field_fvid, fv.scoreFieldValue score_field_scoreFieldValue,fv.scoreFieldName score_field_scoreFieldName fv.id score_field_fvid, fv.scoreFieldValue score_field_scoreFieldValue,fv.scoreFieldName score_field_scoreFieldName
from geerunner.cmpt_enroll enroll from geerunner_test.cmpt_enroll enroll
left join gksite.gk_cmpt_score_rule rule on rule.cmpt_id=enroll.cmpt_id left join gksite.gk_cmpt_score_rule rule on rule.cmpt_id=enroll.cmpt_id
LEFT join gksite.gk_cmpt_score_rule_map rulemap on rule.id = rulemap.rule_id and enroll.nick_id=rulemap.mark_no LEFT join gksite.gk_cmpt_score_rule_map rulemap on rule.id = rulemap.rule_id and enroll.nick_id=rulemap.mark_no
left join geexekscore.cmpt_subsection_score score on rulemap.score_item_id = score.id left join geexekscore.cmpt_subsection_score score on rulemap.score_item_id = score.id
left join geerunner.cmpt_item item on item.item_id = enroll.cmpt_item left join geerunner_test.cmpt_item item on item.item_id = enroll.cmpt_item
left join gksite.gk_cmpt_score_field_value fv on fv.rule_id=rule.id and fv.markNo=enroll.nick_id left join gksite.gk_cmpt_score_field_value fv on fv.rule_id=rule.id and fv.markNo=enroll.nick_id
where enroll.cmpt_id=#{cmptId} where enroll.cmpt_id=#{cmptId}
and enroll.cmpt_item=#{roadId} and enroll.del_flg=0 and enroll.cmpt_item=#{roadId} and enroll.del_flg=0
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/AutoScoreController.java 0 → 100644
View file @ f7a072de
package com.dlbridge.jadp.plugins.cmpt.web;
import com.dlbridge.feign.ScoreService;
import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.common.interceptor.PageView;
import com.dlbridge.jadp.plugins.cmpt.bean.*;
import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
import com.dlbridge.jadp.plugins.cmpt.service.*;
import com.dlbridge.jadp.plugins.cmpt.utils.date.DateUtil;
import com.neusoft.www.utils.web.Result;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.ParseException;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
@Controller
@Log4j2
@RequestMapping("gk/autoscore")
@ApiIgnore
public class AutoScoreController {
@Resource
private CmptService cmptService;
@Resource
private CmptScoreFieldService cmptScoreFieldService;
@Resource
private CmptScoreFieldValueService cmptScoreFieldValueService;
@Resource
private CmptScoreRuleService ruleService;
@Resource
private ScoreService scoreService;
@Resource
RemoteService remoteService;
@RequestMapping("index/{cmptId}")
@PageView
public ModelAndView index(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
List<Road> roads = remoteService.getRoads(cmptId);
mv.setViewName("cmpt/autoscore");
mv.addObject("cmpt", cmpt);
mv.addObject("roads", roads);
return mv;
}
}
src/main/webapp/WEB-INF/views/cmpt/autoscore.jsp 0 → 100644
View file @ f7a072de
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<!doctype html>
<html>
<head>
<title>自助打卡</title>
<!-- Bootstrap CSS-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/vendor/bootstrap/css/bootstrap.min.css">
<!-- Font Awesome CSS-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/vendor/font-awesome/css/font-awesome.min.css">
<!-- Fontastic Custom icon font-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/fontastic.css">
<!-- Google fonts - Poppins -->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
<!-- theme stylesheet-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
<!-- Custom stylesheet - for your changes-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
<!-- Favicon-->
<link rel="shortcut icon" href="img/favicon.ico">
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
<link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
<link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
<link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
<link rel="stylesheet" href="${ctxStatic}/cmpt/road.css"/>
<link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css"/>
<script src="${ctxStatic}/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>
<link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css">
<link rel="stylesheet" href="/static/cmpt/score.css?<%=System.currentTimeMillis()%>">
<style>
.data{
width: 100%;
margin: 20px 0px;
background: #FFFFFF;
}
.road-name{
font-size: 20px;
color: #999999;
line-height: 65px;
padding: 0px 27px;
cursor: pointer;
height: 65px;
border-radius: 0px 4px 0px 0px;
border: 1px solid rgba(229,229,229,1);
}
.road-name.active{
color: #ce3939;
border-bottom: 1px solid white;
}
table{
width: 96%;
padding: 0px 2%;
}
table thead th{
padding-left: 26px;
}
table thead th td{
font-size: 12px;
color: #f3f3f3;
}
table tbody tr{
background:rgba(250,250,250,1);
border-radius:4px;
height:70px;
}
table tbody tr td{
padding-left: 26px;
}
.road{
display: flex;
border-bottom: 1px solid #f4f4f4;
}
.select-group{
position: relative;
width: 120px;
}
.select{
text-transform: none;
width: 120px;
height: 40px;
padding: 0px 5px;
border-radius: 4px;
background: rgba(250,250,250,1);
border: none;
outline: none;
appearance:none;
-moz-appearance:none;
-webkit-appearance:none;
cursor: pointer;
}
</style>
</head>
<body>
<jsp:include page="../common/header.jsp"></jsp:include>
<div class="page-content d-flex align-items-stretch main-body">
<jsp:include page="../common/menu.jsp"></jsp:include>
<div class="rght">
<div class="title-new">
<span class="title">自助打卡</span>
<div style="line-height: 22px">
<span class="road-notice"></span>
<span class="road-notice-txt">此功能仅适用于线下自助赛</span>
</div>
</div>
<div class="section">
<h3 class="title">设置打卡点</h3>
<div style="line-height: 22px">
<span class="road-notice"></span>
<span class="road-notice-txt">仅比赛日之前可修改；所有项目和打卡点设置源自计时设置</span>
</div>
<div class="data">
<div class="road">
<c:forEach var="item" items="${roads}">
<div class="road-name ">
<span>${item.name}</span>
</div>
</c:forEach>
</div>
<table cellpadding="2px" cellspacing="2px">
<colgroup>
<col width="33%">
<col width="33%">
<col width="33%">
</colgroup>
<thead>
<tr>
<th>姓名</th><th>路线标准</th><th>经纬度</th>
</tr>
</thead>
<tbody>
<%--
<tr>
<td>终点</td>
<td>
<div class="select-group">
<select name="" class="select">
<option value="">-- --</option>
<option value="">1</option>
</select>
<span class="down-arrow"></span>
</div>
</td>
<td>121.12193,39.1929182</td>
</tr>--%>
</tbody>
</table>
</div>
</div>
<div class="btn save-btn">保存</div>
</div>
<script src="${ctxStatic}/newdermon/vendor/popper.js/umd/popper.min.js"></script>
<script src="${ctxStatic}/js/qikoo.js"></script>
<script src="${ctxStatic}/js/autoscore.js?<%=System.currentTimeMillis()%>%"></script>
</body>
</html>
src/main/webapp/WEB-INF/views/common/menu.jsp
View file @ f7a072de
...@@ -148,13 +148,19 @@ ...@@ -148,13 +148,19 @@
<span class="menu-txt">提交成绩</span> <span class="menu-txt">提交成绩</span>
</a> </a>
</li> </li>
<li class="autoscore menu-item">
<a href="/gk/autoscore/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
<span class="menuico left-arrow"></span>
<span class="menu-txt">自助打卡</span>
</a>
</li>
</ul> </ul>
</ul> </ul>
</nav> </nav>
<script> <script>
var classes = ['cmptSetting', 'nameList', 'manual', 'contact', var classes = ['cmptSetting', 'nameList', 'manual', 'contact',
'route', 'road', 'equip', 'photo', 'news', 'route', 'road', 'equip', 'photo', 'news',
'banner','score']; 'banner','score','autoscore'];
let url = document.location.href; let url = document.location.href;
var done = false; var done = false;
for (var i in classes) { for (var i in classes) {
......
src/main/webapp/static/js/autoscore.js 0 → 100644
View file @ f7a072de
$(document).ready(function () {
getCp(21177)
});
function getCp(roadId) {
$.ajax({
url : '/gk/roadGpsCheckpoint/getGpsCheckPointByRoadId/'+getCId()+"/"+roadId,
success:function (data) {
if(data.status){
$.each(data.content,function (i,e) {
$('tbody').append(' \n' +
' <tr>\n' +
' <td>'+e.checkpointGpsName+'</td>\n' +
' <td>\n' +
' <div class="select-group">\n' +
' <select name="" class="select">\n' +
' <option value="">-- --</option>\n' +
' <option value="">1</option>\n' +
' </select>\n' +
' <span class="down-arrow"></span>\n' +
' </div>\n' +
' </td>\n' +
' <td>'+Number(e.checkpointLatitude).toFixed(6)+','+Number(e.checkpointLongitude).toFixed(6)+'</td>\n' +
' </tr>');
})
}
}
})
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment