tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

查询分数信息，未完

Browse Source
beetlsql3-dev
Mlxa0324 3 years ago
parent 1a64e3e992
commit 3df45ee621
15 changed files with 125 additions and 47 deletions
Show Stats Download Patch File Download Diff File

8
web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java
Unescape Escape View File

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.annotation.DictEnum;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; 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 org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -29,7 +29,7 @@ public class ResourcesQuestionSnapshot extends BaseEntity {
//来源类型（HOMEWORK...） //来源类型（HOMEWORK...）
@DictEnum @DictEnum
private TeacherOpenCourseHomeworkTypeEnum fromType ; private TeacherOpenCourseQuestionFromTypeEnum fromType ;
//课程ID //课程ID
@ -119,13 +119,13 @@ public class ResourcesQuestionSnapshot extends BaseEntity {
/**来源类型（HOMEWORK...） /**来源类型（HOMEWORK...）
*@return *@return
*/ */
public TeacherOpenCourseHomeworkTypeEnum getFromType(){ public TeacherOpenCourseQuestionFromTypeEnum getFromType(){
return fromType; return fromType;
} }
/**来源类型（HOMEWORK...） /**来源类型（HOMEWORK...）
*@param fromType *@param fromType
*/ */
public void setFromType(TeacherOpenCourseHomeworkTypeEnum fromType){ public void setFromType(TeacherOpenCourseQuestionFromTypeEnum fromType){
this.fromType = fromType; this.fromType = fromType;
} }

8
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomework.java
Unescape Escape View File

@ -4,7 +4,7 @@ import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.annotation.DictEnum;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; 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 org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -47,7 +47,7 @@ public class TeacherOpenCourseHomework extends BaseEntity{
//作业类型。 题库作业QUESTION，附件FILE //作业类型。 题库作业QUESTION，附件FILE
@DictEnum @DictEnum
private TeacherOpenCourseHomeworkTypeEnum teacherOpenCourseHomeworkType ; private TeacherOpenCourseHomeworkFromTypeEnum teacherOpenCourseHomeworkType ;
//附件，老师上传附件（单文件） //附件，老师上传附件（单文件）
@ -159,13 +159,13 @@ public class TeacherOpenCourseHomework extends BaseEntity{
/**作业类型。 题库作业QUESTION，附件FILE /**作业类型。 题库作业QUESTION，附件FILE
*@return *@return
*/ */
public TeacherOpenCourseHomeworkTypeEnum getTeacherOpenCourseHomeworkType(){ public TeacherOpenCourseHomeworkFromTypeEnum getTeacherOpenCourseHomeworkType(){
return teacherOpenCourseHomeworkType; return teacherOpenCourseHomeworkType;
} }
/**作业类型。 题库作业QUESTION，附件FILE /**作业类型。 题库作业QUESTION，附件FILE
*@param teacherOpenCourseHomeworkType *@param teacherOpenCourseHomeworkType
*/ */
public void setTeacherOpenCourseHomeworkType(TeacherOpenCourseHomeworkTypeEnum teacherOpenCourseHomeworkType){ public void setTeacherOpenCourseHomeworkType(TeacherOpenCourseHomeworkFromTypeEnum teacherOpenCourseHomeworkType){
this.teacherOpenCourseHomeworkType = teacherOpenCourseHomeworkType; this.teacherOpenCourseHomeworkType = teacherOpenCourseHomeworkType;
} }

8
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java
Unescape Escape View File

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; 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 org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -28,7 +28,7 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{
//来源类型（枚举） //来源类型（枚举）
private TeacherOpenCourseQuestionLogFromTypeEnum teacherOpenCourseQuestionLogFromType ; private TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType ;
//题目快照ID //题目快照ID
@ -95,13 +95,13 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{
/**来源类型（枚举） /**来源类型（枚举）
*@return *@return
*/ */
public TeacherOpenCourseQuestionLogFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){ public TeacherOpenCourseQuestionFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){
return teacherOpenCourseQuestionLogFromType; return teacherOpenCourseQuestionLogFromType;
} }
/**来源类型（枚举） /**来源类型（枚举）
*@param teacherOpenCourseQuestionLogFromType *@param teacherOpenCourseQuestionLogFromType
*/ */
public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionLogFromTypeEnum teacherOpenCourseQuestionLogFromType){ public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType){
this.teacherOpenCourseQuestionLogFromType = teacherOpenCourseQuestionLogFromType; this.teacherOpenCourseQuestionLogFromType = teacherOpenCourseQuestionLogFromType;
} }

50
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo.java
Unescape Escape View File

@ -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<TeacherOpenCourseQuestionLog> a;
}

6
web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseHomeworkTypeEnum.java → web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseHomeworkFromTypeEnum.java
Unescape Escape View File

@ -5,14 +5,14 @@ import lombok.Getter;
/** /**
* <p> * <p>
* 教师开课-作业来源类型 * 教师开课-作业 homework 的来源类型
* </p> * </p>
* *
* @author mlx * @author mlx
* @date 2022/9/23 * @date 2022/9/23
* @modified * @modified
*/ */
public enum TeacherOpenCourseHomeworkTypeEnum { public enum TeacherOpenCourseHomeworkFromTypeEnum {
QUESTION("题目"), QUESTION("题目"),
@ -20,7 +20,7 @@ public enum TeacherOpenCourseHomeworkTypeEnum {
@Getter @Getter
private String text; private String text;
TeacherOpenCourseHomeworkTypeEnum(String text) { TeacherOpenCourseHomeworkFromTypeEnum(String text) {
this.text = text; this.text = text;
} }
} }

6
web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseQuestionLogFromTypeEnum.java → web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseQuestionFromTypeEnum.java
Unescape Escape View File

@ -5,7 +5,7 @@ import lombok.Getter;
/** /**
* <p> * <p>
* 教师开课-题目日志来源类型 * 教师开课-题目来源类型
* *
* </p> * </p>
* *
@ -13,7 +13,7 @@ import lombok.Getter;
* @date 2022/9/23 * @date 2022/9/23
* @modified * @modified
*/ */
public enum TeacherOpenCourseQuestionLogFromTypeEnum { public enum TeacherOpenCourseQuestionFromTypeEnum {
HOMEWORK("作业"), HOMEWORK("作业"),
@ -23,7 +23,7 @@ public enum TeacherOpenCourseQuestionLogFromTypeEnum {
@Getter @Getter
private String text; private String text;
TeacherOpenCourseQuestionLogFromTypeEnum(String text) { TeacherOpenCourseQuestionFromTypeEnum(String text) {
this.text = text; this.text = text;
} }
} }

2
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java
Unescape Escape View File

@ -180,7 +180,7 @@ public class TeacherOpenCourseHomeworkService extends CoreBaseService<TeacherOpe
add(homeworkQuery); add(homeworkQuery);
// 添加作业设置，添加题目快照关联信息 // 添加作业设置，添加题目快照关联信息
teacherOpenCourseHomeworkSettingService.addHomeWordBySetting(homeworkQuery.getTeacherOpenCourseHomeworkSettingQuery(), homeworkQuery.getTeacherOpenCourseHomeworkType()); teacherOpenCourseHomeworkSettingService.addHomeWordBySetting(homeworkQuery.getTeacherOpenCourseHomeworkSettingQuery());
} }
/** /**

8
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java
Unescape Escape View File

@ -15,7 +15,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseHomeworkSettingDao;
import com.ibeetl.jlw.entity.ResourcesQuestion; import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkSetting; import com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkSetting;
import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum; import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum;
import com.ibeetl.jlw.web.query.ResourcesQuestionQuery; import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -111,7 +111,7 @@ public class TeacherOpenCourseHomeworkSettingService extends CoreBaseService<Tea
* 插入题目快照 * 插入题目快照
* @param query * @param query
*/ */
private void insertQuestionSnapshot(TeacherOpenCourseHomeworkSettingQuery query, TeacherOpenCourseHomeworkTypeEnum fromType) { private void insertQuestionSnapshot(TeacherOpenCourseHomeworkSettingQuery query, TeacherOpenCourseQuestionFromTypeEnum fromType) {
// 查询题目ID对应的题目列表 // 查询题目ID对应的题目列表
ResourcesQuestionQuery resourcesQuestionQuery = new ResourcesQuestionQuery(); ResourcesQuestionQuery resourcesQuestionQuery = new ResourcesQuestionQuery();
resourcesQuestionQuery.setResourcesQuestionIds(query.getResourcesQuestionIdPlural()); resourcesQuestionQuery.setResourcesQuestionIds(query.getResourcesQuestionIdPlural());
@ -185,12 +185,12 @@ public class TeacherOpenCourseHomeworkSettingService extends CoreBaseService<Tea
* 通过配置项添加作业 * 通过配置项添加作业
* @param teacherOpenCourseHomeworkSettingQuery * @param teacherOpenCourseHomeworkSettingQuery
*/ */
public void addHomeWordBySetting(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery, TeacherOpenCourseHomeworkTypeEnum fromType) { public void addHomeWordBySetting(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery) {
// 保存记录 // 保存记录
add(teacherOpenCourseHomeworkSettingQuery); add(teacherOpenCourseHomeworkSettingQuery);
// 插入题目快照 // 插入题目快照
insertQuestionSnapshot(teacherOpenCourseHomeworkSettingQuery, fromType); insertQuestionSnapshot(teacherOpenCourseHomeworkSettingQuery, TeacherOpenCourseQuestionFromTypeEnum.HOMEWORK);
} }
} }

9
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
Unescape Escape View File

@ -11,7 +11,8 @@ import com.ibeetl.jlw.dao.StudentDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionLogDao; import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionLogDao;
import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionLogFromTypeEnum; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogScoreInfo;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId; import org.beetl.sql.core.SqlId;
@ -157,7 +158,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
* @param questionLogMap <题目ID, [数组：前端传递过来不需要考虑排序和重复问题]> 例： {"10086": ["D", "A", "B", "A"]} * @param questionLogMap <题目ID, [数组：前端传递过来不需要考虑排序和重复问题]> 例： {"10086": ["D", "A", "B", "A"]}
* @param fromType 来源类型 * @param fromType 来源类型
*/ */
public void addQuestionLog(Map<Long, TreeSet<String>> questionLogMap, final TeacherOpenCourseQuestionLogFromTypeEnum fromType) { public void addQuestionLog(Map<Long, TreeSet<String>> questionLogMap, final TeacherOpenCourseQuestionFromTypeEnum fromType) {
// 查询学生身份 // 查询学生身份
Student student = studentDao.getByUserId(getUserId()); Student student = studentDao.getByUserId(getUserId());
@ -190,4 +191,8 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
// 批量入库 // 批量入库
insertBatch(list); insertBatch(list);
} }
public TeacherOpenCourseQuestionLogScoreInfo getScoreInfo(final Long fromId, final TeacherOpenCourseQuestionFromTypeEnum fromType) {
return null;
}
} }

31
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java
Unescape Escape View File

@ -8,7 +8,8 @@ import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService; import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionLogFromTypeEnum; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogScoreInfo;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum;
import com.ibeetl.jlw.service.TeacherOpenCourseQuestionLogService; import com.ibeetl.jlw.service.TeacherOpenCourseQuestionLogService;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -209,10 +210,10 @@ public class TeacherOpenCourseQuestionLogController{
@Function("teacherOpenCourseQuestionLog.add") @Function("teacherOpenCourseQuestionLog.add")
@ResponseBody @ResponseBody
public JsonResult addQuestionLog( public JsonResult addQuestionLog(
@RequestBody @NotEmpty(message = "请上传题目ID和答案！") @RequestBody @NotEmpty(message = "请上传题目快照ID和答案！")
Map<Long, TreeSet<String>> questionLogMap, Map<Long, TreeSet<String>> questionLogMap,
@NotNull(message = "来源类型不能为空！") @NotNull(message = "来源类型不能为空！")
TeacherOpenCourseQuestionLogFromTypeEnum fromType, TeacherOpenCourseQuestionFromTypeEnum fromType,
@SCoreUser @SCoreUser
CoreUser coreUser) { CoreUser coreUser) {
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!"); Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!");
@ -220,4 +221,28 @@ public class TeacherOpenCourseQuestionLogController{
return JsonResult.success(); return JsonResult.success();
} }
/**
* 查询分数信息
* 支持根据来源类型查询
*
* @param questionSnapshotIds
* @param fromType
* @param coreUser
* @return
*/
@PostMapping(MODEL + "/getScoreInfo.json")
@Function("teacherOpenCourseQuestionLog.add")
@ResponseBody
public JsonResult<TeacherOpenCourseQuestionLogScoreInfo> 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));
}
} }

8
web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java
Unescape Escape View File

@ -4,7 +4,7 @@ import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.admin.core.web.query.PageParam;
import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum; import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -19,7 +19,7 @@ public class ResourcesQuestionSnapshotQuery extends PageParam {
@Query(name = "来源ID", display = false) @Query(name = "来源ID", display = false)
private Long fromId; private Long fromId;
@Query(name = "来源类型（HOMEWORK...）", display = false) @Query(name = "来源类型（HOMEWORK...）", display = false)
private TeacherOpenCourseHomeworkTypeEnum fromType; private TeacherOpenCourseQuestionFromTypeEnum fromType;
@Query(name = "课程ID", display = false) @Query(name = "课程ID", display = false)
private Long courseInfoId; private Long courseInfoId;
@Query(name = "题型(1单选 2多选 3判断)", display = false) @Query(name = "题型(1单选 2多选 3判断)", display = false)
@ -77,10 +77,10 @@ public class ResourcesQuestionSnapshotQuery extends PageParam {
public void setFromId(Long fromId ){ public void setFromId(Long fromId ){
this.fromId = fromId; this.fromId = fromId;
} }
public TeacherOpenCourseHomeworkTypeEnum getFromType(){ public TeacherOpenCourseQuestionFromTypeEnum getFromType(){
return fromType; return fromType;
} }
public void setFromType(TeacherOpenCourseHomeworkTypeEnum fromType ){ public void setFromType(TeacherOpenCourseQuestionFromTypeEnum fromType ){
this.fromType = fromType; this.fromType = fromType;
} }
public Long getCourseInfoId(){ public Long getCourseInfoId(){

8
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuery.java
Unescape Escape View File

@ -4,15 +4,15 @@ import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.admin.core.web.query.PageParam;
import com.ibeetl.jlw.entity.TeacherOpenCourseHomework; import com.ibeetl.jlw.entity.TeacherOpenCourseHomework;
import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum; import com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkFromTypeEnum;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
import static com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum.FILE; import static com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkFromTypeEnum.FILE;
import static com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkTypeEnum.QUESTION; import static com.ibeetl.jlw.enums.TeacherOpenCourseHomeworkFromTypeEnum.QUESTION;
/** /**
*开课作业查询 *开课作业查询
@ -44,7 +44,7 @@ public class TeacherOpenCourseHomeworkQuery extends PageParam {
private Date teacherOpenCourseHomeworkEndTime; private Date teacherOpenCourseHomeworkEndTime;
@NotNull(message = "作业类型不能为空") @NotNull(message = "作业类型不能为空")
@Query(name = "作业类型。 题库作业QUESTION，附件FILE", display = false) @Query(name = "作业类型。 题库作业QUESTION，附件FILE", display = false)
private TeacherOpenCourseHomeworkTypeEnum teacherOpenCourseHomeworkType; private TeacherOpenCourseHomeworkFromTypeEnum teacherOpenCourseHomeworkType;
@Query(name = "附件，老师上传附件（单文件）", display = false) @Query(name = "附件，老师上传附件（单文件）", display = false)
private String teacherOpenCourseHomeworkUploadFile; private String teacherOpenCourseHomeworkUploadFile;
@Query(name = "发布状态。 1发布，0未发布", display = true,type=Query.TYPE_DICT,dict="global_push_status") @Query(name = "发布状态。 1发布，0未发布", display = true,type=Query.TYPE_DICT,dict="global_push_status")

8
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java
Unescape Escape View File

@ -5,7 +5,7 @@ import com.ibeetl.admin.core.annotation.DictEnum;
import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.admin.core.web.query.PageParam;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionLogFromTypeEnum; import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
@ -21,7 +21,7 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam {
private Long teacherOpenCourseQuestionLogFromId; private Long teacherOpenCourseQuestionLogFromId;
@Query(name = "来源类型（枚举）", display = false) @Query(name = "来源类型（枚举）", display = false)
@DictEnum @DictEnum
private TeacherOpenCourseQuestionLogFromTypeEnum teacherOpenCourseQuestionLogFromType; private TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType;
@Query(name = "题目快照ID", display = false) @Query(name = "题目快照ID", display = false)
private Long resourcesQuestionSnapshotId; private Long resourcesQuestionSnapshotId;
@Query(name = "学生提交的答案", display = false) @Query(name = "学生提交的答案", display = false)
@ -63,10 +63,10 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam {
public void setTeacherOpenCourseQuestionLogFromId(Long teacherOpenCourseQuestionLogFromId ){ public void setTeacherOpenCourseQuestionLogFromId(Long teacherOpenCourseQuestionLogFromId ){
this.teacherOpenCourseQuestionLogFromId = teacherOpenCourseQuestionLogFromId; this.teacherOpenCourseQuestionLogFromId = teacherOpenCourseQuestionLogFromId;
} }
public TeacherOpenCourseQuestionLogFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){ public TeacherOpenCourseQuestionFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){
return teacherOpenCourseQuestionLogFromType; return teacherOpenCourseQuestionLogFromType;
} }
public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionLogFromTypeEnum teacherOpenCourseQuestionLogFromType ){ public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType ){
this.teacherOpenCourseQuestionLogFromType = teacherOpenCourseQuestionLogFromType; this.teacherOpenCourseQuestionLogFromType = teacherOpenCourseQuestionLogFromType;
} }
public Long getResourcesQuestionSnapshotId(){ public Long getResourcesQuestionSnapshotId(){

6
web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java
Unescape Escape View File

@ -13,11 +13,10 @@ import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.entity.SchoolClass; import com.ibeetl.jlw.entity.SchoolClass;
import com.ibeetl.jlw.entity.TeacherOpenCourse; import com.ibeetl.jlw.entity.TeacherOpenCourse;
import com.ibeetl.jlw.entity.TeacherOpenCourseHomework; 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.TeacherOpenCourseHomeworkQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery;
import org.junit.Assert; import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.RequestBuilder; 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 com.ibeetl.admin.test.util.test.RandomUtils.randomPojo;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@FixMethodOrder()
class TeacherOpenCourseHomeworkControllerTest extends BaseTest { class TeacherOpenCourseHomeworkControllerTest extends BaseTest {
private static final String MODEL = "/jlw/teacherOpenCourseHomework"; private static final String MODEL = "/jlw/teacherOpenCourseHomework";
@ -144,7 +142,7 @@ class TeacherOpenCourseHomeworkControllerTest extends BaseTest {
, BeanUtil::ignoreFieldsHandler, (e) -> { , BeanUtil::ignoreFieldsHandler, (e) -> {
// 随机取一个开课ID // 随机取一个开课ID
e.setTeacherOpenCourseId(RandomUtil.randomEle(openCourseList).getTeacherOpenCourseId()); e.setTeacherOpenCourseId(RandomUtil.randomEle(openCourseList).getTeacherOpenCourseId());
e.setTeacherOpenCourseHomeworkType(TeacherOpenCourseHomeworkTypeEnum.QUESTION); e.setTeacherOpenCourseHomeworkType(TeacherOpenCourseHomeworkFromTypeEnum.QUESTION);
e.setTeacherOpenCourseHomeworkStatus(1); e.setTeacherOpenCourseHomeworkStatus(1);
e.setTeacherOpenCourseHomeworkPushStatus(1); e.setTeacherOpenCourseHomeworkPushStatus(1);

6
web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java
Unescape Escape View File

@ -8,7 +8,7 @@ import com.ibeetl.jlw.dao.ResourcesQuestionSnapshotDao;
import com.ibeetl.jlw.dao.StudentDao; import com.ibeetl.jlw.dao.StudentDao;
import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.entity.Student; 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.Assert;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -92,8 +92,8 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
TestEnvUtil.setProperty("user.orgId", student.getOrgId().toString()); TestEnvUtil.setProperty("user.orgId", student.getOrgId().toString());
// 随机来源类型 // 随机来源类型
TeacherOpenCourseQuestionLogFromTypeEnum fromTypeEnum = CollectionUtils TeacherOpenCourseQuestionFromTypeEnum fromTypeEnum = CollectionUtils
.firstElement(randomSet(TeacherOpenCourseQuestionLogFromTypeEnum.class)); .firstElement(randomSet(TeacherOpenCourseQuestionFromTypeEnum.class));
//构造请求参数 //构造请求参数
RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addQuestionLog.json") RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addQuestionLog.json")

Write Preview
Loading…
Cancel
Save