Merge remote-tracking branch 'origin/master'

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -913,8 +913,11 @@ public class MicroApiController {
         if(scoreItemId != null){
             Result<ScoreItem> scoreItem = scoreService.getScoreItem(scoreItemId);
             ScoreItem content = scoreItem.getContent();
-            if(content.getSubsectionMileage()==null)
+            if(content.getSubsectionMileage()==null){
                 subsectionMileage=0;
+            }else{
+                subsectionMileage=content.getSubsectionMileage();
+            }
             result.put("score",new Score().setDate(content.getSubsectionTime().substring(0,10)).setDuration(content.getSubsectionscore()).setMileage(subsectionMileage).setSwitchMileage(switchMileage));
         }else{  //初始阶段没有上传成绩，json也显示score，方便前端判断
             result.put("score",new Score().setDate("0000-00-00").setDuration(0).setMileage(subsectionMileage).setSwitchMileage(switchMileage));

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScoreController.java

@@ -271,7 +271,7 @@ public class ScoreController {
             // 项目的人员名单
             List<UserScoreExcelBean> users = cmptScoreRuleService.getRoadStatisticByCmptIdAndRoadId(cmptId,road.getRoadId());
 
-            // 计算 总成绩 以及 总排名
+            // 计算 总成绩 以及 总排名 以及总里程
             users.forEach(user -> {
                 long total = user.getScores().stream().mapToLong(ScoreExcelBean::getDuration).sum();
                 int totalMileage = user.getScores().stream().mapToInt(ScoreExcelBean::getMileage).sum();
@@ -337,8 +337,9 @@ public class ScoreController {
             row.createCell(6).setCellValue("分段成绩");
             row.createCell(7).setCellValue("完成时间");
             row.createCell(8).setCellValue("用时");
+            row.createCell(9).setCellValue("里程");//用户填写的里程数
             for(int m=0;m < fields.size();m++){
-                row.createCell(9+m).setCellValue(fields.get(m).getFieldName());
+                row.createCell(10+m).setCellValue(fields.get(m).getFieldName());
             }
 
             int startNum = 1;
@@ -367,9 +368,10 @@ public class ScoreController {
                         sub.createCell(6).setCellValue("第"+sq+"次成绩");
                         sub.createCell(7).setCellValue(scoreExcelBean.getDate());
                         sub.createCell(8).setCellValue(DateUtil.formatDate(scoreExcelBean.getDuration()));
+                        sub.createCell(9).setCellValue(scoreExcelBean.getMileage());
                         List<CmptScoreFieldValue> fieldValues = scoreExcelBean.getFieldValues();
                         for(int m=0;m < fieldValues.size();m++){
-                            sub.createCell(9+m).setCellValue(fieldValues.get(m).getScoreFieldValue());
+                            sub.createCell(10+m).setCellValue(fieldValues.get(m).getScoreFieldValue());
                         }
                     });