bug

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/AnalyzeForReportServiceImpl.java

@@ -258,7 +258,7 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                 throw ExceptionResultEnum.ERROR.exception("没有考察学院");
             }
             List<SysOrg> sysOrgList = sysOrgService.listByIds(inspectCollegeIdList);
-            String inspectCollegeNames = StringUtils.join(sysOrgList.stream().map(SysOrg::getName).collect(Collectors.toList()),',');
+            String inspectCollegeNames = StringUtils.join(sysOrgList.stream().map(SysOrg::getName).collect(Collectors.toList()),'、');
 
 
             /*

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TAExamCourseServiceImpl.java

@@ -301,20 +301,20 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
         trialCalculationResult.setTotalCount(totalCount);
         trialCalculationResult.setCurrentCount(currentCount);
         // - 卷面-总体
-        trialCalculationResult.setAvgScore(BigDecimal.valueOf(paperTotalAvgScore));
-        trialCalculationResult.setFailRate(paperTotalFailRate);
+        trialCalculationResult.setAvgScore(BigDecimal.valueOf(paperTotalAvgScore).setScale(1,BigDecimal.ROUND_HALF_UP));
+        trialCalculationResult.setFailRate(paperTotalFailRate.setScale(1,BigDecimal.ROUND_HALF_UP));
         trialCalculationResult.setFailCount((int) paperTotalFailCount);
         // - 卷面-应届
-        trialCalculationResult.setCurrentAvgScore(BigDecimal.valueOf(paperCurrentAvgScore));
-        trialCalculationResult.setCurrentFailRate(paperCurrentFailRate);
+        trialCalculationResult.setCurrentAvgScore(BigDecimal.valueOf(paperCurrentAvgScore).setScale(1,BigDecimal.ROUND_HALF_UP));
+        trialCalculationResult.setCurrentFailRate(paperCurrentFailRate.setScale(1,BigDecimal.ROUND_HALF_UP));
         trialCalculationResult.setCurrentFailCount((int) paperCurrentFailCount);
         // - 赋分-总体
-        trialCalculationResult.setAvgScoreAssign(BigDecimal.valueOf(totalAvgScore));
-        trialCalculationResult.setFailRateAssign(totalFailRate);
+        trialCalculationResult.setAvgScoreAssign(BigDecimal.valueOf(totalAvgScore).setScale(1,BigDecimal.ROUND_HALF_UP));
+        trialCalculationResult.setFailRateAssign(totalFailRate.setScale(1,BigDecimal.ROUND_HALF_UP));
         trialCalculationResult.setFailCountAssign((int) totalFailCount);
         // - 赋分-应届
-        trialCalculationResult.setCurrentAvgScoreAssign(BigDecimal.valueOf(currentAvgScore));
-        trialCalculationResult.setCurrentFailRateAssign(currentFailRate);
+        trialCalculationResult.setCurrentAvgScoreAssign(BigDecimal.valueOf(currentAvgScore).setScale(1,BigDecimal.ROUND_HALF_UP));
+        trialCalculationResult.setCurrentFailRateAssign(currentFailRate.setScale(1,BigDecimal.ROUND_HALF_UP));
         trialCalculationResult.setCurrentFailCountAssign((int) currentFailCount);
 
         return trialCalculationResult;

teachcloud-report-business/src/main/resources/mapper/TAExamCourseCollegeTeacherMapper.xml

@@ -152,7 +152,7 @@
         a.teach_college_name teachCollegeName,
         a.teacher_name teacherName,
         round(a.avg_score_assign, 1) avgScoreAssign,
-        a.teacher_rank rank
+        a.teacher_rank `rank`
         FROM
         t_a_exam_course_college_teacher a
         LEFT JOIN

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/CourseController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Objects;
 
 @Api(tags = "课程Controller")
@@ -42,7 +43,7 @@ public class CourseController {
                                     @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                     @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                     @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId)));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId)));
     }
 
     @ApiOperation(value = "开课课程考试总览-教师各课堂成绩排名接口")
@@ -54,7 +55,7 @@ public class CourseController {
                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherTeacherView(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherTeacherView(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()))  : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
     }
 
     @ApiOperation(value = "开课课程考试总览-试题难度得分情况分析接口")
@@ -133,5 +134,16 @@ public class CourseController {
         return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus, semester));
     }
 
+    @ApiOperation(value = "赋分试算接口")
+    @RequestMapping(value = "/survey_aspoints/calculation", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "赋分试算接口", response = TrialCalculationResult.class)})
+    public Result surveyAspointsCalculation(
+                                     @ApiParam(value = "考试id", required = true) @RequestParam String examId,
+                                     @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                                     @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
+        return ResultUtil.ok(taExamCourseService.trialCalculate(SystemConstant.convertIdToLong(examId),courseCode,coefficient));
+    }
+
+
 
 }