|
@@ -663,7 +663,7 @@ public class ToClientServiceImpl implements IToClientService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 2. 处理时间格式转换
|
|
// 2. 处理时间格式转换
|
|
|
- if (StringUtils.isNotBlank(project.getTimingFormat())) {
|
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(project.getTimingFormat()) && project.getScoreRule().equals("1")) {
|
|
|
list.forEach(item -> {
|
|
list.forEach(item -> {
|
|
|
if (StringUtils.isNotBlank(item.getScore())) {
|
|
if (StringUtils.isNotBlank(item.getScore())) {
|
|
|
item.setScore(
|
|
item.setScore(
|
|
@@ -707,8 +707,7 @@ 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());
|
|
|
|
|
|
|
+ dbo.setFaultA(d.getShiwu());
|
|
|
return dbo;
|
|
return dbo;
|
|
|
}).toList();
|
|
}).toList();
|
|
|
scoreBo.setDetails(details);
|
|
scoreBo.setDetails(details);
|