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

smarking/src/main/resources/application.properties

@@ -82,10 +82,18 @@ signName=\u3010\u6CB3\u5357\u661F\u706B\u71CE\u539F\u3011
 enable.scheduled=false
 #\u6BCF\u96943s\u6E05\u9664\u4E00\u4E0B\u8BF7\u6C42\u5730\u5740map
 cron.deleteUriMap=0/3 * * * * ?
+#\u6BCF\u96941\u5206\u949F\u4FEE\u6539\u8BD5\u5377\u72B6\u6001
+cron.updateSubjectState=0 0/1 * * * ?
+#\u6BCF\u5929\u51CC\u66681\u70B9\u5904\u7406\u672A\u5408\u5E76\u7684\u5B66\u751F\u7B54\u6848
+cron.mergeStupic=0 0 1 * * ?
+#\u6BCF\u969410\u5206\u949F\u5904\u7406\u6279\u9605\u88AB\u5360\u8BD5\u9898
+cron.questionCheckState=0 0/10 * * * ?
 
 #\u914D\u7F6Esocket\u5730\u5740\u548Cface\u5730\u5740(\u5916\u7F51\u5730\u5740)
 marking.socket=wss://wsexam.xhkjedu.com/ws
 marking.face=https://face.xhkjedu.com/
+#\u6587\u4EF6\u670D\u52A1\u5730\u5740
+fileapi=https://schoolfiletest.xhkjedu.com/
 
 #\u914D\u7F6E\u8003\u8BD5\u7ED3\u675F\u65F6\u95F4\u8303\u56F4
 marking.endtime=30
@@ -95,9 +103,6 @@ marking.haspdf=false
 #\u89E3\u6790ip\u5F52\u5C5E\u5730\u6570\u636E
 ipregiondb=D:\\school\\ip2region.xdb
 
-#\u6587\u4EF6\u670D\u52A1\u5730\u5740
-fileapi=https://schoolfiletest.xhkjedu.com/
-
 
 #\u7248\u672C\u53F7
 buildnum=301

smarking/src/main/resources/mapper/paper/MsPaperMapper.xml

@@ -16,7 +16,7 @@
 
     <!--获取试卷详细信息-->
     <select id="getPaperInfoByMsid" resultType="java.util.Map">
-        select s.examid,s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,e.gradeid,e.examtype,p.mpid,
+        select s.examid,s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,e.gradeid,e.examtype,p.mpid,
         p.ptype,p.pnum,p.pscore,u.username as teachername,u.username as handlename
         from ms_subject s left join ms_paper p on s.msid=p.msid
         left join ms_exam e on s.examid=e.examid