|
@@ -320,8 +320,8 @@ public class ToClientServiceImpl implements IToClientService {
|
|
|
dvo.setScoreId(d.getScoreId());
|
|
dvo.setScoreId(d.getScoreId());
|
|
|
dvo.setAttemptIndex(d.getAttemptIndex());
|
|
dvo.setAttemptIndex(d.getAttemptIndex());
|
|
|
dvo.setNum(d.getPerformanceValue() != null ? d.getPerformanceValue().toString() : null);
|
|
dvo.setNum(d.getPerformanceValue() != null ? d.getPerformanceValue().toString() : null);
|
|
|
- dvo.setFaultA(d.getFaultA());
|
|
|
|
|
- dvo.setFaultB(d.getFaultB());
|
|
|
|
|
|
|
+ dvo.setShiwuA(d.getFaultA());
|
|
|
|
|
+ dvo.setShiwuB(d.getFaultB());
|
|
|
// 传递关联 ID 供分组使用
|
|
// 传递关联 ID 供分组使用
|
|
|
dvo.setId(d.getAthleteId());
|
|
dvo.setId(d.getAthleteId());
|
|
|
dvo.setTeamId(d.getTeamId());
|
|
dvo.setTeamId(d.getTeamId());
|
|
@@ -485,6 +485,8 @@ public class ToClientServiceImpl implements IToClientService {
|
|
|
dbo.setDetailId(d.getDetailId());
|
|
dbo.setDetailId(d.getDetailId());
|
|
|
dbo.setAttemptIndex(d.getAttemptIndex());
|
|
dbo.setAttemptIndex(d.getAttemptIndex());
|
|
|
dbo.setPerformanceValue(d.getNum());
|
|
dbo.setPerformanceValue(d.getNum());
|
|
|
|
|
+ dbo.setFaultA(d.getShiwuA());
|
|
|
|
|
+ dbo.setFaultB(d.getShiwuB());
|
|
|
return dbo;
|
|
return dbo;
|
|
|
}).toList();
|
|
}).toList();
|
|
|
scoreBo.setDetails(details);
|
|
scoreBo.setDetails(details);
|
|
@@ -539,7 +541,7 @@ public class ToClientServiceImpl implements IToClientService {
|
|
|
.map(this::convertToDetailVo)
|
|
.map(this::convertToDetailVo)
|
|
|
.collect(Collectors.groupingBy(ScoreSheetDetailVo::getTeamId));
|
|
.collect(Collectors.groupingBy(ScoreSheetDetailVo::getTeamId));
|
|
|
|
|
|
|
|
- list.forEach(item -> item.setDetails(detailMap.get(item.getTeamId())));
|
|
|
|
|
|
|
+ list.forEach(item -> item.setChengji(detailMap.get(item.getTeamId())));
|
|
|
} else {
|
|
} else {
|
|
|
// 个人项目:按 athleteId 分组
|
|
// 个人项目:按 athleteId 分组
|
|
|
detailMap = allDetails.stream()
|
|
detailMap = allDetails.stream()
|
|
@@ -548,7 +550,7 @@ public class ToClientServiceImpl implements IToClientService {
|
|
|
.collect(Collectors.groupingBy(ScoreSheetDetailVo::getId));
|
|
.collect(Collectors.groupingBy(ScoreSheetDetailVo::getId));
|
|
|
|
|
|
|
|
list.forEach(item -> {
|
|
list.forEach(item -> {
|
|
|
- List<ScoreSheetDetailVo> details = detailMap.get(item.getAthleteId());
|
|
|
|
|
|
|
+ List<ScoreSheetDetailVo> details = detailMap.get(item.getId());
|
|
|
if (details == null && item.getScoreId() != null) {
|
|
if (details == null && item.getScoreId() != null) {
|
|
|
// 兜底:按 scoreId 匹配
|
|
// 兜底:按 scoreId 匹配
|
|
|
details = allDetails.stream()
|
|
details = allDetails.stream()
|
|
@@ -556,7 +558,7 @@ public class ToClientServiceImpl implements IToClientService {
|
|
|
.map(this::convertToDetailVo)
|
|
.map(this::convertToDetailVo)
|
|
|
.toList();
|
|
.toList();
|
|
|
}
|
|
}
|
|
|
- item.setDetails(details);
|
|
|
|
|
|
|
+ item.setChengji(details);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -568,8 +570,8 @@ public class ToClientServiceImpl implements IToClientService {
|
|
|
item.setScore(
|
|
item.setScore(
|
|
|
convertDecimalToTimeScore(new BigDecimal(item.getScore()), project.getTimingFormat()));
|
|
convertDecimalToTimeScore(new BigDecimal(item.getScore()), project.getTimingFormat()));
|
|
|
}
|
|
}
|
|
|
- if (item.getDetails() != null) {
|
|
|
|
|
- item.getDetails().forEach(detail -> {
|
|
|
|
|
|
|
+ if (item.getChengji() != null) {
|
|
|
|
|
+ item.getChengji().forEach(detail -> {
|
|
|
if (StringUtils.isNotBlank(detail.getNum())) {
|
|
if (StringUtils.isNotBlank(detail.getNum())) {
|
|
|
detail.setNum(convertDecimalToTimeScore(
|
|
detail.setNum(convertDecimalToTimeScore(
|
|
|
new BigDecimal(detail.getNum()),
|
|
new BigDecimal(detail.getNum()),
|
|
@@ -599,15 +601,15 @@ public class ToClientServiceImpl implements IToClientService {
|
|
|
scoreBo.setAthleteId(score.getAthleteId());
|
|
scoreBo.setAthleteId(score.getAthleteId());
|
|
|
scoreBo.setTeamId(score.getTeamId());
|
|
scoreBo.setTeamId(score.getTeamId());
|
|
|
|
|
|
|
|
- if (CollectionUtils.isNotEmpty(bo.getDetails())) {
|
|
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(bo.getChengji())) {
|
|
|
// 如果提交了明细列表,则优先更新明细
|
|
// 如果提交了明细列表,则优先更新明细
|
|
|
- List<GameScoreDetailBo> details = bo.getDetails().stream().map(d -> {
|
|
|
|
|
|
|
+ List<GameScoreDetailBo> details = bo.getChengji().stream().map(d -> {
|
|
|
GameScoreDetailBo dbo = new GameScoreDetailBo();
|
|
GameScoreDetailBo dbo = new GameScoreDetailBo();
|
|
|
dbo.setDetailId(d.getDetailId());
|
|
dbo.setDetailId(d.getDetailId());
|
|
|
dbo.setAttemptIndex(d.getAttemptIndex());
|
|
dbo.setAttemptIndex(d.getAttemptIndex());
|
|
|
- dbo.setPerformanceValue(d.getPerformanceValue());
|
|
|
|
|
- dbo.setFaultA(d.getFaultA());
|
|
|
|
|
- dbo.setFaultB(d.getFaultB());
|
|
|
|
|
|
|
+ dbo.setPerformanceValue(d.getNum());
|
|
|
|
|
+ dbo.setFaultA(d.getShiwuA());
|
|
|
|
|
+ dbo.setFaultB(d.getShiwuB());
|
|
|
return dbo;
|
|
return dbo;
|
|
|
}).toList();
|
|
}).toList();
|
|
|
scoreBo.setDetails(details);
|
|
scoreBo.setDetails(details);
|