修改题目快照表中开课课程字段

beetlsql3-dev
Mlxa0324 2 years ago
parent 187095a3da
commit 8274eef186

@ -47,6 +47,14 @@ public class CoreBaseAnnotationParser {
list.parallelStream().forEach(this::queryEntityAfter);
}
public void dictParser(Object object) {
if(object instanceof List) {
queryListAfter((List)object);
}else {
queryEntityAfter(object);
}
}
/**
*
*

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1667577974" Name="cjks" Objects="1229" Symbols="96" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1667578189" Name="cjks" Objects="1229" Symbols="96" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -19347,7 +19347,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>teacher_open_course_merge_resources_info</a:Code>
<a:CreationDate>1563157584</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1667577974</a:ModificationDate>
<a:ModificationDate>1667578189</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>开课关联- 资源管理-离线</a:Comment>
<a:PhysicalOptions>auto_increment = 1
@ -19443,6 +19443,17 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Length>4000</a:Length>
</o:Column>
<o:Column Id="o1156">
<a:ObjectID>21F5F058-AF92-4F55-B666-3DF75CF77936</a:ObjectID>
<a:Name>order_index</a:Name>
<a:Code>order_index</a:Code>
<a:CreationDate>1667577916</a:CreationDate>
<a:Creator>87966</a:Creator>
<a:ModificationDate>1667577974</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>资源排序</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o1157">
<a:ObjectID>DF0255D5-A8C9-43E8-9D9E-0DDFA19DFE5E</a:ObjectID>
<a:Name>user_id</a:Name>
<a:Code>user_id</a:Code>
@ -19453,7 +19464,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>后台用户ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o1157">
<o:Column Id="o1158">
<a:ObjectID>F6ACE349-86F0-4A59-90C0-5D89F9C43777</a:ObjectID>
<a:Name>org_id</a:Name>
<a:Code>org_id</a:Code>
@ -19464,17 +19475,6 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>组织机构ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o1158">
<a:ObjectID>21F5F058-AF92-4F55-B666-3DF75CF77936</a:ObjectID>
<a:Name>order_index</a:Name>
<a:Code>order_index</a:Code>
<a:CreationDate>1667577916</a:CreationDate>
<a:Creator>87966</a:Creator>
<a:ModificationDate>1667577974</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>资源排序</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o1159">

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1667578189" Name="cjks" Objects="1229" Symbols="96" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1667746197" Name="cjks" Objects="1218" Symbols="96" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -17135,13 +17135,13 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
<o:Column Id="o980">
<a:ObjectID>7CC923C5-15FB-416F-9848-3A6074318CB7</a:ObjectID>
<a:Name>course_info_id</a:Name>
<a:Code>course_info_id</a:Code>
<a:Name>teacher_open_course_merge_course_info_id</a:Name>
<a:Code>teacher_open_course_merge_course_info_id</a:Code>
<a:CreationDate>1623836619</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1663937886</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>课程ID</a:Comment>
<a:ModificationDate>1667746197</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>开课课程ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o981">

@ -46,7 +46,7 @@ drop table if exists resources_question_snapshot;
CREATE TABLE `resources_question_snapshot` (
`resources_question_snapshot_id` bigint(20) NOT NULL COMMENT '题目快照ID',
`teacher_open_course_question_setting_id` bigint(20) NOT NULL COMMENT '开课题目配置ID',
`course_info_id` bigint(20) DEFAULT NULL COMMENT '课程ID',
`teacher_open_course_merge_course_info_id` bigint(20) DEFAULT NULL COMMENT '开课课程ID',
`question_type` int(2) DEFAULT NULL COMMENT '题型(1单选 2多选 3判断)',
`question_score` decimal(3,1) DEFAULT NULL COMMENT '分值',
`question_stem` varchar(3000) DEFAULT NULL COMMENT '题干',

@ -26,9 +26,9 @@ public class ResourcesQuestionSnapshot extends BaseEntity{
private Long teacherOpenCourseQuestionSettingId ;
//课程ID
private Long courseInfoId ;
//开课课程ID
@Dict(type = "teacher_open_course_merge_course_info.course_info_name.course_info_status=1")
private Long teacherOpenCourseMergeCourseInfoId ;
//题型(1单选 2多选 3判断)
@ -112,19 +112,6 @@ public class ResourcesQuestionSnapshot extends BaseEntity{
this.teacherOpenCourseQuestionSettingId = teacherOpenCourseQuestionSettingId;
}
/**ID
*@return
*/
public Long getCourseInfoId(){
return courseInfoId;
}
/**ID
*@param courseInfoId
*/
public void setCourseInfoId(Long courseInfoId){
this.courseInfoId = courseInfoId;
}
/**(1 2 3)
*@return
*/
@ -302,4 +289,11 @@ public class ResourcesQuestionSnapshot extends BaseEntity{
}
public Long getTeacherOpenCourseMergeCourseInfoId() {
return teacherOpenCourseMergeCourseInfoId;
}
public void setTeacherOpenCourseMergeCourseInfoId(Long teacherOpenCourseMergeCourseInfoId) {
this.teacherOpenCourseMergeCourseInfoId = teacherOpenCourseMergeCourseInfoId;
}
}

@ -1,8 +1,10 @@
package com.ibeetl.jlw.entity.vo;
import com.ibeetl.admin.core.annotation.DictEnum;
import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
*
@ -10,7 +12,8 @@ import lombok.Data;
* @author mlx
*/
@Data
public class TeacherOpenCourseQuestionSettingVO {
@EqualsAndHashCode(callSuper=false)
public class TeacherOpenCourseQuestionSettingVO extends BaseEntity {
/**
*

@ -360,5 +360,4 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
@NotEmpty(message = "知识点ID不能为空") Set<Long> teacherOpenCourseKnowledgePointsIds) {
return null;
}
}

@ -17,6 +17,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao;
import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion;
import com.ibeetl.jlw.entity.vo.TeacherOpenCourseQuestionSettingVO;
import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesQuestionQuery;
import org.apache.commons.lang3.StringUtils;
@ -415,4 +416,15 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
teacherOpenCourseIdCondition.setTeacherOpenCourseId(teacherOpenCourseId);
deleteByCondition(teacherOpenCourseIdCondition);
}
/**
* ID
* @param teacherOpenCourseId
* @return
*/
public List<TeacherOpenCourseQuestionSettingVO> getGroupQuestionTypeCount(@NotNull(message = "开课ID不能为空") Long teacherOpenCourseId) {
List<TeacherOpenCourseQuestionSettingVO> g = teacherOpenCourseMergeResourcesQuestionDao.getGroupQuestionTypeCount(teacherOpenCourseId);
dictParser(g);
return g;
}
}

@ -1,6 +1,7 @@
package com.ibeetl.jlw.web;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.jlw.Interceptor.GetFile;
import cn.jlw.Interceptor.RFile;
import cn.jlw.Interceptor.SCoreUser;
@ -432,4 +433,16 @@ public class TeacherOpenCourseMergeResourcesQuestionController{
return JsonResult.success();
}
/**
* ---
* @param teacherOpenCourseId ID
* @param coreUser
* @return
*/
@PostMapping(API + "/questionTypeGroupInfo.do")
public JsonResult questionTypeGroupInfo(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) {
Assert.notNull(coreUser, "请登录后再操作");
return JsonResult.success(teacherOpenCourseMergeResourcesQuestionService.getGroupQuestionTypeCount(teacherOpenCourseId));
}
}

@ -1,12 +1,12 @@
package com.ibeetl.jlw.web;
import cn.hutool.core.lang.Assert;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionSetting;
import com.ibeetl.jlw.service.TeacherOpenCourseQuestionSettingService;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionSettingQuery;
@ -36,7 +36,6 @@ public class TeacherOpenCourseQuestionSettingController{
@Autowired private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService;
@Autowired private TeacherOpenCourseMergeResourcesQuestionDao teacherOpenCourseMergeResourcesQuestionDao;
@Autowired FileService fileService;
@ -88,6 +87,7 @@ public class TeacherOpenCourseQuestionSettingController{
if (result.hasErrors()) {
return JsonResult.failMessage(result);
}
Assert.notNull(coreUser, "请登录后再操作");
teacherOpenCourseQuestionSettingQuery.setUserId(coreUser.getId());
teacherOpenCourseQuestionSettingQuery.setOrgId(coreUser.getOrgId());
if (null == teacherOpenCourseQuestionSettingQuery.getTeacherOpenCourseQuestionSettingStatus()) {
@ -100,25 +100,6 @@ public class TeacherOpenCourseQuestionSettingController{
return JsonResult.success();
}
/**
* ---
* @param teacherOpenCourseId ID
* @param result
* @param coreUser
* @return
*/
@PostMapping(API + "/questionTypeGroupInfo.do")
public JsonResult questionTypeGroupInfo(Long teacherOpenCourseId,
BindingResult result, @SCoreUser CoreUser coreUser) {
if (result.hasErrors()) {
return JsonResult.failMessage(result);
}
return JsonResult.success(teacherOpenCourseMergeResourcesQuestionDao.getGroupQuestionTypeCount(teacherOpenCourseId));
}
/* 后台页面 */
@GetMapping(MODEL + "/index.do")

@ -21,8 +21,8 @@ public class ResourcesQuestionSnapshotQuery extends PageParam {
private Long resourcesQuestionSnapshotId;
@Query(name = "开课题目配置ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course_question_setting.teacher_open_course_question_setting_name.teacher_open_course_question_setting_status=1")
private Long teacherOpenCourseQuestionSettingId;
@Query(name = "课程ID", display = false)
private Long courseInfoId;
@Query(name = "开课课程ID", display = false)
private Long teacherOpenCourseMergeCourseInfoId;
@Query(name = "题型(1单选 2多选 3判断)", display = false)
private Integer questionType;
@Query(name = "分值", display = false)
@ -52,7 +52,7 @@ public class ResourcesQuestionSnapshotQuery extends PageParam {
private String resourcesQuestionSnapshotIdPlural;
private String teacherOpenCourseQuestionSettingIdPlural;
private String courseInfoIdPlural;
private String teacherOpenCourseMergeCourseInfoIdPlural;
private String questionTypePlural;
private String questionStatusPlural;
private String userIdPlural;
@ -65,108 +65,11 @@ public class ResourcesQuestionSnapshotQuery extends PageParam {
// 是否乱序
private boolean rand;
public Long getResourcesQuestionSnapshotId(){
return resourcesQuestionSnapshotId;
}
public void setResourcesQuestionSnapshotId(Long resourcesQuestionSnapshotId ){
this.resourcesQuestionSnapshotId = resourcesQuestionSnapshotId;
}
public Long getTeacherOpenCourseQuestionSettingId(){
return teacherOpenCourseQuestionSettingId;
}
public void setTeacherOpenCourseQuestionSettingId(Long teacherOpenCourseQuestionSettingId ){
this.teacherOpenCourseQuestionSettingId = teacherOpenCourseQuestionSettingId;
}
public Long getCourseInfoId(){
return courseInfoId;
}
public void setCourseInfoId(Long courseInfoId ){
this.courseInfoId = courseInfoId;
}
public Integer getQuestionType(){
return questionType;
}
public void setQuestionType(Integer questionType ){
this.questionType = questionType;
}
public BigDecimal getQuestionScore(){
return questionScore;
}
public void setQuestionScore(BigDecimal questionScore ){
this.questionScore = questionScore;
}
public String getQuestionStem(){
return questionStem;
}
public void setQuestionStem(String questionStem ){
this.questionStem = questionStem;
}
public String getQuestionOptionA(){
return questionOptionA;
}
public void setQuestionOptionA(String questionOptionA ){
this.questionOptionA = questionOptionA;
}
public String getQuestionOptionB(){
return questionOptionB;
}
public void setQuestionOptionB(String questionOptionB ){
this.questionOptionB = questionOptionB;
}
public String getQuestionOptionC(){
return questionOptionC;
}
public void setQuestionOptionC(String questionOptionC ){
this.questionOptionC = questionOptionC;
}
public String getQuestionOptionD(){
return questionOptionD;
}
public void setQuestionOptionD(String questionOptionD ){
this.questionOptionD = questionOptionD;
}
public String getQuestionOptionE(){
return questionOptionE;
}
public void setQuestionOptionE(String questionOptionE ){
this.questionOptionE = questionOptionE;
}
public String getQuestionAnswer(){
return questionAnswer;
}
public void setQuestionAnswer(String questionAnswer ){
this.questionAnswer = questionAnswer;
}
public String getQuestionAnalysis(){
return questionAnalysis;
}
public void setQuestionAnalysis(String questionAnalysis ){
this.questionAnalysis = questionAnalysis;
}
public Integer getQuestionStatus(){
return questionStatus;
}
public void setQuestionStatus(Integer questionStatus ){
this.questionStatus = questionStatus;
}
public Long getUserId(){
return userId;
}
public void setUserId(Long userId ){
this.userId = userId;
}
public Long getOrgId(){
return orgId;
}
public void setOrgId(Long orgId ){
this.orgId = orgId;
}
public ResourcesQuestionSnapshot pojo(){
ResourcesQuestionSnapshot pojo = new ResourcesQuestionSnapshot();
pojo.setResourcesQuestionSnapshotId(this.getResourcesQuestionSnapshotId());
pojo.setTeacherOpenCourseQuestionSettingId(this.getTeacherOpenCourseQuestionSettingId());
pojo.setCourseInfoId(this.getCourseInfoId());
pojo.setTeacherOpenCourseMergeCourseInfoId(this.getTeacherOpenCourseMergeCourseInfoId());
pojo.setQuestionType(this.getQuestionType());
pojo.setQuestionScore(this.getQuestionScore());
pojo.setQuestionStem(this.getQuestionStem());

@ -22,11 +22,11 @@ queryByCondition
@if(!isEmpty(teacherOpenCourseQuestionSettingIdPlural)){
and find_in_set(t.teacher_open_course_question_setting_id,#teacherOpenCourseQuestionSettingIdPlural#)
@}
@if(!isEmpty(courseInfoId)){
and t.course_info_id =#courseInfoId#
@if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
@}
@if(!isEmpty(courseInfoIdPlural)){
and find_in_set(t.course_info_id,#courseInfoIdPlural#)
@if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
@}
@if(!isEmpty(questionType)){
and t.question_type =#questionType#
@ -103,11 +103,11 @@ queryByConditionQuery
@if(!isEmpty(teacherOpenCourseQuestionSettingIdPlural)){
and find_in_set(t.teacher_open_course_question_setting_id,#teacherOpenCourseQuestionSettingIdPlural#)
@}
@if(!isEmpty(courseInfoId)){
and t.course_info_id =#courseInfoId#
@if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
@}
@if(!isEmpty(courseInfoIdPlural)){
and find_in_set(t.course_info_id,#courseInfoIdPlural#)
@if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
@}
@if(!isEmpty(questionType)){
and t.question_type =#questionType#
@ -193,11 +193,11 @@ updateGivenByIds
teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# ,
@}
@}
@if(contain("courseInfoId",_given)){
@if(isEmpty(courseInfoId)){
@if(contain("teacherOpenCourseMergeCourseInfoId",_given)){
@if(isEmpty(teacherOpenCourseMergeCourseInfoId)){
course_info_id = null ,
@}else{
course_info_id = #courseInfoId# ,
course_info_id = #teacherOpenCourseMergeCourseInfoId# ,
@}
@}
@if(contain("questionType",_given)){
@ -310,8 +310,8 @@ getResourcesQuestionSnapshotValues
@if(!isEmpty(teacherOpenCourseQuestionSettingId)){
and t.teacher_open_course_question_setting_id =#teacherOpenCourseQuestionSettingId#
@}
@if(!isEmpty(courseInfoId)){
and t.course_info_id =#courseInfoId#
@if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
@}
@if(!isEmpty(questionType)){
and t.question_type =#questionType#
@ -374,11 +374,11 @@ getValuesByQuery
@if(!isEmpty(teacherOpenCourseQuestionSettingIdPlural)){
and find_in_set(t.teacher_open_course_question_setting_id,#teacherOpenCourseQuestionSettingIdPlural#)
@}
@if(!isEmpty(courseInfoId)){
and t.course_info_id =#courseInfoId#
@if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
@}
@if(!isEmpty(courseInfoIdPlural)){
and find_in_set(t.course_info_id,#courseInfoIdPlural#)
@if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
@}
@if(!isEmpty(questionType)){
and t.question_type =#questionType#

@ -49,11 +49,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hide:$.isEmpty(sx_['teacherOpenCourseQuestionSettingIdText'])?false:sx_['teacherOpenCourseQuestionSettingIdText'],
},
{
field : 'courseInfoId',
field : 'teacherOpenCourseMergeCourseInfoIdText',
title : '课程ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['courseInfoId'])?false:sx_['courseInfoId'],
hide:$.isEmpty(sx_['teacherOpenCourseMergeCourseInfoIdText'])?false:sx_['teacherOpenCourseMergeCourseInfoIdText'],
},
{
field : 'questionType',

@ -13,7 +13,7 @@
<div class="layui-inline">
<label class="layui-form-label">课程ID</label>
<div class="layui-input-inline">
<input type="text" id="courseInfoId" name="courseInfoId" value="${resourcesQuestionSnapshot.courseInfoId}" class="layui-input" >
<input type="text" id="teacherOpenCourseMergeCourseInfoId" name="teacherOpenCourseMergeCourseInfoId" value="${resourcesQuestionSnapshot.teacherOpenCourseMergeCourseInfoId}" class="layui-input" >
</div>
</div>
</div>

@ -11,9 +11,9 @@
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">课程ID</label>
<label class="layui-form-label">开课课程ID</label>
<div class="layui-input-inline">
<input type="text" id="courseInfoId" name="courseInfoId" value="${resourcesQuestionSnapshot.courseInfoId}" class="layui-input" >
<input type="text" id="teacherOpenCourseMergeCourseInfoId" name="teacherOpenCourseMergeCourseInfoId" value="${resourcesQuestionSnapshot.teacherOpenCourseMergeCourseInfoId}" class="layui-input" >
</div>
</div>
</div>

Loading…
Cancel
Save