达成度加入开课学院

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/entity/TRBasicInfo.java

@@ -123,7 +123,7 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
     public TRBasicInfo(Long cultureProgramId, Long courseId, String courseCode, String courseName,
                        String paperNumber, String openTime, String teachingObject, String teacher, Integer participantCount,
                        Long userId, String profession, String finishPoints, String requirementPoints,
-                       String courseSuggest, BigDecimal courseDegree, String courseEnName, Long examId) {
+                       String courseSuggest, BigDecimal courseDegree, String courseEnName, Long examId, String college) {
         insertInfo(userId);
         this.cultureProgramId = cultureProgramId;
         this.courseId = courseId;
@@ -143,6 +143,7 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
         this.requirementPoints = requirementPoints;
         this.courseSuggest = courseSuggest;
         this.examId = examId;
+        this.college = college;
     }
 
     public String getCourseEnName() {

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TRBasicInfoServiceImpl.java

@@ -12,13 +12,11 @@ import com.google.gson.reflect.TypeToken;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentDto;
 import com.qmth.distributed.print.business.service.ExamStudentService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicCourse;
-import com.qmth.teachcloud.common.entity.BasicProfessional;
-import com.qmth.teachcloud.common.entity.BasicSemester;
-import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.common.service.BasicSemesterService;
+import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.GsonUtil;
 import com.qmth.teachcloud.common.util.JacksonUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -93,6 +91,9 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
     @Resource
     BasicProfessionalService basicProfessionalService;
 
+    @Resource
+    SysOrgService sysOrgService;
+
     protected static final String tbBgColor = "F2F2F2";
     protected static final String tbPercentWidth = "100%";
     protected static final String[] scoreTitles = new String[]{"100-90", "89-80", "79-70", "69-60", "<60"};
@@ -427,10 +428,21 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         BasicSemester basicSemester = basicSemesterService.getById(obeCourseOutline.getSemesterId());
         Objects.requireNonNull(basicSemester, "未找到学期信息");
 
+        if (Objects.isNull(trBasicInfo.getCollege())) {
+            BasicCourse basicCourse = basicCourseService.getById(obeCourseOutline.getCourseId());
+            Objects.requireNonNull(basicCourse, "科目信息为空");
+
+            if (Objects.nonNull(basicCourse.getTeachingRoomId())) {
+                SysOrg sysOrg = sysOrgService.getById(basicCourse.getTeachingRoomId());
+                if (Objects.nonNull(sysOrg)) {
+                    trBasicInfo.setCollege(sysOrg.getName());
+                }
+            }
+        }
+
         String teachingObject = Objects.nonNull(trBasicInfo) ? trBasicInfo.getTeachingObject() : null, teacher = Objects.nonNull(trBasicInfo) ? trBasicInfo.getTeacher() : null;
         if (Objects.nonNull(markPaper.getPaperNumber())) {
             ExamStudentDto examStudentDto = examStudentService.queryExamStudent(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getPaperNumber());
-//            teachingObject = Objects.nonNull(examStudentDto) ? examStudentDto.getClazzNames() : null;
             teacher = Objects.nonNull(examStudentDto) ? examStudentDto.getTeacherNames() : null;
         }
 
@@ -446,7 +458,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
             throw ExceptionResultEnum.ERROR.exception("未找到试卷蓝图信息");
         }
         if (Objects.isNull(trBasicInfo)) {
-            trBasicInfo = new TRBasicInfo(cultureProgramId, courseId, markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), basicSemester.getName(), teachingObject, teacher, null, userId, basicProfessional.getName(), Objects.nonNull(trBasicInfo) ? trBasicInfo.getFinishPoints() : null, Objects.nonNull(trBasicInfo) ? trBasicInfo.getRequirementPoints() : null, Objects.nonNull(trBasicInfo) ? trBasicInfo.getCourseSuggest() : null, Objects.nonNull(expectValue) ? new BigDecimal(expectValue) : null, Objects.nonNull(trBasicInfo) ? trBasicInfo.getCourseEnName() : null, tcPaperStruct.getExamId());
+            trBasicInfo = new TRBasicInfo(cultureProgramId, courseId, markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), basicSemester.getName(), teachingObject, teacher, null, userId, basicProfessional.getName(), Objects.nonNull(trBasicInfo) ? trBasicInfo.getFinishPoints() : null, Objects.nonNull(trBasicInfo) ? trBasicInfo.getRequirementPoints() : null, Objects.nonNull(trBasicInfo) ? trBasicInfo.getCourseSuggest() : null, Objects.nonNull(expectValue) ? new BigDecimal(expectValue) : null, Objects.nonNull(trBasicInfo) ? trBasicInfo.getCourseEnName() : null, tcPaperStruct.getExamId(), trBasicInfo.getCollege());
         } else {
             trBasicInfo.setBasicInfo(tcPaperStruct.getExamId(), markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), basicSemester.getName(), teachingObject, teacher, null, cultureProgramId, courseId, Objects.nonNull(expectValue) ? new BigDecimal(expectValue) : null, basicProfessional.getName(), trBasicInfo.getCourseEnName(), trBasicInfo.getCollege(), trBasicInfo.getFinishPoints(), trBasicInfo.getRequirementPoints(), trBasicInfo.getCourseSuggest());
         }