Merge remote-tracking branch 'origin/ywx' into wn

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java

@@ -567,6 +567,8 @@ public class SchoolService {
     private void checkUpTime() throws Exception {
         //获取区域限制学年升级时间
         TCloud cloud = cloudMapper.getCloudUpTime();
+        if (N_Utils.isEmpty(cloud.getStarttime())) throw new Exception("未设置升级时间，请联系区管理员");
+
         if (!ApiUtil.compareCurrDateTime(cloud.getStarttime(), cloud.getStoptime())) {
             throw new Exception("不在学年升级时间范围，禁止升级");
         }

sstudy/src/main/resources/mapper/paperstudent/PaperStudentQuestionMapper.xml

@@ -33,7 +33,7 @@
     <select id="listCorrectQuestion" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo">
         SELECT psq.psqid,psq.paperid,psq.studentid,psq.answered,psq.answertime,psq.costtime,psq.checkcomm
         ,psq.useranswer,psq.answertype,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore
-        ,psq.stuscore,psq.qorder,psq.psid,psq.qn
+        ,psq.stuscore,psq.qorder,psq.psid,psq.qn,psq.good
         ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.qtypeid,q.qtypename
         ,(CASE WHEN psq.checked=1 AND psq.stuscore=psq.qscore THEN 1 ELSE 2 END)corrected
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
@@ -104,11 +104,12 @@
             <result property="useranswertext" column="useranswertext"></result>
             <result property="useranswertxt" column="useranswertxt"></result>
             <result property="studentname" column="username"></result>
+            <result property="good" column="good"></result>
         </collection>
     </resultMap>
     <select id="qcorrectList" resultMap="questionResult">
         select psq.qscore,psq.qorder,psq.qn,q.qstem,q.qoption,q.qanswer,q.qanalyze
-        ,psq.stuscore,psq.answered,psq.checked,psq.checkcomm,psq.psid,psq.psqid
+        ,psq.stuscore,psq.answered,psq.checked,psq.checkcomm,psq.psid,psq.psqid,psq.good
         ,psq.useranswer,psq.converted,psq.answertype,psq.useranswertext,psq.useranswertxt,u.username
         from t_paper_student_question psq left join t_question q on psq.questionid = q.questionid
         left join t_user u on psq.studentid = u.userid