Merge remote-tracking branch 'origin/master'

src/main/java/com/msdw/tms/TmsApplication.java

@@ -6,7 +6,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-//@EnableScheduling//定时任务
+@EnableScheduling//定时任务
 @SpringBootApplication
 public class TmsApplication extends SpringBootServletInitializer {
 

src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java

@@ -91,4 +91,7 @@ public class AchievementManagementVO extends ExperimentalReportEntity {
 
     //学生id
     private Integer studentId;
+
+    //运行有没有出现错误(0、运行正确 1、运行错误
+    private Integer isError;
 }

src/main/resources/mapper/tms/AchievementManagementDao.xml

@@ -409,7 +409,8 @@
                IF
                    (p.rightAndWrong = 0, hsi.score, 0) AS codeScore,
                hjp.judgmentPointsName,
-               hjp.experimentcode                      AS answer
+               hjp.experimentcode                      AS answer,
+               hec.isError
         FROM hr_experiment_code AS hec,
              hr_score_index AS hsi,
              hr_judgment_points AS hjp,