Commit 306ec0c0 authored by sunyuhua's avatar sunyuhua

删除成绩,更新总成绩

parent 22a50adf
...@@ -898,10 +898,7 @@ public class MicroApiController { ...@@ -898,10 +898,7 @@ public class MicroApiController {
DecimalFormat df = new DecimalFormat("0.##"); DecimalFormat df = new DecimalFormat("0.##");
cmptPace=Float.valueOf(df.format((float)duration/mileage)); cmptPace=Float.valueOf(df.format((float)duration/mileage));
} }
LocalTime nowTime = LocalTime.now().withNano(0); String subsectionTime=score.getScore().getDate();
//提交时间,根据服务器的时间补充
String subsectionTime=score.getScore().getDate()+" "+nowTime;
log.info("提交成绩时间:"+subsectionTime);
//前端上传json中取出里程,耗时,提交时间,赛事地,规则id,markNo //前端上传json中取出里程,耗时,提交时间,赛事地,规则id,markNo
CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo = new CmptScoreRuleScoreInfo().setCmptId(score.getCmptId()) CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo = new CmptScoreRuleScoreInfo().setCmptId(score.getCmptId())
.setSubsectionscore(score.getScore().getDuration()).setSubsectionMileage(mileage).setCmptPace(cmptPace) .setSubsectionscore(score.getScore().getDuration()).setSubsectionMileage(mileage).setCmptPace(cmptPace)
......
...@@ -236,9 +236,9 @@ public class ScoreController { ...@@ -236,9 +236,9 @@ public class ScoreController {
* @param response * @param response
* @return * @return
*/ */
@RequestMapping("delScore/{markNo}/{scoreItemId}") @RequestMapping("delScore/{cmptId}/{markNo}/{scoreItemId}")
@ResponseBody @ResponseBody
public Result delScore(@PathVariable("markNo") String markNo, public Result delScore(@PathVariable("cmptId") Integer cmptId,@PathVariable("markNo") String markNo,
@PathVariable("scoreItemId") Integer scoreItemId, @PathVariable("scoreItemId") Integer scoreItemId,
HttpServletResponse response) { HttpServletResponse response) {
//Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId); //Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId);
...@@ -246,6 +246,8 @@ public class ScoreController { ...@@ -246,6 +246,8 @@ public class ScoreController {
//cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId); //cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId);
Integer ruleId = cmptScoreRuleScoreInfoService.getCmptScoreRuleIdMapByMarkNoAndScoreId(markNo,scoreItemId); Integer ruleId = cmptScoreRuleScoreInfoService.getCmptScoreRuleIdMapByMarkNoAndScoreId(markNo,scoreItemId);
cmptScoreRuleScoreInfoService.deleteCmptScoreRuleScoreInfoById(scoreItemId);//成绩详情中主键Id cmptScoreRuleScoreInfoService.deleteCmptScoreRuleScoreInfoById(scoreItemId);//成绩详情中主键Id
//删除成绩,重新计算总成绩和总里程,把成绩发送到计时系统
cmptScoreRuleScoreInfoService.scoreReviewByMarkNo(cmptId,markNo,1);
if(ruleId != null){ if(ruleId != null){
cmptScoreFieldValueService.deleteFieldValueByRuleIdAndMarkNo(ruleId,markNo); cmptScoreFieldValueService.deleteFieldValueByRuleIdAndMarkNo(ruleId,markNo);
} }
......
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