Bläddra i källkod

Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-core-examwork.git

wangwei 5 år sedan
förälder
incheckning
3627642f30

+ 4 - 1
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamCloudServiceProvider.java

@@ -313,15 +313,18 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 			list.add(bean);
 			bean.setId(cur.getId());
 			bean.setOrgId(cur.getOrgId());
+			bean.setCourseId(cur.getCourseId());
+			bean.setStudentId(cur.getStudentId());
 			cur.setRootOrgId(cur.getRootOrgId());
 			cur.setUpdateTime(cur.getUpdateTime());
 			bean.setBeginTime(cur.getBeginTime());
-			bean.setCourseId(cur.getCourseId());
 			bean.setEndTime(cur.getEndTime());
 			bean.setExamEnable(cur.getExamEnable());
 			bean.setExamId(cur.getExamId());
 			bean.setExamLimit(cur.getExamLimit());
 			bean.setExamType(cur.getExamType().name());
+			bean.setSpecialSettingsEnabled(cur.getSpecialSettingsEnabled());
+			bean.setSpecialSettingsType(cur.getSpecialSettingsType());
 		}
 
 		GetOngoingExamListResp resp = new GetOngoingExamListResp();

+ 1 - 0
examcloud-core-examwork-starter/src/main/resources/log4j2.xml

@@ -56,6 +56,7 @@
 		</Logger>
 
 		<Logger name="cn.com.qmth.examcloud.web.actuator" level="ERROR" />
+		<Logger name="org.hibernate.SQL" level="${commonLevel}" />
 
 		<Root level="INFO">
 			<AppenderRef ref="Console" />