Skip to content

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

删除成绩

parent 3df1a2a6
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 39 deletions
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/RoadsGpsCheckpointMapper.xml
View file @ 292f37b3
......@@ -36,7 +36,12 @@
</update>
<insert id="save" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
insert into gk_roads_gps_checkpoint_map(cmpt_id,road_id ,checkpoint_id,checkpoint_name,checkpoint_distance,checkpoint_gps_name ,checkpoint_latitude,checkpoint_longitude,is_delete,inster_time,update_time)
values (#{cmptId},#{roadId},#{checkpointId},#{checkpointName},#{checkpointDistance},#{checkpointGpsName},#{checkpointLatitude},#{checkpointLongitude},0,now(),now())
insert into gk_roads_gps_checkpoint_map(cmpt_id,road_id ,
checkpoint_id,checkpoint_name,checkpoint_distance,
checkpoint_gps_name ,checkpoint_latitude,
checkpoint_longitude,is_delete,inster_time,update_time)
values (#{cmptId},#{roadId},#{checkpointId},
#{checkpointName},#{checkpointDistance},#{checkpointGpsName},
#{checkpointLatitude},#{checkpointLongitude},0,now(),now())
</insert>
</mapper>
\ No newline at end of file
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreRuleScoreInfoService.java
View file @ 292f37b3
......@@ -82,7 +82,7 @@ public class CmptScoreRuleScoreInfoService {
* @param cmptId
* @param markNo
*/
public boolean scoreReviewByMarkNo(int cmptId, String markNo,int SwitchScoreReview){
public boolean scoreReviewByMarkNo(int cmptId, String markNo,int SwitchScoreReview){
//成绩自动审核开启SwitchScoreReview==1
boolean enrollFlag=false;
if(SwitchScoreReview==1){
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RoadsGpsCheckpointService.java
View file @ 292f37b3
......@@ -36,9 +36,9 @@ public class RoadsGpsCheckpointService {
int count=0;
for (RoadsGpsCheckpointMap roadsGpsCheckpointMap : roadsGpsCheckpointMapList) {
if (roadsGpsCheckpointMap.getId() != 0) {
count= roadsGpsCheckpointMapper.update(roadsGpsCheckpointMap);
count = roadsGpsCheckpointMapper.update(roadsGpsCheckpointMap);
} else {
count=roadsGpsCheckpointMapper.save(roadsGpsCheckpointMap);
count = roadsGpsCheckpointMapper.save(roadsGpsCheckpointMap);
}
}
return 1;
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/RoadsGpsCheckpointController.java
View file @ 292f37b3
......@@ -101,9 +101,9 @@ public class RoadsGpsCheckpointController {
public Result save(@RequestBody List<RoadsGpsCheckpointMap> roadsGpsCheckpointMapList) {
int count = roadsGpsCheckpointService.batchSaveOrUpdate(roadsGpsCheckpointMapList);
if(count > 0){
return Result.success().setContent(count);
return Result.success().setContent(roadsGpsCheckpointMapList);
}else{
return Result.fail().setContent(count);
return Result.fail().setContent(roadsGpsCheckpointMapList);
}
}
......
src/main/webapp/WEB-INF/views/cmpt/autoscore.jsp
View file @ 292f37b3
......@@ -41,21 +41,25 @@
position: relative;
}
.road-name{
font-size: 20px;
color: #999999;
line-height: 65px;
padding: 0px 27px;
color: #333;
background:rgba(229,229,229,1);
font-size: 14px;
line-height: 30px;
padding: 0px 18px;
cursor: pointer;
height: 65px;
border-radius: 0px 4px 0px 0px;
border: 1px solid rgba(229,229,229,1);
position: relative;
min-width: 170px;
text-align: center;
float: left;
margin-right: 18px;
border-radius: 4px;
margin-bottom: 20px;
}
.road-name.active{
color: #ce3939;
background: #ce3939;
border-bottom: 1px solid white;
color: white;
}
table{
width: 96%;
......@@ -79,8 +83,9 @@
padding-left: 26px;
}
.road{
display: flex;
border-bottom: 1px solid #f4f4f4;
/* display: flex;
border-bottom: 1px solid #f4f4f4;*/
margin-bottom: 30px;
}
.select-group{
position: relative;
......@@ -132,10 +137,9 @@
position: absolute;
width: 140px;
font-size: 16px;
bottom: -32px;
height: 65px;
bottom: -15px;
left: 50%;
margin-left: -69px;
margin-left: -70px;
}
</style>
</head>
......@@ -160,19 +164,21 @@
</div>
<div class="data">
<div class="road">
<div class="road" style="position: relative">
<c:forEach var="item" items="${roads}" varStatus="idx">
<div class="road-name ${idx.index==0?'active':''}" road-id="${item.roadId}">
<input type="hidden" id="roadId" name="roadId" value="${item.roadId}">
<span>${item.name}</span>
</div>
</c:forEach>
<div style="clear: both"></div>
<div class="noroute">
<span class="no-route-icon"></span>
<span class="no-route" style="color: #ce3939">未检索到标记点</span>
</div>
</div>
<span class="load">导入路线</span>
<div class="noroute">
<span class="no-route-icon"></span>
<span class="no-route">未检索到标记点</span>
</div>
<table>
<colgroup>
<col width="33%">
......@@ -211,7 +217,7 @@
<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"></script>
<script src="${ctxStatic}/js/autoscore.js?<%=System.currentTimeMillis()%>"></script>
</body>
......
src/main/webapp/static/js/autoscore.js
View file @ 292f37b3
......@@ -36,7 +36,9 @@ $(document).ready(function () {
var checkpointGpsName = $(e).find('select').val()
var checkpointLatitude = $(e).find('td:eq(2)').text().split(',')[0];
var checkpointLongitude = $(e).find('td:eq(2)').text().split(',')[1];
if(!checkpointGpsName){
return true;
}
param.id = id;
param.roadId = roadId;
param.checkpointId = checkpointId;
......@@ -46,6 +48,7 @@ $(document).ready(function () {
param.checkpointGpsName = checkpointGpsName;
param.checkpointLatitude = checkpointLatitude;
param.checkpointLongitude = checkpointLongitude;
console.log(param)
params.push(param)
});
saveCpMap(params)
......@@ -141,7 +144,7 @@ function getGpsCp(roadId) {
});
getCpGpsList(roadId);
}else{
$('.road-name[road-id="'+roadId+'"]').append($('.noroute'));
//$('.road-name[road-id="'+roadId+'"]').append($('.noroute'));
$('.noroute').show();
$('.load').attr('road-id',roadId)
$('.load').show();
......@@ -164,6 +167,9 @@ function saveCpMap(param){
data:JSON.stringify(param),
success:function (data) {
if(data.status){
$.each(data.content,function (i,e) {
$('td[data-cp-id="'+e.checkpointId+'"]').parent().attr('data-cpmap-id',e.id)
})
layer.msg('保存成功！')
}else{
layer.msg('操作失败！')
......
src/main/webapp/static/js/score.js
View file @ 292f37b3
......@@ -39,15 +39,20 @@ $(document).ready(function () {
data:{'start':$('.start').val()+":00",'end':$('.end').val()+":00"},
success:function (data) {
if(data.status){
layer.confirm("共查询到"+data.content+"条数据，请确认是否要全部删除",function () {
$.ajax({
url : "/gk/score/deleteBatch/"+getCId(),
data:{'start':$('.start').val()+":00",'end':$('.end').val()+":00"},
success:function () {
layer.msg("删除成功！");
}
if(data.content <= 0){
layer.alert("未查到信息！");
}else{
layer.confirm("共查询到"+data.content+"条数据，请确认是否要全部删除",function () {
$.ajax({
url : "/gk/score/deleteBatch/"+getCId(),
data:{'start':$('.start').val()+":00",'end':$('.end').val()+":00"},
success:function () {
layer.msg("删除成功！");
}
});
});
});
}
}
}
})
......
src/test/java/com/dlbridge/jadp/ContextTest.java
View file @ 292f37b3
package com.dlbridge.jadp;
import com.dlbridge.feign.ScoreService;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptSettingTemplate;
import com.dlbridge.jadp.plugins.cmpt.bean.RoadStatistic;
import com.dlbridge.jadp.plugins.cmpt.bean.SettingTemplate;
import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean;
import com.dlbridge.jadp.plugins.cmpt.bean.*;
import com.dlbridge.jadp.plugins.cmpt.dao.model.CmptSetting;
import com.dlbridge.jadp.plugins.cmpt.service.*;
import org.junit.Test;
......@@ -43,6 +40,9 @@ public class ContextTest {
@Resource
RemoteService remoteService;
@Resource
CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
@Resource
private CmptSettingService cmptSettingService;
@Test
......@@ -96,6 +96,12 @@ public class ContextTest {
});
}
@Test
public void testA(){
List<EnrollUser> allEnrollUser = remoteService.getAllEnrollUser(12);
cmptScoreRuleScoreInfoService.scoreReviewByMarkNo(14923,"A",1);
}
@Test
public void test(){
List<SettingTemplate> templates = cmptSettingService.queryAllSettingTemplate();
......
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