Merge remote-tracking branch 'origin/dev_v3.3.4' into dev_v3.3.4

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/ObeScoreResult.java

@@ -32,6 +32,9 @@ public class ObeScoreResult {
     @ApiModelProperty(value = "课程名称")
     private String courseName;
 
+    @ApiModelProperty(value = "课程编号")
+    private String courseCode;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "责任人id")
     private Long userId;
@@ -39,6 +42,9 @@ public class ObeScoreResult {
     @ApiModelProperty(value = "责任人名称")
     private String userName;
 
+    @ApiModelProperty(value = "责任人登录名称")
+    private String userLoginName;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "学期id")
     private Long semesterId;
@@ -94,6 +100,14 @@ public class ObeScoreResult {
         this.courseName = courseName;
     }
 
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
     public Long getUserId() {
         return userId;
     }
@@ -110,6 +124,14 @@ public class ObeScoreResult {
         this.userName = userName;
     }
 
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
     public Long getSemesterId() {
         return semesterId;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ObeCourseWeightServiceImpl.java

@@ -217,7 +217,7 @@ public class ObeCourseWeightServiceImpl extends ServiceImpl<ObeCourseWeightMappe
                 obeCourseWeight.setEnable(enable);
                 obeCourseWeight.setWeight(weight);
                 // 目标分值计算: 3.3.4版本目标分值直接等于权重
-                obeCourseWeight.setTargetScore(weight);
+                obeCourseWeight.setTargetScore(BigDecimal.valueOf(100));
                 obeCourseWeight.insertInfo(requestUserId);
                 obeCourseWeightList.add(obeCourseWeight);
             }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachCourseServiceImpl.java

@@ -176,9 +176,6 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
                 cell.setCourseCode(courseCode);
                 cell.insertInfo(userId);
                 this.save(cell);
-
-                // 创建默认评价方式
-                obeCourseEvaluationService.createDefaultCourseEvaluation(cell.getId());
             }
         }
     }

distributed-print-business/src/main/resources/mapper/TCUsualScoreMapper.xml

@@ -8,12 +8,14 @@
             oco.name AS obeCourseOutlineName,
             bc.id AS courseId,
             bc.name AS courseName,
+            bc.code AS courseCode,
             bs.id AS semesterId,
             bs.name AS semesterName,
             ocp.id AS cultureProgramId,
             ocp.name AS cultureProgramName,
             su.id AS userId,
-            su.real_name AS userName
+            su.real_name AS userName,
+            su.login_name AS userLoginName
         FROM
             obe_course_outline oco
         LEFT JOIN

distributed-print/src/main/java/com/qmth/distributed/print/api/TCFinalScoreController.java

@@ -19,10 +19,12 @@ import com.qmth.distributed.print.business.service.TCPaperStructService;
 import com.qmth.distributed.print.business.service.TRBasicInfoService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
+import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.common.util.*;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
 import com.qmth.teachcloud.mark.service.MarkPaperService;
@@ -79,6 +81,9 @@ public class TCFinalScoreController {
     @Resource
     MarkPaperService markPaperService;
 
+    @Resource
+    BasicCourseService basicCourseService;
+
     @ApiOperation(value = "导入期末成绩-模板下载")
     @RequestMapping(value = "/final_score/template_download", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
@@ -149,8 +154,12 @@ public class TCFinalScoreController {
     @ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
     @OperationLogDetail(operationType = OperationTypeEnum.SYNC)
     public Result finalScoreSyncChoosePaper(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
-                                            @ApiParam(value = "科目编码") @RequestParam(required = false) String courseCode) {
-        return ResultUtil.ok(markPaperService.list(new QueryWrapper<MarkPaper>().lambda().eq(MarkPaper::getExamId, examId).eq(MarkPaper::getCourseCode, courseCode)));
+                                            @ApiParam(value = "科目编码") @RequestParam(required = false) Long courseId) {
+        BasicCourse basicCourse = basicCourseService.getById(courseId);
+        if (Objects.isNull(basicCourse)){
+            throw ExceptionResultEnum.ERROR.exception("未找到课程");
+        }
+        return ResultUtil.ok(markPaperService.list(new QueryWrapper<MarkPaper>().lambda().eq(MarkPaper::getExamId, examId).eq(MarkPaper::getCourseCode, basicCourse.getCode())));
     }
 
     @ApiOperation(value = "同步期末成绩")