From 3df45ee621c02506712ac78bd3f4e2db2bdb3cbb Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 29 Sep 2022 17:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E6=95=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=9C=AA=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/entity/ResourcesQuestionSnapshot.java | 8 +-- .../jlw/entity/TeacherOpenCourseHomework.java | 8 +-- .../entity/TeacherOpenCourseQuestionLog.java | 8 +-- ...TeacherOpenCourseQuestionLogScoreInfo.java | 50 +++++++++++++++++++ ...eacherOpenCourseHomeworkFromTypeEnum.java} | 6 +-- ...eacherOpenCourseQuestionFromTypeEnum.java} | 6 +-- .../TeacherOpenCourseHomeworkService.java | 2 +- ...acherOpenCourseHomeworkSettingService.java | 8 +-- .../TeacherOpenCourseQuestionLogService.java | 9 +++- ...eacherOpenCourseQuestionLogController.java | 31 ++++++++++-- .../query/ResourcesQuestionSnapshotQuery.java | 8 +-- .../query/TeacherOpenCourseHomeworkQuery.java | 8 +-- .../TeacherOpenCourseQuestionLogQuery.java | 8 +-- ...acherOpenCourseHomeworkControllerTest.java | 6 +-- ...erOpenCourseQuestionLogControllerTest.java | 6 +-- 15 files changed, 125 insertions(+), 47 deletions(-) create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo.java rename web/src/main/java/com/ibeetl/jlw/enums/{TeacherOpenCourseHomeworkTypeEnum.java => TeacherOpenCourseHomeworkFromTypeEnum.java} (61%) rename web/src/main/java/com/ibeetl/jlw/enums/{TeacherOpenCourseQuestionLogFromTypeEnum.java => TeacherOpenCourseQuestionFromTypeEnum.java} (64%) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java index d2b5d218..2e7388d0 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java @@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum; +import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import org.beetl.sql.annotation.entity.AssignID; import javax.validation.constraints.NotNull; @@ -29,7 +29,7 @@ public class ResourcesQuestionSnapshot extends BaseEntity { //来源类型（HOMEWORK...） @DictEnum - private TeacherOpenCourseHomeworkTypeEnum fromType ; + private TeacherOpenCourseQuestionFromTypeEnum fromType ; //课程ID @@ -119,13 +119,13 @@ public class ResourcesQuestionSnapshot extends BaseEntity { /**来源类型（HOMEWORK...） *@return */ - public TeacherOpenCourseHomeworkTypeEnum getFromType(){ + public TeacherOpenCourseQuestionFromTypeEnum getFromType(){ return fromType; } /**来源类型（HOMEWORK...） *@param fromType */ - public void setFromType(TeacherOpenCourseHomeworkTypeEnum fromType){ + public void setFromType(TeacherOpenCourseQuestionFromTypeEnum fromType){ this.fromType = fromType; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomework.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomework.java index 5cdc4a3b..61864f84 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomework.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomework.java @@ -4,7 +4,7 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum; +import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkFromTypeEnum; import org.beetl.sql.annotation.entity.AssignID; import javax.validation.constraints.NotNull; @@ -47,7 +47,7 @@ public class TeacherOpenCourseHomework extends BaseEntity{ //作业类型。 题库作业QUESTION，附件FILE @DictEnum - private TeacherOpenCourseHomeworkTypeEnum teacherOpenCourseHomeworkType ; + private TeacherOpenCourseHomeworkFromTypeEnum teacherOpenCourseHomeworkType ; //附件，老师上传附件（单文件） @@ -159,13 +159,13 @@ public class TeacherOpenCourseHomework extends BaseEntity{ /**作业类型。 题库作业QUESTION，附件FILE *@return */ - public TeacherOpenCourseHomeworkTypeEnum getTeacherOpenCourseHomeworkType(){ + public TeacherOpenCourseHomeworkFromTypeEnum getTeacherOpenCourseHomeworkType(){ return teacherOpenCourseHomeworkType; } /**作业类型。 题库作业QUESTION，附件FILE *@param teacherOpenCourseHomeworkType */ - public void setTeacherOpenCourseHomeworkType(TeacherOpenCourseHomeworkTypeEnum teacherOpenCourseHomeworkType){ + public void setTeacherOpenCourseHomeworkType(TeacherOpenCourseHomeworkFromTypeEnum teacherOpenCourseHomeworkType){ this.teacherOpenCourseHomeworkType = teacherOpenCourseHomeworkType; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java index 6e9a6700..bf0e93b7 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java @@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionLogFromTypeEnum; +import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import org.beetl.sql.annotation.entity.AssignID; import javax.validation.constraints.NotNull; @@ -28,7 +28,7 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{ //来源类型（枚举） - private TeacherOpenCourseQuestionLogFromTypeEnum teacherOpenCourseQuestionLogFromType ; + private TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType ; //题目快照ID @@ -95,13 +95,13 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{ /**来源类型（枚举） *@return */ - public TeacherOpenCourseQuestionLogFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){ + public TeacherOpenCourseQuestionFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){ return teacherOpenCourseQuestionLogFromType; } /**来源类型（枚举） *@param teacherOpenCourseQuestionLogFromType */ - public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionLogFromTypeEnum teacherOpenCourseQuestionLogFromType){ + public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType){ this.teacherOpenCourseQuestionLogFromType = teacherOpenCourseQuestionLogFromType; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo.java new file mode 100644 index 00000000..2bc3754b --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo.java @@ -0,0 +1,50 @@ +package com.ibeetl.jlw.entity; + +import com.ibeetl.admin.core.entity.BaseEntity; +import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; +import lombok.Data; +import org.beetl.sql.fetch.annotation.Fetch; +import org.beetl.sql.fetch.annotation.FetchSql; + +import java.util.List; + +/** + * 我的课程-题库-做题日志-分数信息 + * @author mlx + */ +@Data +@Fetch +public class TeacherOpenCourseQuestionLogScoreInfo extends BaseEntity{ + + //来源类型（枚举） + + private TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType ; + + //题目快照ID + + private Long resourcesQuestionSnapshotId ; + + // 学生ID + + private String studentId; + + // 答对数量 + + private int correctCount; + + // 答错数量 + + private int wrongCount; + + // 总得分 + + private float totalScore; + + // 正确率 最大100 + + private int correctRate; + + @FetchSql(value = "") + private List a; + +} diff --git a/web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseHomeworkTypeEnum.java b/web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseHomeworkFromTypeEnum.java similarity index 61% rename from web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseHomeworkTypeEnum.java rename to web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseHomeworkFromTypeEnum.java index e50677de..bdf2a975 100644 --- a/web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseHomeworkTypeEnum.java +++ b/web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseHomeworkFromTypeEnum.java @@ -5,14 +5,14 @@ import lombok.Getter; /** *

- * 教师开课-作业来源类型 + * 教师开课-作业 homework 的来源类型 *

* * @author mlx * @date 2022/9/23 * @modified */ -public enum TeacherOpenCourseHomeworkTypeEnum { +public enum TeacherOpenCourseHomeworkFromTypeEnum { QUESTION("题目"), @@ -20,7 +20,7 @@ public enum TeacherOpenCourseHomeworkTypeEnum { @Getter private String text; - TeacherOpenCourseHomeworkTypeEnum(String text) { + TeacherOpenCourseHomeworkFromTypeEnum(String text) { this.text = text; } } diff --git a/web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseQuestionLogFromTypeEnum.java b/web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseQuestionFromTypeEnum.java similarity index 64% rename from web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseQuestionLogFromTypeEnum.java rename to web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseQuestionFromTypeEnum.java index d768fa7a..799b8b46 100644 --- a/web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseQuestionLogFromTypeEnum.java +++ b/web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseQuestionFromTypeEnum.java @@ -5,7 +5,7 @@ import lombok.Getter; /** *

- * 教师开课-题目日志来源类型 + * 教师开课-题目来源类型 * *

* @@ -13,7 +13,7 @@ import lombok.Getter; * @date 2022/9/23 * @modified */ -public enum TeacherOpenCourseQuestionLogFromTypeEnum { +public enum TeacherOpenCourseQuestionFromTypeEnum { HOMEWORK("作业"), @@ -23,7 +23,7 @@ public enum TeacherOpenCourseQuestionLogFromTypeEnum { @Getter private String text; - TeacherOpenCourseQuestionLogFromTypeEnum(String text) { + TeacherOpenCourseQuestionFromTypeEnum(String text) { this.text = text; } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java index 16fc3c01..92215de6 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java @@ -180,7 +180,7 @@ public class TeacherOpenCourseHomeworkService extends CoreBaseService 例： {"10086": ["D", "A", "B", "A"]} * @param fromType 来源类型 */ - public void addQuestionLog(Map> questionLogMap, final TeacherOpenCourseQuestionLogFromTypeEnum fromType) { + public void addQuestionLog(Map> questionLogMap, final TeacherOpenCourseQuestionFromTypeEnum fromType) { // 查询学生身份 Student student = studentDao.getByUserId(getUserId()); @@ -190,4 +191,8 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService> questionLogMap, @NotNull(message = "来源类型不能为空！") - TeacherOpenCourseQuestionLogFromTypeEnum fromType, + TeacherOpenCourseQuestionFromTypeEnum fromType, @SCoreUser CoreUser coreUser) { Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!"); @@ -220,4 +221,28 @@ public class TeacherOpenCourseQuestionLogController{ return JsonResult.success(); } + + /** + * 查询分数信息 + * 支持根据来源类型查询 + * + * @param questionSnapshotIds + * @param fromType + * @param coreUser + * @return + */ + @PostMapping(MODEL + "/getScoreInfo.json") + @Function("teacherOpenCourseQuestionLog.add") + @ResponseBody + public JsonResult getScoreInfo( + @NotEmpty(message = "请上传来源ID：（开课作业ID、开课考试ID、开课章节测试ID）！") + Long fromId, + @NotNull(message = "来源类型不能为空！") + TeacherOpenCourseQuestionFromTypeEnum fromType, + @SCoreUser + CoreUser coreUser) { + Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!"); + return JsonResult.success(teacherOpenCourseQuestionLogService.getScoreInfo(fromId, fromType)); + } + } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java index 5bd0d4e2..b1bed0a0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java @@ -4,7 +4,7 @@ import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; -import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum; +import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -19,7 +19,7 @@ public class ResourcesQuestionSnapshotQuery extends PageParam { @Query(name = "来源ID", display = false) private Long fromId; @Query(name = "来源类型（HOMEWORK...）", display = false) - private TeacherOpenCourseHomeworkTypeEnum fromType; + private TeacherOpenCourseQuestionFromTypeEnum fromType; @Query(name = "课程ID", display = false) private Long courseInfoId; @Query(name = "题型(1单选 2多选 3判断)", display = false) @@ -77,10 +77,10 @@ public class ResourcesQuestionSnapshotQuery extends PageParam { public void setFromId(Long fromId ){ this.fromId = fromId; } - public TeacherOpenCourseHomeworkTypeEnum getFromType(){ + public TeacherOpenCourseQuestionFromTypeEnum getFromType(){ return fromType; } - public void setFromType(TeacherOpenCourseHomeworkTypeEnum fromType ){ + public void setFromType(TeacherOpenCourseQuestionFromTypeEnum fromType ){ this.fromType = fromType; } public Long getCourseInfoId(){ diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuery.java index 58558666..3917721d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuery.java @@ -4,15 +4,15 @@ import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.TeacherOpenCourseHomework; -import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum; +import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkFromTypeEnum; import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Date; -import static com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum.FILE; -import static com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum.QUESTION; +import static com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkFromTypeEnum.FILE; +import static com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkFromTypeEnum.QUESTION; /** *开课作业查询 @@ -44,7 +44,7 @@ public class TeacherOpenCourseHomeworkQuery extends PageParam { private Date teacherOpenCourseHomeworkEndTime; @NotNull(message = "作业类型不能为空") @Query(name = "作业类型。 题库作业QUESTION，附件FILE", display = false) - private TeacherOpenCourseHomeworkTypeEnum teacherOpenCourseHomeworkType; + private TeacherOpenCourseHomeworkFromTypeEnum teacherOpenCourseHomeworkType; @Query(name = "附件，老师上传附件（单文件）", display = false) private String teacherOpenCourseHomeworkUploadFile; @Query(name = "发布状态。 1发布，0未发布", display = true,type=Query.TYPE_DICT,dict="global_push_status") diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java index db49236d..73ea9138 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java @@ -5,7 +5,7 @@ import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; -import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionLogFromTypeEnum; +import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import javax.validation.constraints.NotNull; import java.util.Date; @@ -21,7 +21,7 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam { private Long teacherOpenCourseQuestionLogFromId; @Query(name = "来源类型（枚举）", display = false) @DictEnum - private TeacherOpenCourseQuestionLogFromTypeEnum teacherOpenCourseQuestionLogFromType; + private TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType; @Query(name = "题目快照ID", display = false) private Long resourcesQuestionSnapshotId; @Query(name = "学生提交的答案", display = false) @@ -63,10 +63,10 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam { public void setTeacherOpenCourseQuestionLogFromId(Long teacherOpenCourseQuestionLogFromId ){ this.teacherOpenCourseQuestionLogFromId = teacherOpenCourseQuestionLogFromId; } - public TeacherOpenCourseQuestionLogFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){ + public TeacherOpenCourseQuestionFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){ return teacherOpenCourseQuestionLogFromType; } - public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionLogFromTypeEnum teacherOpenCourseQuestionLogFromType ){ + public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType ){ this.teacherOpenCourseQuestionLogFromType = teacherOpenCourseQuestionLogFromType; } public Long getResourcesQuestionSnapshotId(){ diff --git a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java index d88412f8..30003885 100644 --- a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java +++ b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java @@ -13,11 +13,10 @@ import com.ibeetl.jlw.entity.ResourcesQuestion; import com.ibeetl.jlw.entity.SchoolClass; import com.ibeetl.jlw.entity.TeacherOpenCourse; import com.ibeetl.jlw.entity.TeacherOpenCourseHomework; -import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum; +import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkFromTypeEnum; import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery; import org.junit.Assert; -import org.junit.FixMethodOrder; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.RequestBuilder; @@ -32,7 +31,6 @@ import static com.ibeetl.admin.test.util.test.RandomUtils.getRandomString; import static com.ibeetl.admin.test.util.test.RandomUtils.randomPojo; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@FixMethodOrder() class TeacherOpenCourseHomeworkControllerTest extends BaseTest { private static final String MODEL = "/jlw/teacherOpenCourseHomework"; @@ -144,7 +142,7 @@ class TeacherOpenCourseHomeworkControllerTest extends BaseTest { , BeanUtil::ignoreFieldsHandler, (e) -> { // 随机取一个开课ID e.setTeacherOpenCourseId(RandomUtil.randomEle(openCourseList).getTeacherOpenCourseId()); - e.setTeacherOpenCourseHomeworkType(TeacherOpenCourseHomeworkTypeEnum.QUESTION); + e.setTeacherOpenCourseHomeworkType(TeacherOpenCourseHomeworkFromTypeEnum.QUESTION); e.setTeacherOpenCourseHomeworkStatus(1); e.setTeacherOpenCourseHomeworkPushStatus(1); diff --git a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java index 5bf8ceb0..e7f9e1b1 100644 --- a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java +++ b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java @@ -8,7 +8,7 @@ import com.ibeetl.jlw.dao.ResourcesQuestionSnapshotDao; import com.ibeetl.jlw.dao.StudentDao; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import com.ibeetl.jlw.entity.Student; -import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionLogFromTypeEnum; +import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import org.junit.Assert; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; @@ -92,8 +92,8 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest { TestEnvUtil.setProperty("user.orgId", student.getOrgId().toString()); // 随机来源类型 - TeacherOpenCourseQuestionLogFromTypeEnum fromTypeEnum = CollectionUtils - .firstElement(randomSet(TeacherOpenCourseQuestionLogFromTypeEnum.class)); + TeacherOpenCourseQuestionFromTypeEnum fromTypeEnum = CollectionUtils + .firstElement(randomSet(TeacherOpenCourseQuestionFromTypeEnum.class)); //构造请求参数 RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addQuestionLog.json")