From af48bc2491cfa953f9412f7800194c3e1650db28 Mon Sep 17 00:00:00 2001 From: Mlxa0324 <mlx950324@163.com> Date: Thu, 22 Sep 2022 23:14:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=80=E8=AF=BE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ibeetl/admin/core/conf/BeetlConf.java | 4 +- .../core/util/beetl/SearchIsShowFunction.java | 37 +++ .../resources/codeTemplate/html/index.html | 2 +- .../TeacherOpenCourseHomeworkSettingDao.java | 25 ++ .../TeacherOpenCourseHomeworkSetting.java | 175 ++++++++++++ ...acherOpenCourseHomeworkSettingService.java | 147 ++++++++++ ...erOpenCourseHomeworkSettingController.java | 193 +++++++++++++ ...TeacherOpenCourseHomeworkSettingQuery.java | 141 +++++++++ .../jlw/teacherOpenCourseHomeworkSetting.md | 267 ++++++++++++++++++ .../teacherOpenCourseHomeworkSetting/add.js | 38 +++ .../teacherOpenCourseHomeworkSetting/del.js | 23 ++ .../teacherOpenCourseHomeworkSetting/edit.js | 28 ++ .../teacherOpenCourseHomeworkSetting/index.js | 185 ++++++++++++ .../teacherOpenCourseHomeworkSettingApi.js | 18 ++ .../jlw/schoolClassStudent/index.html | 2 +- .../jlw/studentClientLink/index.html | 2 +- .../jlw/teacherOpenCourse/index.html | 2 +- .../jlw/teacherOpenCourseChatLog/index.html | 2 +- .../teacherOpenCourseHomeworkSetting/add.html | 78 +++++ .../edit.html | 78 +++++ .../index.html | 29 ++ .../index.html | 2 +- .../teacherOpenCourseMergeStudent/index.html | 2 +- .../teacherOpenCourseMergeTeacher/index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../jlw/universityFaculty/index.html | 2 +- .../templates/jlw/universitySystem/index.html | 2 +- 33 files changed, 1482 insertions(+), 18 deletions(-) create mode 100644 admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/SearchIsShowFunction.java create mode 100644 web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkSettingDao.java create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkSetting.java create mode 100644 web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkSettingController.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkSettingQuery.java create mode 100644 web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkSetting.md create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/add.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/del.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/edit.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/index.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/teacherOpenCourseHomeworkSettingApi.js create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/add.html create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/edit.html create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/index.html diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java b/admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java index 5665537e..a16286d3 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java @@ -53,6 +53,8 @@ public class BeetlConf { @Resource SearchConditionFunction searchConditionFunction; + @Resource + SearchIsShowFunction searchIsShowFunction; @Resource DataAccessFactory dataAccessFactory; @@ -94,8 +96,8 @@ public class BeetlConf { groupTemplate.registerFunction("core.file", fileFunction); groupTemplate.registerFormat("xss", new XXSDefenderFormat()); groupTemplate.registerFunction("uuid", new UUIDFunction()); - groupTemplate.registerFunction("uuid", new UUIDFunction()); groupTemplate.registerFunction("session",sessionFunction); + groupTemplate.registerFunction("core.searchIsShow", searchIsShowFunction); groupTemplate.registerFunctionPackage("dict", dictDownQueryFunction); // 模板页面判断是否有按钮权限,比如canAccess groupTemplate.registerFunction("canAccess", (paras, ctx) -> { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/SearchIsShowFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/SearchIsShowFunction.java new file mode 100644 index 00000000..8189e0fc --- /dev/null +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/SearchIsShowFunction.java @@ -0,0 +1,37 @@ +package com.ibeetl.admin.core.util.beetl; + +import cn.hutool.core.util.ObjectUtil; +import com.ibeetl.admin.core.annotation.Query; +import com.ibeetl.admin.core.util.AnnotationUtil; +import org.beetl.core.Context; +import org.beetl.core.Function; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +/** + * 根据ClassName 获取Query的数量,方便显示搜索按钮 + * @author lx + */ +@Component +public class SearchIsShowFunction implements Function { + + private final Logger log = LoggerFactory.getLogger(this.getClass()); + + @Override + public Object call(Object[] objects, Context context) { + String className = (String) objects[0]; + try { + List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, Class.forName(className)); + // 获取实体类中的注解,过滤属性display值为true + return ObjectUtil.isNotEmpty(list) && list.stream().anyMatch(e -> Boolean.parseBoolean(String.valueOf(e.get("display")))); + } catch (ClassNotFoundException e ) { + e.printStackTrace(); + log.error("异常信息:SearchIsShowFunction {}", e.getMessage()); + return false; + } + } +} diff --git a/admin-core/src/main/resources/codeTemplate/html/index.html b/admin-core/src/main/resources/codeTemplate/html/index.html index 5ef3c790..53857c16 100644 --- a/admin-core/src/main/resources/codeTemplate/html/index.html +++ b/admin-core/src/main/resources/codeTemplate/html/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_${entity.code}"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="${entity.code}.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="${entity.code}.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkSettingDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkSettingDao.java new file mode 100644 index 00000000..53596d8b --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkSettingDao.java @@ -0,0 +1,25 @@ +package com.ibeetl.jlw.dao; + +import com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkSetting; +import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery; +import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.annotation.Update; + +import java.util.List; + +/** + * 作业布置 Dao + */ +@SqlResource("jlw.teacherOpenCourseHomeworkSetting") +public interface TeacherOpenCourseHomeworkSettingDao extends BaseMapper<TeacherOpenCourseHomeworkSetting>{ + PageQuery<TeacherOpenCourseHomeworkSetting> queryByCondition(PageQuery query); + PageQuery<TeacherOpenCourseHomeworkSetting> queryByConditionQuery(PageQuery query); + @Update + void deleteTeacherOpenCourseHomeworkSettingByIds(String ids); + @Update + int updateGivenByIds(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery); + List<TeacherOpenCourseHomeworkSetting> getByIds(String ids); + List<TeacherOpenCourseHomeworkSetting> getValuesByQuery(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery); +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkSetting.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkSetting.java new file mode 100644 index 00000000..22b90edb --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkSetting.java @@ -0,0 +1,175 @@ +package com.ibeetl.jlw.entity; + +import com.ibeetl.admin.core.entity.BaseEntity; +import com.ibeetl.admin.core.util.ValidateConfig; +import org.beetl.sql.annotation.entity.AssignID; + +import javax.validation.constraints.NotNull; + +/* +* 我的课程-题库作业-作业设置 +* gen by Spring Boot2 Admin 2022-09-22 +*/ +public class TeacherOpenCourseHomeworkSetting extends BaseEntity{ + + //作业设置ID + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) + @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkSetting") + + private Long teacherOpenCourseQuestionHomeworkSettingId ; + + //作答次数 + + private Integer teacherOpenCourseQuestionHomeworkSettingDoCount ; + + //题目乱序(同一大题内) + + private Integer teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder ; + + //选项乱序(限单选、多选) + + private Integer teacherOpenCourseQuestionHomeworkSettingOptionNoOrder ; + + //答卷后显示答案解析 + + private Integer teacherOpenCourseQuestionHomeworkSettingEndShowQa ; + + //答卷后显示答案对错 + + private Integer endShowTrueFalse ; + + //创建时间 + + private Integer teacherOpenCourseQuestionHomeworkSettingAddTime ; + + //组织ID + + private Long orgId ; + + //用户ID + + private Long userId ; + + public TeacherOpenCourseHomeworkSetting(){ + } + + /**作业设置ID + *@return + */ + public Long getTeacherOpenCourseQuestionHomeworkSettingId(){ + return teacherOpenCourseQuestionHomeworkSettingId; + } + /**作业设置ID + *@param teacherOpenCourseQuestionHomeworkSettingId + */ + public void setTeacherOpenCourseQuestionHomeworkSettingId(Long teacherOpenCourseQuestionHomeworkSettingId){ + this.teacherOpenCourseQuestionHomeworkSettingId = teacherOpenCourseQuestionHomeworkSettingId; + } + + /**作答次数 + *@return + */ + public Integer getTeacherOpenCourseQuestionHomeworkSettingDoCount(){ + return teacherOpenCourseQuestionHomeworkSettingDoCount; + } + /**作答次数 + *@param teacherOpenCourseQuestionHomeworkSettingDoCount + */ + public void setTeacherOpenCourseQuestionHomeworkSettingDoCount(Integer teacherOpenCourseQuestionHomeworkSettingDoCount){ + this.teacherOpenCourseQuestionHomeworkSettingDoCount = teacherOpenCourseQuestionHomeworkSettingDoCount; + } + + /**题目乱序(同一大题内) + *@return + */ + public Integer getTeacherOpenCourseQuestionHomeworkSettingQuestionNoOrder(){ + return teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder; + } + /**题目乱序(同一大题内) + *@param teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder + */ + public void setTeacherOpenCourseQuestionHomeworkSettingQuestionNoOrder(Integer teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder){ + this.teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder = teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder; + } + + /**选项乱序(限单选、多选) + *@return + */ + public Integer getTeacherOpenCourseQuestionHomeworkSettingOptionNoOrder(){ + return teacherOpenCourseQuestionHomeworkSettingOptionNoOrder; + } + /**选项乱序(限单选、多选) + *@param teacherOpenCourseQuestionHomeworkSettingOptionNoOrder + */ + public void setTeacherOpenCourseQuestionHomeworkSettingOptionNoOrder(Integer teacherOpenCourseQuestionHomeworkSettingOptionNoOrder){ + this.teacherOpenCourseQuestionHomeworkSettingOptionNoOrder = teacherOpenCourseQuestionHomeworkSettingOptionNoOrder; + } + + /**答卷后显示答案解析 + *@return + */ + public Integer getTeacherOpenCourseQuestionHomeworkSettingEndShowQa(){ + return teacherOpenCourseQuestionHomeworkSettingEndShowQa; + } + /**答卷后显示答案解析 + *@param teacherOpenCourseQuestionHomeworkSettingEndShowQa + */ + public void setTeacherOpenCourseQuestionHomeworkSettingEndShowQa(Integer teacherOpenCourseQuestionHomeworkSettingEndShowQa){ + this.teacherOpenCourseQuestionHomeworkSettingEndShowQa = teacherOpenCourseQuestionHomeworkSettingEndShowQa; + } + + /**答卷后显示答案对错 + *@return + */ + public Integer getEndShowTrueFalse(){ + return endShowTrueFalse; + } + /**答卷后显示答案对错 + *@param endShowTrueFalse + */ + public void setEndShowTrueFalse(Integer endShowTrueFalse){ + this.endShowTrueFalse = endShowTrueFalse; + } + + /**创建时间 + *@return + */ + public Integer getTeacherOpenCourseQuestionHomeworkSettingAddTime(){ + return teacherOpenCourseQuestionHomeworkSettingAddTime; + } + /**创建时间 + *@param teacherOpenCourseQuestionHomeworkSettingAddTime + */ + public void setTeacherOpenCourseQuestionHomeworkSettingAddTime(Integer teacherOpenCourseQuestionHomeworkSettingAddTime){ + this.teacherOpenCourseQuestionHomeworkSettingAddTime = teacherOpenCourseQuestionHomeworkSettingAddTime; + } + + /**组织ID + *@return + */ + public Long getOrgId(){ + return orgId; + } + /**组织ID + *@param orgId + */ + public void setOrgId(Long orgId){ + this.orgId = orgId; + } + + /**用户ID + *@return + */ + public Long getUserId(){ + return userId; + } + /**用户ID + *@param userId + */ + public void setUserId(Long userId){ + this.userId = userId; + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java new file mode 100644 index 00000000..f049504c --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java @@ -0,0 +1,147 @@ +package com.ibeetl.jlw.service; + +import cn.jlw.util.ToolUtils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.ibeetl.admin.core.service.CoreBaseService; +import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.admin.core.web.JsonReturnCode; +import com.ibeetl.jlw.dao.TeacherOpenCourseHomeworkSettingDao; +import com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkSetting; +import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery; +import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; +import org.beetl.sql.core.engine.PageQuery; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 作业布置 Service + * 当分布式ID开启后请勿使用insert(*,true) + */ + +@Service +@Transactional +public class TeacherOpenCourseHomeworkSettingService extends CoreBaseService<TeacherOpenCourseHomeworkSetting>{ + + @Resource private TeacherOpenCourseHomeworkSettingDao teacherOpenCourseHomeworkSettingDao; + + public PageQuery<TeacherOpenCourseHomeworkSetting>queryByCondition(PageQuery query){ + PageQuery ret = teacherOpenCourseHomeworkSettingDao.queryByCondition(query); + queryListAfter(ret.getList()); + return ret; + } + + public PageQuery<TeacherOpenCourseHomeworkSetting>queryByConditionQuery(PageQuery query){ + PageQuery ret = teacherOpenCourseHomeworkSettingDao.queryByConditionQuery(query); + queryListAfter(ret.getList()); + return ret; + } + + public void deleteByList(List list){ + String ids = ""; + ToolUtils.deleteNullList(list); + for(int i=0;null != list && i<list.size();i++){ + ids += list.get(i).toString()+(i==list.size()-1?"":","); + } + if(StringUtils.isNotBlank(ids)){ + teacherOpenCourseHomeworkSettingDao.deleteTeacherOpenCourseHomeworkSettingByIds(ids); + } + } + + public void deleteTeacherOpenCourseHomeworkSetting(String ids){ + try { + teacherOpenCourseHomeworkSettingDao.deleteTeacherOpenCourseHomeworkSettingByIds(ids); + } catch (Exception e) { + throw new PlatformException("批量删除作业布置失败", e); + } + } + + public String addAll(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery){ + String msg = ""; + List<TeacherOpenCourseHomeworkSetting> teacherOpenCourseHomeworkSettingList = new ArrayList<>(); + try { + teacherOpenCourseHomeworkSettingList = JSON.parseArray(teacherOpenCourseHomeworkSettingQuery.getTeacherOpenCourseHomeworkSettingJsonStr(), TeacherOpenCourseHomeworkSetting.class); + } catch (Exception e) { + try { + teacherOpenCourseHomeworkSettingList.add(JSONObject.parseObject(teacherOpenCourseHomeworkSettingQuery.getTeacherOpenCourseHomeworkSettingJsonStr(), TeacherOpenCourseHomeworkSetting.class)); + } catch (Exception e1) {} + } + ToolUtils.deleteNullList(teacherOpenCourseHomeworkSettingList); + if(null != teacherOpenCourseHomeworkSettingList && teacherOpenCourseHomeworkSettingList.size()>0){ + for(int i=0;i<teacherOpenCourseHomeworkSettingList.size();i++){ + TeacherOpenCourseHomeworkSetting teacherOpenCourseHomeworkSetting = teacherOpenCourseHomeworkSettingList.get(i); + teacherOpenCourseHomeworkSetting.setUserId(teacherOpenCourseHomeworkSettingQuery.getUserId()); + teacherOpenCourseHomeworkSetting.setOrgId(teacherOpenCourseHomeworkSettingQuery.getOrgId()); + } + insertBatch(teacherOpenCourseHomeworkSettingList); + } + return msg; + } + + public JsonResult add(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery){ + String msg = ""; + TeacherOpenCourseHomeworkSetting teacherOpenCourseHomeworkSetting = teacherOpenCourseHomeworkSettingQuery.pojo(); + teacherOpenCourseHomeworkSettingDao.insert(teacherOpenCourseHomeworkSetting); + teacherOpenCourseHomeworkSettingQuery.setTeacherOpenCourseQuestionHomeworkSettingId(teacherOpenCourseHomeworkSetting.getTeacherOpenCourseQuestionHomeworkSettingId()); + JsonResult jsonResult = new JsonResult(); + jsonResult.setData(teacherOpenCourseHomeworkSetting.getTeacherOpenCourseQuestionHomeworkSettingId());//自增的ID丢进去 + jsonResult.setCode(JsonReturnCode.SUCCESS.getCode()); + jsonResult.setMsg(msg); + return jsonResult; + } + + public String edit(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery){ + String msg = ""; + TeacherOpenCourseHomeworkSetting teacherOpenCourseHomeworkSetting = teacherOpenCourseHomeworkSettingQuery.pojo(); + teacherOpenCourseHomeworkSettingDao.updateTemplateById(teacherOpenCourseHomeworkSetting); + return msg; + } + + public String updateGivenByIds(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery){ + String msg = ""; + if(StringUtils.isNotBlank(teacherOpenCourseHomeworkSettingQuery.get_given())){ + boolean flag = teacherOpenCourseHomeworkSettingDao.updateGivenByIds(teacherOpenCourseHomeworkSettingQuery) > 0; + if(!flag){ + msg = "更新指定参数失败"; + } + }else{ + msg = "指定参数为空"; + } + return msg; + } + + public List<TeacherOpenCourseHomeworkSetting> getValues (Object paras){ + return sqlManager.select(SqlId.of("jlw.teacherOpenCourseHomeworkSetting.getTeacherOpenCourseHomeworkSettingValues"), TeacherOpenCourseHomeworkSetting.class, paras); + } + + public List<TeacherOpenCourseHomeworkSetting> getValuesByQuery (TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery){ + return teacherOpenCourseHomeworkSettingDao.getValuesByQuery(teacherOpenCourseHomeworkSettingQuery); + } + + public TeacherOpenCourseHomeworkSetting getInfo (Long teacherOpenCourseQuestionHomeworkSettingId){ + TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery = new TeacherOpenCourseHomeworkSettingQuery(); + teacherOpenCourseHomeworkSettingQuery.setTeacherOpenCourseQuestionHomeworkSettingId(teacherOpenCourseQuestionHomeworkSettingId); + List<TeacherOpenCourseHomeworkSetting> list = teacherOpenCourseHomeworkSettingDao.getValuesByQuery(teacherOpenCourseHomeworkSettingQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + + public TeacherOpenCourseHomeworkSetting getInfo (TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery){ + List<TeacherOpenCourseHomeworkSetting> list = teacherOpenCourseHomeworkSettingDao.getValuesByQuery(teacherOpenCourseHomeworkSettingQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkSettingController.java new file mode 100644 index 00000000..bb29fd15 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkSettingController.java @@ -0,0 +1,193 @@ +package com.ibeetl.jlw.web; + +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.entity.TeacherOpenCourseHomeworkSetting; +import com.ibeetl.jlw.service.TeacherOpenCourseHomeworkSettingService; +import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.beetl.sql.core.engine.PageQuery; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 作业布置 我的课程-题库作业-作业设置 接口 + * 切记不要对非线程安全的静态变量进行写操作 + */ + +@RestController +public class TeacherOpenCourseHomeworkSettingController{ + + private final Log log = LogFactory.getLog(this.getClass()); + private static final String MODEL = "/jlw/teacherOpenCourseHomeworkSetting"; + private static final String API = "/api/teacherOpenCourseHomeworkSetting"; + + + @Resource private TeacherOpenCourseHomeworkSettingService teacherOpenCourseHomeworkSettingService; + + @Resource FileService fileService; + + /* 前端接口 */ + + @PostMapping(API + "/getPageList.do") + public JsonResult<PageQuery> getPageList(TeacherOpenCourseHomeworkSettingQuery condition,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseHomeworkSettingService.queryByConditionQuery(page); + return JsonResult.success(page); + } + } + + + @GetMapping(API + "/getInfo.do") + public JsonResult<TeacherOpenCourseHomeworkSetting>getInfo(TeacherOpenCourseHomeworkSettingQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + TeacherOpenCourseHomeworkSetting teacherOpenCourseHomeworkSetting = teacherOpenCourseHomeworkSettingService.getInfo(param); + return JsonResult.success(teacherOpenCourseHomeworkSetting); + } + } + + + @GetMapping(API + "/getList.do") + public JsonResult<List<TeacherOpenCourseHomeworkSetting>>getList(TeacherOpenCourseHomeworkSettingQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + List<TeacherOpenCourseHomeworkSetting>list = teacherOpenCourseHomeworkSettingService.getValuesByQuery(param); + return JsonResult.success(list); + } + } + + + /* 后台页面 */ + + @GetMapping(MODEL + "/index.do") + @Function("teacherOpenCourseHomeworkSetting.query") + public ModelAndView index() { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHomeworkSetting/index.html") ; + view.addObject("search", TeacherOpenCourseHomeworkSettingQuery.class.getName()); + return view; + } + + @GetMapping(MODEL + "/edit.do") + @Function("teacherOpenCourseHomeworkSetting.edit") + public ModelAndView edit(Long teacherOpenCourseQuestionHomeworkSettingId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHomeworkSetting/edit.html"); + TeacherOpenCourseHomeworkSetting teacherOpenCourseHomeworkSetting = teacherOpenCourseHomeworkSettingService.queryById(teacherOpenCourseQuestionHomeworkSettingId); + view.addObject("teacherOpenCourseHomeworkSetting", teacherOpenCourseHomeworkSetting); + return view; + } + + @GetMapping(MODEL + "/add.do") + @Function("teacherOpenCourseHomeworkSetting.add") + public ModelAndView add(Long teacherOpenCourseQuestionHomeworkSettingId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHomeworkSetting/add.html"); + if(null != teacherOpenCourseQuestionHomeworkSettingId){ + TeacherOpenCourseHomeworkSetting teacherOpenCourseHomeworkSetting = teacherOpenCourseHomeworkSettingService.queryById(teacherOpenCourseQuestionHomeworkSettingId); + view.addObject("teacherOpenCourseHomeworkSetting", teacherOpenCourseHomeworkSetting); + }else { + view.addObject("teacherOpenCourseHomeworkSetting", new TeacherOpenCourseHomeworkSetting()); + } + return view; + } + + /* 后台接口 */ + + @PostMapping(MODEL + "/list.json") + @Function("teacherOpenCourseHomeworkSetting.query") + public JsonResult<PageQuery> list(TeacherOpenCourseHomeworkSettingQuery condition){ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseHomeworkSettingService.queryByCondition(page); + return JsonResult.success(page); + } + + @PostMapping(MODEL + "/addAll.json") + @Function("teacherOpenCourseHomeworkSetting.add") + public JsonResult addAll(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + teacherOpenCourseHomeworkSettingQuery.setUserId(coreUser.getId()); + teacherOpenCourseHomeworkSettingQuery.setOrgId(coreUser.getOrgId()); + String msg = teacherOpenCourseHomeworkSettingService.addAll(teacherOpenCourseHomeworkSettingQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("新增失败,"+msg); + } + } + } + + @PostMapping(MODEL + "/add.json") + @Function("teacherOpenCourseHomeworkSetting.add") + public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery, BindingResult result,@SCoreUser CoreUser coreUser){ + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else{ + teacherOpenCourseHomeworkSettingQuery.setUserId(coreUser.getId()); + teacherOpenCourseHomeworkSettingQuery.setOrgId(coreUser.getOrgId()); + return teacherOpenCourseHomeworkSettingService.add(teacherOpenCourseHomeworkSettingQuery); + } + } + + @PostMapping(MODEL + "/edit.json") + @Function("teacherOpenCourseHomeworkSetting.edit") + public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery, BindingResult result) { + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else { + teacherOpenCourseHomeworkSettingQuery.setUserId(null); + teacherOpenCourseHomeworkSettingQuery.setOrgId(null); + String msg = teacherOpenCourseHomeworkSettingService.edit(teacherOpenCourseHomeworkSettingQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("更新失败,"+msg); + } + } + } + + + @GetMapping(MODEL + "/view.json") + @Function("teacherOpenCourseHomeworkSetting.query") + public JsonResult<TeacherOpenCourseHomeworkSetting>queryInfo(Long teacherOpenCourseQuestionHomeworkSettingId) { + TeacherOpenCourseHomeworkSetting teacherOpenCourseHomeworkSetting = teacherOpenCourseHomeworkSettingService.queryById( teacherOpenCourseQuestionHomeworkSettingId); + return JsonResult.success(teacherOpenCourseHomeworkSetting); + } + + @GetMapping(MODEL + "/getValues.json") + @Function("teacherOpenCourseHomeworkSetting.query") + public JsonResult<List<TeacherOpenCourseHomeworkSetting>>getValues(TeacherOpenCourseHomeworkSettingQuery param) { + List<TeacherOpenCourseHomeworkSetting>list = teacherOpenCourseHomeworkSettingService.getValuesByQuery(param); + return JsonResult.success(list); + } + + + @PostMapping(MODEL + "/delete.json") + @Function("teacherOpenCourseHomeworkSetting.delete") + @ResponseBody + public JsonResult delete(String ids) { + teacherOpenCourseHomeworkSettingService.deleteTeacherOpenCourseHomeworkSetting(ids); + return JsonResult.success(); + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkSettingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkSettingQuery.java new file mode 100644 index 00000000..06092317 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkSettingQuery.java @@ -0,0 +1,141 @@ +package com.ibeetl.jlw.web.query; + +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.TeacherOpenCourseHomeworkSetting; + +import javax.validation.constraints.NotNull; + +/** + *作业布置查询 + */ +public class TeacherOpenCourseHomeworkSettingQuery extends PageParam { + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @Query(name = "作业设置ID", display = false) + private Long teacherOpenCourseQuestionHomeworkSettingId; + @Query(name = "作答次数", display = false) + private Integer teacherOpenCourseQuestionHomeworkSettingDoCount; + @Query(name = "题目乱序(同一大题内)", display = false) + private Integer teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder; + @Query(name = "选项乱序(限单选、多选)", display = false) + private Integer teacherOpenCourseQuestionHomeworkSettingOptionNoOrder; + @Query(name = "答卷后显示答案解析", display = false) + private Integer teacherOpenCourseQuestionHomeworkSettingEndShowQa; + @Query(name = "答卷后显示答案对错", display = false) + private Integer endShowTrueFalse; + @Query(name = "创建时间", display = false) + private Integer teacherOpenCourseQuestionHomeworkSettingAddTime; + @Query(name = "组织ID", display = false) + private Long orgId; + @Query(name = "用户ID", display = false) + private Long userId; + + private String teacherOpenCourseQuestionHomeworkSettingIdPlural; + private String orgIdPlural; + private String userIdPlural; + + private String teacherOpenCourseHomeworkSettingJsonStr;//json格式 + + private String _given;//指定更新的特定字段,多个逗号隔开 + + public Long getTeacherOpenCourseQuestionHomeworkSettingId(){ + return teacherOpenCourseQuestionHomeworkSettingId; + } + public void setTeacherOpenCourseQuestionHomeworkSettingId(Long teacherOpenCourseQuestionHomeworkSettingId ){ + this.teacherOpenCourseQuestionHomeworkSettingId = teacherOpenCourseQuestionHomeworkSettingId; + } + public Integer getTeacherOpenCourseQuestionHomeworkSettingDoCount(){ + return teacherOpenCourseQuestionHomeworkSettingDoCount; + } + public void setTeacherOpenCourseQuestionHomeworkSettingDoCount(Integer teacherOpenCourseQuestionHomeworkSettingDoCount ){ + this.teacherOpenCourseQuestionHomeworkSettingDoCount = teacherOpenCourseQuestionHomeworkSettingDoCount; + } + public Integer getTeacherOpenCourseQuestionHomeworkSettingQuestionNoOrder(){ + return teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder; + } + public void setTeacherOpenCourseQuestionHomeworkSettingQuestionNoOrder(Integer teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder ){ + this.teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder = teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder; + } + public Integer getTeacherOpenCourseQuestionHomeworkSettingOptionNoOrder(){ + return teacherOpenCourseQuestionHomeworkSettingOptionNoOrder; + } + public void setTeacherOpenCourseQuestionHomeworkSettingOptionNoOrder(Integer teacherOpenCourseQuestionHomeworkSettingOptionNoOrder ){ + this.teacherOpenCourseQuestionHomeworkSettingOptionNoOrder = teacherOpenCourseQuestionHomeworkSettingOptionNoOrder; + } + public Integer getTeacherOpenCourseQuestionHomeworkSettingEndShowQa(){ + return teacherOpenCourseQuestionHomeworkSettingEndShowQa; + } + public void setTeacherOpenCourseQuestionHomeworkSettingEndShowQa(Integer teacherOpenCourseQuestionHomeworkSettingEndShowQa ){ + this.teacherOpenCourseQuestionHomeworkSettingEndShowQa = teacherOpenCourseQuestionHomeworkSettingEndShowQa; + } + public Integer getEndShowTrueFalse(){ + return endShowTrueFalse; + } + public void setEndShowTrueFalse(Integer endShowTrueFalse ){ + this.endShowTrueFalse = endShowTrueFalse; + } + public Integer getTeacherOpenCourseQuestionHomeworkSettingAddTime(){ + return teacherOpenCourseQuestionHomeworkSettingAddTime; + } + public void setTeacherOpenCourseQuestionHomeworkSettingAddTime(Integer teacherOpenCourseQuestionHomeworkSettingAddTime ){ + this.teacherOpenCourseQuestionHomeworkSettingAddTime = teacherOpenCourseQuestionHomeworkSettingAddTime; + } + public Long getOrgId(){ + return orgId; + } + public void setOrgId(Long orgId ){ + this.orgId = orgId; + } + public Long getUserId(){ + return userId; + } + public void setUserId(Long userId ){ + this.userId = userId; + } + + public TeacherOpenCourseHomeworkSetting pojo(){ + TeacherOpenCourseHomeworkSetting pojo = new TeacherOpenCourseHomeworkSetting(); + pojo.setTeacherOpenCourseQuestionHomeworkSettingId(this.getTeacherOpenCourseQuestionHomeworkSettingId()); + pojo.setTeacherOpenCourseQuestionHomeworkSettingDoCount(this.getTeacherOpenCourseQuestionHomeworkSettingDoCount()); + pojo.setTeacherOpenCourseQuestionHomeworkSettingQuestionNoOrder(this.getTeacherOpenCourseQuestionHomeworkSettingQuestionNoOrder()); + pojo.setTeacherOpenCourseQuestionHomeworkSettingOptionNoOrder(this.getTeacherOpenCourseQuestionHomeworkSettingOptionNoOrder()); + pojo.setTeacherOpenCourseQuestionHomeworkSettingEndShowQa(this.getTeacherOpenCourseQuestionHomeworkSettingEndShowQa()); + pojo.setEndShowTrueFalse(this.getEndShowTrueFalse()); + pojo.setTeacherOpenCourseQuestionHomeworkSettingAddTime(this.getTeacherOpenCourseQuestionHomeworkSettingAddTime()); + pojo.setOrgId(this.getOrgId()); + pojo.setUserId(this.getUserId()); + return pojo; + } + + public String getTeacherOpenCourseQuestionHomeworkSettingIdPlural(){ + return teacherOpenCourseQuestionHomeworkSettingIdPlural; + } + public void setTeacherOpenCourseQuestionHomeworkSettingIdPlural(String teacherOpenCourseQuestionHomeworkSettingIdPlural){ + this.teacherOpenCourseQuestionHomeworkSettingIdPlural = teacherOpenCourseQuestionHomeworkSettingIdPlural; + } + public String getOrgIdPlural(){ + return orgIdPlural; + } + public void setOrgIdPlural(String orgIdPlural){ + this.orgIdPlural = orgIdPlural; + } + public String getUserIdPlural(){ + return userIdPlural; + } + public void setUserIdPlural(String userIdPlural){ + this.userIdPlural = userIdPlural; + } + public String getTeacherOpenCourseHomeworkSettingJsonStr(){ + return teacherOpenCourseHomeworkSettingJsonStr; + } + public void setTeacherOpenCourseHomeworkSettingJsonStr(String teacherOpenCourseHomeworkSettingJsonStr ){ + this.teacherOpenCourseHomeworkSettingJsonStr = teacherOpenCourseHomeworkSettingJsonStr; + } + public String get_given() { + return _given; + } + public void set_given(String _given) { + this._given = _given; + } +} diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkSetting.md new file mode 100644 index 00000000..4212e5ef --- /dev/null +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkSetting.md @@ -0,0 +1,267 @@ +queryByCondition +=== +* 根据不为空的参数进行分页查询 + + select + @pageTag(){ + t.* + @} + from teacher_open_course_homework_setting t + where 1=1 + @//数据权限,该sql语句功能点,如果不考虑数据权限,可以删除此行 + and #function("teacherOpenCourseHomeworkSetting.query")# + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingId)){ + and t.teacher_open_course_question_homework_setting_id =#teacherOpenCourseQuestionHomeworkSettingId# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingIdPlural)){ + and find_in_set(t.teacher_open_course_question_homework_setting_id,#teacherOpenCourseQuestionHomeworkSettingIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT =#teacherOpenCourseQuestionHomeworkSettingDoCount# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# + @} + @if(!isEmpty(endShowTrueFalse)){ + and t.end_show_true_false =#endShowTrueFalse# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME =#teacherOpenCourseQuestionHomeworkSettingAddTime# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @} + + +queryByConditionQuery +=== +* 根据不为空的参数进行分页查询(无权限) + + select + @pageTag(){ + t.* + @} + from teacher_open_course_homework_setting t + where 1=1 + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingId)){ + and t.teacher_open_course_question_homework_setting_id =#teacherOpenCourseQuestionHomeworkSettingId# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingIdPlural)){ + and find_in_set(t.teacher_open_course_question_homework_setting_id,#teacherOpenCourseQuestionHomeworkSettingIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT =#teacherOpenCourseQuestionHomeworkSettingDoCount# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# + @} + @if(!isEmpty(endShowTrueFalse)){ + and t.end_show_true_false =#endShowTrueFalse# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME =#teacherOpenCourseQuestionHomeworkSettingAddTime# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @} + + + + +deleteTeacherOpenCourseHomeworkSettingByIds +=== + +* 批量删除 + + delete from teacher_open_course_homework_setting where find_in_set(teacher_open_course_question_homework_setting_id,#ids#) + + + +getByIds +=== + +select * from teacher_open_course_homework_setting where find_in_set(teacher_open_course_question_homework_setting_id,#ids#) + + +updateGivenByIds +=== + +* 批量更新指定字段,无论此字段是否有值 + + update teacher_open_course_homework_setting + set + @if(contain("teacherOpenCourseQuestionHomeworkSettingDoCount",_given)){ + @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT = null , + @}else{ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT = #teacherOpenCourseQuestionHomeworkSettingDoCount# , + @} + @} + @if(contain("teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder",_given)){ + @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER = null , + @}else{ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER = #teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# , + @} + @} + @if(contain("teacherOpenCourseQuestionHomeworkSettingOptionNoOrder",_given)){ + @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER = null , + @}else{ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER = #teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# , + @} + @} + @if(contain("teacherOpenCourseQuestionHomeworkSettingEndShowQa",_given)){ + @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA = null , + @}else{ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA = #teacherOpenCourseQuestionHomeworkSettingEndShowQa# , + @} + @} + @if(contain("endShowTrueFalse",_given)){ + @if(isEmpty(endShowTrueFalse)){ + end_show_true_false = null , + @}else{ + end_show_true_false = #endShowTrueFalse# , + @} + @} + @if(contain("teacherOpenCourseQuestionHomeworkSettingAddTime",_given)){ + @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME = null , + @}else{ + TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME = #teacherOpenCourseQuestionHomeworkSettingAddTime# , + @} + @} + @if(contain("orgId",_given)){ + @if(isEmpty(orgId)){ + org_id = null , + @}else{ + org_id = #orgId# , + @} + @} + @if(contain("userId",_given)){ + @if(isEmpty(userId)){ + user_id = null , + @}else{ + user_id = #userId# , + @} + @} + teacher_open_course_question_homework_setting_id = teacher_open_course_question_homework_setting_id + where find_in_set(teacher_open_course_question_homework_setting_id,#teacherOpenCourseQuestionHomeworkSettingIdPlural#) + + + +getTeacherOpenCourseHomeworkSettingValues +=== + +* 根据不为空的参数进行查询 + + select t.* + from teacher_open_course_homework_setting t + where 1=1 + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingId)){ + and t.teacher_open_course_question_homework_setting_id =#teacherOpenCourseQuestionHomeworkSettingId# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT =#teacherOpenCourseQuestionHomeworkSettingDoCount# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# + @} + @if(!isEmpty(endShowTrueFalse)){ + and t.end_show_true_false =#endShowTrueFalse# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME =#teacherOpenCourseQuestionHomeworkSettingAddTime# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + + +getValuesByQuery +=== + +* 根据不为空的参数进行查询 + + select t.* + from teacher_open_course_homework_setting t + where 1=1 and #function("teacherOpenCourseHomeworkSetting.query")# + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingId)){ + and t.teacher_open_course_question_homework_setting_id =#teacherOpenCourseQuestionHomeworkSettingId# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingIdPlural)){ + and find_in_set(t.teacher_open_course_question_homework_setting_id,#teacherOpenCourseQuestionHomeworkSettingIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT =#teacherOpenCourseQuestionHomeworkSettingDoCount# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# + @} + @if(!isEmpty(endShowTrueFalse)){ + and t.end_show_true_false =#endShowTrueFalse# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ + and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME =#teacherOpenCourseQuestionHomeworkSettingAddTime# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @} + + + diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/add.js new file mode 100644 index 00000000..ed58423a --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/add.js @@ -0,0 +1,38 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHomeworkSettingApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseHomeworkSettingApi = layui.teacherOpenCourseHomeworkSettingApi; + var index = layui.index; + var view = { + init:function(){ + Lib.initGenrealForm($("#addForm"),form); + this.initSubmit(); + }, + initSubmit:function(){ + $("#addButton").click(function(){ + form.on('submit(form)', function(){ + var teacherOpenCourseQuestionHomeworkSettingId = $("#addForm input[name='teacherOpenCourseQuestionHomeworkSettingId']").val(); + if(!$.isEmpty(teacherOpenCourseQuestionHomeworkSettingId)){ + teacherOpenCourseHomeworkSettingApi.updateTeacherOpenCourseHomeworkSetting($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }else{ + teacherOpenCourseHomeworkSettingApi.addTeacherOpenCourseHomeworkSetting($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("添加成功"); + Lib.closeFrame(); + }); + } + + }); + }); + + $("#addButton-cancel").click(function(){ + Lib.closeFrame(); + }); + } + + } + exports('add',view); +}); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/del.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/del.js new file mode 100644 index 00000000..97716fd4 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/del.js @@ -0,0 +1,23 @@ +layui.define(['table', 'teacherOpenCourseHomeworkSettingApi'], function(exports) { + var teacherOpenCourseHomeworkSettingApi = layui.teacherOpenCourseHomeworkSettingApi; + var table=layui.table; + var view = { + init:function(){ + }, + delBatch:function(){ + var data = Common.getMoreDataFromTable(table,"teacherOpenCourseHomeworkSettingTable"); + if(data==null){ + return ; + } + Common.openConfirm("确认要删除这些作业布置?",function(){ + var ids =Common.concatBatchId(data,"teacherOpenCourseQuestionHomeworkSettingId"); + teacherOpenCourseHomeworkSettingApi.del(ids,function(){ + Common.info("删除成功"); + dataReload(); + }) + }) + } + } + exports('del',view); + +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/edit.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/edit.js new file mode 100644 index 00000000..4e0bc5b9 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/edit.js @@ -0,0 +1,28 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHomeworkSettingApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseHomeworkSettingApi = layui.teacherOpenCourseHomeworkSettingApi; + var index = layui.index; + var view = { + init:function(){ + Lib.initGenrealForm($("#updateForm"),form); + this.initSubmit(); + }, + initSubmit:function(){ + $("#updateButton").click(function(){ + form.on('submit(form)', function(){ + teacherOpenCourseHomeworkSettingApi.updateTeacherOpenCourseHomeworkSetting($('#updateForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }); + }); + $("#updateButton-cancel").click(function(){ + Lib.closeFrame(); + }); + } + + } + exports('edit',view); + +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/index.js new file mode 100644 index 00000000..bf889ab8 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/index.js @@ -0,0 +1,185 @@ +layui.define([ 'form', 'laydate', 'table' ], function(exports) { + var form = layui.form; + var laydate = layui.laydate; + var table = layui.table; + var teacherOpenCourseHomeworkSettingTable = null; + var view ={ + init:function(){ + var that = this + this.initTable(); + this.initSearchForm(); + this.initToolBar(); + window.dataReload = function(){ + Lib.doSearchForm($("#searchForm"),teacherOpenCourseHomeworkSettingTable) + that.initToolBar(); + } + }, + initTable:function(){ + var sx_ = localStorage.getItem("teacherOpenCourseHomeworkSettingTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存 + if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} + teacherOpenCourseHomeworkSettingTable = table.render({ + elem : '#teacherOpenCourseHomeworkSettingTable', + height : Lib.getTableHeight(1), + cellMinWidth: 100, + method : 'post', + url : Common.ctxPath + '/jlw/teacherOpenCourseHomeworkSetting/list.json' // 数据接口 + ,page : Lib.tablePage // 开启分页 + ,toolbar: '#toolbar_teacherOpenCourseHomeworkSetting' //自定义头部左侧工具栏 + ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 + ,limit : 10, + cols : [ [ // 表头 + { + type : 'checkbox', + + }, + { + field : 'teacherOpenCourseQuestionHomeworkSettingId', + title : '作业设置ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkSettingId'])?false:sx_['teacherOpenCourseQuestionHomeworkSettingId'], + + width : 60, + }, + { + field : 'teacherOpenCourseQuestionHomeworkSettingDoCount', + title : '作答次数', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkSettingDoCount'])?false:sx_['teacherOpenCourseQuestionHomeworkSettingDoCount'], + }, + { + field : 'teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder', + title : '题目乱序(同一大题内)', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder'])?false:sx_['teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder'], + }, + { + field : 'teacherOpenCourseQuestionHomeworkSettingOptionNoOrder', + title : '选项乱序(限单选、多选)', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkSettingOptionNoOrder'])?false:sx_['teacherOpenCourseQuestionHomeworkSettingOptionNoOrder'], + }, + { + field : 'teacherOpenCourseQuestionHomeworkSettingEndShowQa', + title : '答卷后显示答案解析', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkSettingEndShowQa'])?false:sx_['teacherOpenCourseQuestionHomeworkSettingEndShowQa'], + }, + { + field : 'endShowTrueFalse', + title : '答卷后显示答案对错', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['endShowTrueFalse'])?false:sx_['endShowTrueFalse'], + }, + { + field : 'teacherOpenCourseQuestionHomeworkSettingAddTime', + title : '创建时间', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkSettingAddTime'])?false:sx_['teacherOpenCourseQuestionHomeworkSettingAddTime'], + }, + { + field : 'orgId', + title : '组织ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], + }, + { + field : 'userId', + title : '用户ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['userId'])?false:sx_['userId'], + } + ,{ + field : 'operation_',title : '操作',align:"center", templet: function (d) { + var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>'; + htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>'; + return htm; + } + } + + ] ] + + }); + + table.on('checkbox(teacherOpenCourseHomeworkSettingTable)', function(obj){ + var teacherOpenCourseHomeworkSetting = obj.data; + if(obj.checked){ + //按钮逻辑Lib.buttonEnable() + }else{ + + } + }) + }, + + initSearchForm:function(){ + Lib.initSearchForm( $("#searchForm"),teacherOpenCourseHomeworkSettingTable,form); + }, + + initToolBar:function(){ + toolbar = { + add: function () { + var url = "/jlw/teacherOpenCourseHomeworkSetting/add.do"; + Common.openDlg(url,"作业布置管理>新增"); + }, + edit: function () { + var data = Common.getOneFromTable(table,"teacherOpenCourseHomeworkSettingTable"); + if(data==null){ + return ; + } + var url = "/jlw/teacherOpenCourseHomeworkSetting/add.do?teacherOpenCourseQuestionHomeworkSettingId="+data.teacherOpenCourseQuestionHomeworkSettingId; + Common.openDlg(url,"作业布置管理>"+data.teacherOpenCourseQuestionHomeworkSettingId+">编辑"); + }, + del: function () { + layui.use(['del'], function(){ + var delView = layui.del + delView.delBatch(); + }); + }, + search: function () { + Lib.doSearchForm($("#searchForm"), teacherOpenCourseHomeworkSettingTable, 1); + view.initToolBar() + }, + refresh: function () { + searchForm.reset(); + Lib.doSearchForm($("#searchForm"), teacherOpenCourseHomeworkSettingTable, 1); + view.initToolBar() + }, + } + //触发事件 + $('.ext-toolbar').on('click', function() { + var type = $(this).data('type'); + toolbar[type] ? toolbar[type].call(this) : ''; + }); + + }, initTableTool: table.on('tool(teacherOpenCourseHomeworkSettingTable)', function (obj) { + var data = obj.data; + if (obj.event === 'edit') { + var url = "/jlw/teacherOpenCourseHomeworkSetting/add.do?teacherOpenCourseQuestionHomeworkSettingId="+data.teacherOpenCourseQuestionHomeworkSettingId; + Common.openDlg(url,"作业布置管理>"+data.teacherOpenCourseQuestionHomeworkSettingId+">编辑"); + }else if(obj.event === "del"){ + layer.confirm('是否确定删除该信息?', function (index) { + var ret = Common.postAjax("/jlw/teacherOpenCourseHomeworkSetting/delete.json",{ids:data.teacherOpenCourseQuestionHomeworkSettingId}); + layer.msg(ret.code == 0?"删除成功!":ret.msg, { + offset: ['50%'], + icon: ret.code == 0?1:2, + time: 1500 //2秒关闭(如果不配置,默认是3秒) + },function (){ + if(ret.code == 0){ + Lib.tableRefresh(); + } + }); + }); + } + }) + } + exports('index',view); + +}); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/teacherOpenCourseHomeworkSettingApi.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/teacherOpenCourseHomeworkSettingApi.js new file mode 100644 index 00000000..ccb9d27c --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/teacherOpenCourseHomeworkSettingApi.js @@ -0,0 +1,18 @@ +/*访问后台的代码*/ +layui.define([], function(exports) { + var api={ + updateTeacherOpenCourseHomeworkSetting:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseHomeworkSetting/edit.json",form,{},callback) + }, + addTeacherOpenCourseHomeworkSetting:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseHomeworkSetting/add.json",form,{},callback) + }, + del:function(ids,callback){ + Common.post("/jlw/teacherOpenCourseHomeworkSetting/delete.json",{"ids":ids},function(){ + callback(); + }) + } + + }; + exports('teacherOpenCourseHomeworkSettingApi',api); +}); \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/schoolClassStudent/index.html b/web/src/main/resources/templates/jlw/schoolClassStudent/index.html index 637b833c..2dc2370a 100644 --- a/web/src/main/resources/templates/jlw/schoolClassStudent/index.html +++ b/web/src/main/resources/templates/jlw/schoolClassStudent/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_schoolClassStudent"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="schoolClassStudent.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="schoolClassStudent.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/studentClientLink/index.html b/web/src/main/resources/templates/jlw/studentClientLink/index.html index f1c572ea..ab571265 100644 --- a/web/src/main/resources/templates/jlw/studentClientLink/index.html +++ b/web/src/main/resources/templates/jlw/studentClientLink/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_studentClientLink"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="studentClientLink.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="studentClientLink.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourse/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourse/index.html index c484090d..85651d47 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourse/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourse/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourse"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourse.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourse.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/index.html index 5a073c7b..52031550 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseChatLog"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseChatLog.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseChatLog.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/add.html new file mode 100644 index 00000000..76dbc166 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/add.html @@ -0,0 +1,78 @@ +<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseHomeworkSetting/"}){ --> + +<form class="layui-form" id="addForm"> + <div class="layui-row"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">作答次数</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingDoCount" name="teacherOpenCourseQuestionHomeworkSettingDoCount" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingDoCount}" class="layui-input" > + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">题目乱序(同一大题内)</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder}" class="layui-input" > + </div> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">选项乱序(限单选、多选)</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingOptionNoOrder}" class="layui-input" > + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">答卷后显示答案解析</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingEndShowQa" name="teacherOpenCourseQuestionHomeworkSettingEndShowQa" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingEndShowQa}" class="layui-input" > + </div> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">答卷后显示答案对错</label> + <div class="layui-input-inline"> + <input type="text" id="endShowTrueFalse" name="endShowTrueFalse" value="${teacherOpenCourseHomeworkSetting.endShowTrueFalse}" class="layui-input" > + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">创建时间</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingAddTime" name="teacherOpenCourseQuestionHomeworkSettingAddTime" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingAddTime}" class="layui-input" > + </div> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">组织ID</label> + <div class="layui-input-inline"> + <input type="text" id="orgId" name="orgId" value="${teacherOpenCourseHomeworkSetting.orgId}" class="layui-input" > + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">用户ID</label> + <div class="layui-input-inline"> + <input type="text" id="userId" name="userId" value="${teacherOpenCourseHomeworkSetting.userId}" class="layui-input" > + </div> + </div> + </div> + </div> + <!-- 业务对象须有hidden字段,保存delFlag和version字段--> + <input type="hidden" name="teacherOpenCourseQuestionHomeworkSettingId" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingId}" /> + <layui:submitButtons id="addButton" buttonType="" showExamine="2" /> +</form> +<!--#} --> +<script> +layui.use(['add'], function(){ + var teacherOpenCourseHomeworkSettingAdd = layui.add + teacherOpenCourseHomeworkSettingAdd.init(); +}); +</script> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/edit.html new file mode 100644 index 00000000..82267bda --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/edit.html @@ -0,0 +1,78 @@ +<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseHomeworkSetting/"}){ --> + +<form class="layui-form" id="updateForm"> + <div class="layui-row"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">作答次数</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingDoCount" name="teacherOpenCourseQuestionHomeworkSettingDoCount" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingDoCount}" class="layui-input" > + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">题目乱序(同一大题内)</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder}" class="layui-input" > + </div> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">选项乱序(限单选、多选)</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingOptionNoOrder}" class="layui-input" > + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">答卷后显示答案解析</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingEndShowQa" name="teacherOpenCourseQuestionHomeworkSettingEndShowQa" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingEndShowQa}" class="layui-input" > + </div> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">答卷后显示答案对错</label> + <div class="layui-input-inline"> + <input type="text" id="endShowTrueFalse" name="endShowTrueFalse" value="${teacherOpenCourseHomeworkSetting.endShowTrueFalse}" class="layui-input" > + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">创建时间</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingAddTime" name="teacherOpenCourseQuestionHomeworkSettingAddTime" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingAddTime}" class="layui-input" > + </div> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">组织ID</label> + <div class="layui-input-inline"> + <input type="text" id="orgId" name="orgId" value="${teacherOpenCourseHomeworkSetting.orgId}" class="layui-input" > + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">用户ID</label> + <div class="layui-input-inline"> + <input type="text" id="userId" name="userId" value="${teacherOpenCourseHomeworkSetting.userId}" class="layui-input" > + </div> + </div> + </div> + </div> + <!-- 业务对象须有hidden字段,保存delFlag和version字段--> + <input type="hidden" name="teacherOpenCourseQuestionHomeworkSettingId" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingId}" /> + <layui:submitButtons id="updateButton" buttonType="" showExamine="2" /> +</form> +<!--#} --> +<script> +layui.use(['edit'], function(){ + var teacherOpenCourseHomeworkSettingEdit = layui.edit + teacherOpenCourseHomeworkSettingEdit.init(); +}); +</script> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/index.html new file mode 100644 index 00000000..aae738a5 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/index.html @@ -0,0 +1,29 @@ +<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseHomeworkSetting/"}){ --> +<layui:searchForm formId="searchForm" searchList="" condition="${search}"> +</layui:searchForm> +<table id="teacherOpenCourseHomeworkSettingTable" lay-filter="teacherOpenCourseHomeworkSettingTable"></table> +<!--#} --> + +<script type="text/html" id="toolbar_teacherOpenCourseHomeworkSetting"> + <div class="layui-btn-container"> + <div class="layui-btn-group" > + <!--# if(core.searchIsShow(search)) {--> + <layui:accessButton function="teacherOpenCourseHomeworkSetting.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> + <!--# }--> + <layui:accessButton function="teacherOpenCourseHomeworkSetting.add" action="add">添加</layui:accessButton> + <layui:accessButton function="teacherOpenCourseHomeworkSetting.edit" action="edit">修改</layui:accessButton> + <layui:accessButton function="teacherOpenCourseHomeworkSetting.del" action="del">删除</layui:accessButton> + <!--# if(!isEmpty(search)) {--> + <layui:accessButton function="teacherOpenCourseHomeworkSetting.query" action="refresh"><i class="layui-icon"></i>刷新</layui:accessButton> + <!--# }--> + </div> + </div> +</script> +<script> + +layui.use(['index'], function(){ + var index = layui.index; + index.init(); +}); + +</script> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeSchoolClass/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeSchoolClass/index.html index 32021621..6375834e 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeSchoolClass/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeSchoolClass/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseMergeSchoolClass"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseMergeSchoolClass.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseMergeSchoolClass.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/index.html index 2f949fbd..d79e9137 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseMergeStudent"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseMergeStudent.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseMergeStudent.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/index.html index 43c035f1..25851d35 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseMergeTeacher"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseMergeTeacher.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseMergeTeacher.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html index bcb54d46..2f18b508 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseScheduleSession"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseScheduleSession.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseScheduleSession.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionClass/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionClass/index.html index 1dee62b5..87f988aa 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionClass/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionClass/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseScheduleSessionClass"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseScheduleSessionClass.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseScheduleSessionClass.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionSnap/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionSnap/index.html index 47fa31a6..722717cb 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionSnap/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionSnap/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseScheduleSessionSnap"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseScheduleSessionSnap.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseScheduleSessionSnap.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionTag/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionTag/index.html index f58e3723..c8e529b6 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionTag/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionTag/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseScheduleSessionTag"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseScheduleSessionTag.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseScheduleSessionTag.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/index.html index 53ded38d..cf4b9629 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseScoreDashboard"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseScoreDashboard.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseScoreDashboard.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html index 42193d11..30869396 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseStudentSigninLog"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseStudentSigninLog.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseStudentSigninLog.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html index 85ad1537..dc18aa06 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_teacherOpenCourseStudentSigninSetting"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="teacherOpenCourseStudentSigninSetting.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="teacherOpenCourseStudentSigninSetting.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/universityFaculty/index.html b/web/src/main/resources/templates/jlw/universityFaculty/index.html index 492f515b..d9d2c6ea 100644 --- a/web/src/main/resources/templates/jlw/universityFaculty/index.html +++ b/web/src/main/resources/templates/jlw/universityFaculty/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_universityFaculty"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="universityFaculty.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="universityFaculty.add" action="add">添加</layui:accessButton> diff --git a/web/src/main/resources/templates/jlw/universitySystem/index.html b/web/src/main/resources/templates/jlw/universitySystem/index.html index 64380388..32273be8 100644 --- a/web/src/main/resources/templates/jlw/universitySystem/index.html +++ b/web/src/main/resources/templates/jlw/universitySystem/index.html @@ -7,7 +7,7 @@ <script type="text/html" id="toolbar_universitySystem"> <div class="layui-btn-container"> <div class="layui-btn-group" > - <!--# if(!isEmpty(search)) {--> + <!--# if(core.searchIsShow(search)) {--> <layui:accessButton function="universitySystem.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton> <!--# }--> <layui:accessButton function="universitySystem.add" action="add">添加</layui:accessButton> From d26fc5faa06d9e3a0985ff283acbd1031684ecd5 Mon Sep 17 00:00:00 2001 From: Mlxa0324 <mlx950324@163.com> Date: Thu, 22 Sep 2022 23:52:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E8=AF=BE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_base_design/天泽数据大平台.pdb | 63 +- data_base_design/天泽数据大平台.pdm | 608 +++++++++--------- doc/sql/mysql/tianze-pro-update.sql | 18 - doc/sql/mysql/tianze-pro.sql | 44 +- .../TeacherOpenCourseHomeworkSetting.java | 38 +- ...acherOpenCourseHomeworkSettingService.java | 30 + ...TeacherOpenCourseHomeworkSettingQuery.java | 46 +- .../jlw/teacherOpenCourseHomeworkSetting.md | 103 +-- .../teacherOpenCourseHomeworkSetting/index.js | 11 +- .../teacherOpenCourseHomeworkSetting/add.html | 35 +- .../edit.html | 35 +- 11 files changed, 578 insertions(+), 453 deletions(-) diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb index 97616aa1..838aa6ca 100644 --- a/data_base_design/天泽数据大平台.pdb +++ b/data_base_design/天泽数据大平台.pdb @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1663853151" Name="cjks" Objects="1078" Symbols="98" 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="1663860127" Name="cjks" Objects="1090" Symbols="98" 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"> @@ -5795,9 +5795,9 @@ LABL 0 新宋体,8,N</a:FontList> </o:TableSymbol> <o:TableSymbol Id="o39"> <a:CreationDate>1661873118</a:CreationDate> -<a:ModificationDate>1662047569</a:ModificationDate> +<a:ModificationDate>1663856819</a:ModificationDate> <a:IconMode>-1</a:IconMode> -<a:Rect>((267653,59026), (284651,70644))</a:Rect> +<a:Rect>((267653,59516), (284651,70644))</a:Rect> <a:AutoAdjustToText>0</a:AutoAdjustToText> <a:LineColor>12615680</a:LineColor> <a:FillColor>16570034</a:FillColor> @@ -14560,8 +14560,8 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Code>teacher_open_course_homework_setting</a:Code> <a:CreationDate>1661850632</a:CreationDate> <a:Creator>lx</a:Creator> -<a:ModificationDate>1662020839</a:ModificationDate> -<a:Modifier>87966</a:Modifier> +<a:ModificationDate>1663860127</a:ModificationDate> +<a:Modifier>lx</a:Modifier> <a:Comment>我的课程-题库作业-作业设置</a:Comment> <a:PhysicalOptions>auto_increment = 1 ENGINE = InnoDB @@ -14582,78 +14582,79 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> <o:Column Id="o788"> -<a:ObjectID>A0206A3B-A558-47C2-B300-53EBE1516FBB</a:ObjectID> -<a:Name>teacher_open_course_question_homework_id</a:Name> -<a:Code>teacher_open_course_question_homework_id</a:Code> -<a:CreationDate>1661873121</a:CreationDate> +<a:ObjectID>1B732079-0BAA-432C-900D-C8C3CBF52938</a:ObjectID> +<a:Name>teacher_open_course_question_homework_setting_school_class_ids</a:Name> +<a:Code>teacher_open_course_question_homework_setting_school_class_ids</a:Code> +<a:CreationDate>1663859987</a:CreationDate> <a:Creator>lx</a:Creator> -<a:ModificationDate>1662020839</a:ModificationDate> -<a:Modifier>87966</a:Modifier> -<a:Comment>题库作业ID</a:Comment> -<a:DataType>bigint</a:DataType> +<a:ModificationDate>1663860127</a:ModificationDate> +<a:Modifier>lx</a:Modifier> +<a:Comment>班级ID集合(逗号隔开)</a:Comment> +<a:DataType>varchar(2000)</a:DataType> +<a:Length>2000</a:Length> </o:Column> <o:Column Id="o789"> <a:ObjectID>9DA96F9A-14FC-4934-BDB7-D1CCC1FB86F8</a:ObjectID> -<a:Name>do_count</a:Name> -<a:Code>do_count</a:Code> +<a:Name>teacher_open_course_question_homework_setting_do_count</a:Name> +<a:Code>teacher_open_course_question_homework_setting_do_count</a:Code> <a:CreationDate>1661850778</a:CreationDate> <a:Creator>lx</a:Creator> -<a:ModificationDate>1661873395</a:ModificationDate> +<a:ModificationDate>1663856552</a:ModificationDate> <a:Modifier>lx</a:Modifier> <a:Comment>作答次数</a:Comment> <a:DataType>int</a:DataType> </o:Column> <o:Column Id="o790"> <a:ObjectID>5CB8FE56-6E16-4DC3-8A9B-DB03E97AF4B5</a:ObjectID> -<a:Name>question_no_order</a:Name> -<a:Code>question_no_order</a:Code> +<a:Name>teacher_open_course_question_homework_setting_question_no_order</a:Name> +<a:Code>teacher_open_course_question_homework_setting_question_no_order</a:Code> <a:CreationDate>1661867578</a:CreationDate> <a:Creator>lx</a:Creator> -<a:ModificationDate>1661873395</a:ModificationDate> +<a:ModificationDate>1663856552</a:ModificationDate> <a:Modifier>lx</a:Modifier> <a:Comment>题目乱序(同一大题内)</a:Comment> <a:DataType>int</a:DataType> </o:Column> <o:Column Id="o791"> <a:ObjectID>20FFACDF-B137-465B-862F-2CA3C4FA11EC</a:ObjectID> -<a:Name>option_no_order</a:Name> -<a:Code>option_no_order</a:Code> +<a:Name>teacher_open_course_question_homework_setting_option_no_order</a:Name> +<a:Code>teacher_open_course_question_homework_setting_option_no_order</a:Code> <a:CreationDate>1661873121</a:CreationDate> <a:Creator>lx</a:Creator> -<a:ModificationDate>1661873395</a:ModificationDate> +<a:ModificationDate>1663856552</a:ModificationDate> <a:Modifier>lx</a:Modifier> <a:Comment>选项乱序(限单选、多选)</a:Comment> <a:DataType>int</a:DataType> </o:Column> <o:Column Id="o792"> <a:ObjectID>5A376621-C562-40F0-8D02-C4DAC7450591</a:ObjectID> -<a:Name>end_show_qa</a:Name> -<a:Code>end_show_qa</a:Code> +<a:Name>teacher_open_course_question_homework_setting_end_show_qa</a:Name> +<a:Code>teacher_open_course_question_homework_setting_end_show_qa</a:Code> <a:CreationDate>1661873121</a:CreationDate> <a:Creator>lx</a:Creator> -<a:ModificationDate>1661873395</a:ModificationDate> +<a:ModificationDate>1663856552</a:ModificationDate> <a:Modifier>lx</a:Modifier> <a:Comment>答卷后显示答案解析</a:Comment> <a:DataType>int</a:DataType> </o:Column> <o:Column Id="o793"> <a:ObjectID>1C150809-8C8D-4945-8D83-9DC3BFEFB102</a:ObjectID> -<a:Name>end_show_true_false</a:Name> -<a:Code>end_show_true_false</a:Code> +<a:Name>teacher_open_course_question_homework_setting_end_show_true_false</a:Name> +<a:Code>teacher_open_course_question_homework_setting_end_show_true_fals</a:Code> <a:CreationDate>1661873121</a:CreationDate> <a:Creator>lx</a:Creator> -<a:ModificationDate>1661873395</a:ModificationDate> +<a:ModificationDate>1663856552</a:ModificationDate> <a:Modifier>lx</a:Modifier> <a:Comment>答卷后显示答案对错</a:Comment> <a:DataType>int</a:DataType> </o:Column> <o:Column Id="o794"> <a:ObjectID>57F2E2C7-EF7A-4A4F-AF4D-A6D47A7AB0B3</a:ObjectID> -<a:Name>create_time</a:Name> -<a:Code>create_time</a:Code> +<a:Name>teacher_open_course_question_homework_setting_add_time</a:Name> +<a:Code>teacher_open_course_question_homework_setting_add_time</a:Code> <a:CreationDate>1661869211</a:CreationDate> <a:Creator>lx</a:Creator> -<a:ModificationDate>1661873118</a:ModificationDate> +<a:ModificationDate>1663856552</a:ModificationDate> <a:Modifier>lx</a:Modifier> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm index bca700d9..19720d03 100644 --- a/data_base_design/天泽数据大平台.pdm +++ b/data_base_design/天泽数据大平台.pdm @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1663856819" Name="cjks" Objects="1078" Symbols="98" 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="1663860130" Name="cjks" Objects="1090" Symbols="98" 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"> @@ -5795,9 +5795,9 @@ LABL 0 新宋体,8,N</a:FontList> </o:TableSymbol> <o:TableSymbol Id="o39"> <a:CreationDate>1661873118</a:CreationDate> -<a:ModificationDate>1663856819</a:ModificationDate> +<a:ModificationDate>1663860130</a:ModificationDate> <a:IconMode>-1</a:IconMode> -<a:Rect>((267653,59516), (284651,70644))</a:Rect> +<a:Rect>((267653,58796), (284651,70644))</a:Rect> <a:AutoAdjustToText>0</a:AutoAdjustToText> <a:LineColor>12615680</a:LineColor> <a:FillColor>16570034</a:FillColor> @@ -14560,7 +14560,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Code>teacher_open_course_homework_setting</a:Code> <a:CreationDate>1661850632</a:CreationDate> <a:Creator>lx</a:Creator> -<a:ModificationDate>1663856816</a:ModificationDate> +<a:ModificationDate>1663860127</a:ModificationDate> <a:Modifier>lx</a:Modifier> <a:Comment>我的课程-题库作业-作业设置</a:Comment> <a:PhysicalOptions>auto_increment = 1 @@ -14582,6 +14582,18 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> <o:Column Id="o788"> +<a:ObjectID>1B732079-0BAA-432C-900D-C8C3CBF52938</a:ObjectID> +<a:Name>teacher_open_course_question_homework_setting_school_class_ids</a:Name> +<a:Code>teacher_open_course_question_homework_setting_school_class_ids</a:Code> +<a:CreationDate>1663859987</a:CreationDate> +<a:Creator>lx</a:Creator> +<a:ModificationDate>1663860127</a:ModificationDate> +<a:Modifier>lx</a:Modifier> +<a:Comment>班级ID集合(逗号隔开)</a:Comment> +<a:DataType>varchar(2000)</a:DataType> +<a:Length>2000</a:Length> +</o:Column> +<o:Column Id="o789"> <a:ObjectID>9DA96F9A-14FC-4934-BDB7-D1CCC1FB86F8</a:ObjectID> <a:Name>teacher_open_course_question_homework_setting_do_count</a:Name> <a:Code>teacher_open_course_question_homework_setting_do_count</a:Code> @@ -14592,7 +14604,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>作答次数</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o789"> +<o:Column Id="o790"> <a:ObjectID>5CB8FE56-6E16-4DC3-8A9B-DB03E97AF4B5</a:ObjectID> <a:Name>teacher_open_course_question_homework_setting_question_no_order</a:Name> <a:Code>teacher_open_course_question_homework_setting_question_no_order</a:Code> @@ -14603,7 +14615,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>题目乱序(同一大题内)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o790"> +<o:Column Id="o791"> <a:ObjectID>20FFACDF-B137-465B-862F-2CA3C4FA11EC</a:ObjectID> <a:Name>teacher_open_course_question_homework_setting_option_no_order</a:Name> <a:Code>teacher_open_course_question_homework_setting_option_no_order</a:Code> @@ -14614,7 +14626,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>选项乱序(限单选、多选)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o791"> +<o:Column Id="o792"> <a:ObjectID>5A376621-C562-40F0-8D02-C4DAC7450591</a:ObjectID> <a:Name>teacher_open_course_question_homework_setting_end_show_qa</a:Name> <a:Code>teacher_open_course_question_homework_setting_end_show_qa</a:Code> @@ -14625,7 +14637,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>答卷后显示答案解析</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o792"> +<o:Column Id="o793"> <a:ObjectID>1C150809-8C8D-4945-8D83-9DC3BFEFB102</a:ObjectID> <a:Name>teacher_open_course_question_homework_setting_end_show_true_false</a:Name> <a:Code>teacher_open_course_question_homework_setting_end_show_true_fals</a:Code> @@ -14636,7 +14648,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>答卷后显示答案对错</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o793"> +<o:Column Id="o794"> <a:ObjectID>57F2E2C7-EF7A-4A4F-AF4D-A6D47A7AB0B3</a:ObjectID> <a:Name>teacher_open_course_question_homework_setting_add_time</a:Name> <a:Code>teacher_open_course_question_homework_setting_add_time</a:Code> @@ -14647,7 +14659,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o794"> +<o:Column Id="o795"> <a:ObjectID>B40E1FF8-8593-4864-B2D9-8CDC8D735147</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -14658,7 +14670,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o795"> +<o:Column Id="o796"> <a:ObjectID>3682C296-65EE-4C5B-A7EC-67518AF4A957</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -14671,7 +14683,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o796"> +<o:Key Id="o797"> <a:ObjectID>F4FAA62C-4DE1-4B7E-8B26-0372FCA0CB81</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -14685,7 +14697,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o796"/> +<o:Key Ref="o797"/> </c:PrimaryKey> </o:Table> <o:Table Id="o169"> @@ -14703,7 +14715,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o797"> +<o:Column Id="o798"> <a:ObjectID>AAE1F9BC-460A-44BE-8485-CAF0D4FBC051</a:ObjectID> <a:Name>teacher_open_course_homework_question_id</a:Name> <a:Code>teacher_open_course_homework_question_id</a:Code> @@ -14715,7 +14727,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o798"> +<o:Column Id="o799"> <a:ObjectID>934C7DCC-5F1E-4218-B0A1-D97EE0BF4270</a:ObjectID> <a:Name>question_id</a:Name> <a:Code>question_id</a:Code> @@ -14726,7 +14738,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>题目ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o799"> +<o:Column Id="o800"> <a:ObjectID>F54D31CA-A35D-4400-AB5C-C76A30146F44</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -14737,7 +14749,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o800"> +<o:Column Id="o801"> <a:ObjectID>0D1E6507-9239-4542-BDF9-4DEDB8B584C6</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -14748,7 +14760,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o801"> +<o:Column Id="o802"> <a:ObjectID>AD2BD690-FAFA-44FF-B69B-0C715B514E17</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -14761,7 +14773,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o802"> +<o:Key Id="o803"> <a:ObjectID>CED99964-AAF3-4AE0-A56F-00EF3071FBA5</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -14770,12 +14782,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1661873407</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o797"/> +<o:Column Ref="o798"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o802"/> +<o:Key Ref="o803"/> </c:PrimaryKey> </o:Table> <o:Table Id="o178"> @@ -14793,7 +14805,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o803"> +<o:Column Id="o804"> <a:ObjectID>359CF520-F941-43FC-ABC3-A42007360392</a:ObjectID> <a:Name>teacher_open_course_id</a:Name> <a:Code>teacher_open_course_id</a:Code> @@ -14805,7 +14817,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o804"> +<o:Column Id="o805"> <a:ObjectID>427BD12E-52C6-4F8C-9DB5-009A81081403</a:ObjectID> <a:Name>teacher_open_course_title</a:Name> <a:Code>teacher_open_course_title</a:Code> @@ -14817,7 +14829,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o805"> +<o:Column Id="o806"> <a:ObjectID>3660B35C-4AD7-455D-A555-B34A7E9D0C6D</a:ObjectID> <a:Name>teacher_open_course_code</a:Name> <a:Code>teacher_open_course_code</a:Code> @@ -14829,7 +14841,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(4000)</a:DataType> <a:Length>4000</a:Length> </o:Column> -<o:Column Id="o806"> +<o:Column Id="o807"> <a:ObjectID>49F2F568-CCE2-496C-978A-57F85FE5391F</a:ObjectID> <a:Name>teacher_open_course_cover</a:Name> <a:Code>teacher_open_course_cover</a:Code> @@ -14841,7 +14853,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(4000)</a:DataType> <a:Length>4000</a:Length> </o:Column> -<o:Column Id="o807"> +<o:Column Id="o808"> <a:ObjectID>B986E392-B39D-4BA9-AC5E-3187D850C22F</a:ObjectID> <a:Name>teacher_open_course_status</a:Name> <a:Code>teacher_open_course_status</a:Code> @@ -14852,7 +14864,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>开课状态(1启用 2禁用)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o808"> +<o:Column Id="o809"> <a:ObjectID>083896AA-92CD-4701-B8D9-3EBB668C587D</a:ObjectID> <a:Name>start_time</a:Name> <a:Code>start_time</a:Code> @@ -14863,7 +14875,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>开课时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o809"> +<o:Column Id="o810"> <a:ObjectID>7B41D575-7841-45B0-9087-0B171053ABDF</a:ObjectID> <a:Name>end_time</a:Name> <a:Code>end_time</a:Code> @@ -14874,7 +14886,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>结课时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o810"> +<o:Column Id="o811"> <a:ObjectID>D135E6B1-1D46-423C-8BA5-3BE33BAD695C</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -14885,7 +14897,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o811"> +<o:Column Id="o812"> <a:ObjectID>CEC061D5-828F-411E-95B8-FF0ACE08C616</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -14896,7 +14908,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o812"> +<o:Column Id="o813"> <a:ObjectID>7062F1DF-29AA-4C1F-94B8-B97E387CA221</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -14909,7 +14921,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o813"> +<o:Key Id="o814"> <a:ObjectID>724E566A-56E3-40C8-8351-36B34AEDF49F</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -14918,12 +14930,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1661949359</a:ModificationDate> <a:Modifier>87966</a:Modifier> <c:Key.Columns> -<o:Column Ref="o803"/> +<o:Column Ref="o804"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o813"/> +<o:Key Ref="o814"/> </c:PrimaryKey> </o:Table> <o:Table Id="o180"> @@ -14941,7 +14953,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o814"> +<o:Column Id="o815"> <a:ObjectID>8E6DFEE8-A047-46D3-9A07-11DE5DA62C16</a:ObjectID> <a:Name>school_class_student_id</a:Name> <a:Code>school_class_student_id</a:Code> @@ -14957,7 +14969,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </a:ExtendedAttributesText> </o:Column> -<o:Column Id="o815"> +<o:Column Id="o816"> <a:ObjectID>52309D8C-4843-46AD-977A-9A9F9C3F3346</a:ObjectID> <a:Name>school_class_id</a:Name> <a:Code>school_class_id</a:Code> @@ -14968,7 +14980,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>班级ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o816"> +<o:Column Id="o817"> <a:ObjectID>5454BBFF-5FB1-4878-978D-2E13F2342863</a:ObjectID> <a:Name>student_id</a:Name> <a:Code>student_id</a:Code> @@ -14980,7 +14992,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(255)</a:DataType> <a:Length>255</a:Length> </o:Column> -<o:Column Id="o817"> +<o:Column Id="o818"> <a:ObjectID>5D193920-D518-4045-B8F8-9B061CAD0E08</a:ObjectID> <a:Name>add_time</a:Name> <a:Code>add_time</a:Code> @@ -14991,7 +15003,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>添加时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o818"> +<o:Column Id="o819"> <a:ObjectID>7E292C6D-7BA9-4327-A380-C73E8DFAC127</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -15002,7 +15014,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织机构ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o819"> +<o:Column Id="o820"> <a:ObjectID>5FF8C653-6DCB-4C62-83BA-C89813F7199D</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -15015,7 +15027,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o820"> +<o:Key Id="o821"> <a:ObjectID>665EA40B-0158-4C77-9E59-154A04D640E2</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -15024,12 +15036,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1661953761</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o814"/> +<o:Column Ref="o815"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o820"/> +<o:Key Ref="o821"/> </c:PrimaryKey> </o:Table> <o:Table Id="o181"> @@ -15047,7 +15059,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o821"> +<o:Column Id="o822"> <a:ObjectID>0C10509D-670A-41D9-A190-7C6E8879DB41</a:ObjectID> <a:Name>application_merge_teacher_open_course_id</a:Name> <a:Code>application_merge_teacher_open_course_id</a:Code> @@ -15059,7 +15071,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o822"> +<o:Column Id="o823"> <a:ObjectID>8B4781AD-1C56-4EAF-B87B-96616E614557</a:ObjectID> <a:Name>application_id</a:Name> <a:Code>application_id</a:Code> @@ -15070,7 +15082,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>应用ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o823"> +<o:Column Id="o824"> <a:ObjectID>ECFE6701-B33B-495B-9A39-76D948538571</a:ObjectID> <a:Name>open_course_id</a:Name> <a:Code>open_course_id</a:Code> @@ -15081,7 +15093,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>教师开课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o824"> +<o:Column Id="o825"> <a:ObjectID>D1622BA3-8F97-47B6-B66D-C0D5846BA82A</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -15092,7 +15104,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o825"> +<o:Column Id="o826"> <a:ObjectID>E9B394A3-A4CB-4E5D-93B2-CE4E06A604DC</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -15103,7 +15115,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o826"> +<o:Column Id="o827"> <a:ObjectID>849A0316-E7DE-4865-900B-397446B53FEA</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -15116,7 +15128,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o827"> +<o:Key Id="o828"> <a:ObjectID>417C69EF-F92F-4971-815B-7AA961B89BC5</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -15125,12 +15137,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1661954157</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o821"/> +<o:Column Ref="o822"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o827"/> +<o:Key Ref="o828"/> </c:PrimaryKey> </o:Table> <o:Table Id="o182"> @@ -15148,7 +15160,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o828"> +<o:Column Id="o829"> <a:ObjectID>0EAD7F37-3889-4BD3-B7EC-D9BD0478BA21</a:ObjectID> <a:Name>teacher_merge_application_id</a:Name> <a:Code>teacher_merge_application_id</a:Code> @@ -15160,7 +15172,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o829"> +<o:Column Id="o830"> <a:ObjectID>75C0456B-F658-41CD-97ED-20B15A042D92</a:ObjectID> <a:Name>teacher_id</a:Name> <a:Code>teacher_id</a:Code> @@ -15171,7 +15183,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>教师ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o830"> +<o:Column Id="o831"> <a:ObjectID>22993B49-BDC1-4984-BCA4-8D0C2163DC8F</a:ObjectID> <a:Name>application_id</a:Name> <a:Code>application_id</a:Code> @@ -15182,7 +15194,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>应用ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o831"> +<o:Column Id="o832"> <a:ObjectID>B51DEA23-319E-4889-A33B-C391127D2E91</a:ObjectID> <a:Name>order_index</a:Name> <a:Code>order_index</a:Code> @@ -15194,7 +15206,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>int(2)</a:DataType> <a:Length>2</a:Length> </o:Column> -<o:Column Id="o832"> +<o:Column Id="o833"> <a:ObjectID>B56C59D5-A21C-4832-866F-FD9E67461758</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -15205,7 +15217,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o833"> +<o:Column Id="o834"> <a:ObjectID>90141AF2-C0D4-45F0-867B-36EC93D3CD8B</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -15216,7 +15228,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o834"> +<o:Column Id="o835"> <a:ObjectID>39E3CCB8-1F2E-480C-BC34-E1D5723259D6</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -15229,7 +15241,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o835"> +<o:Key Id="o836"> <a:ObjectID>08D3E9C4-B74D-477A-8A4D-BE22E585B167</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -15238,12 +15250,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1661954272</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o828"/> +<o:Column Ref="o829"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o835"/> +<o:Key Ref="o836"/> </c:PrimaryKey> </o:Table> <o:Table Id="o183"> @@ -15261,7 +15273,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o836"> +<o:Column Id="o837"> <a:ObjectID>FED8D142-2020-4E9C-A8C8-7B860CA642CF</a:ObjectID> <a:Name>teacher_open_course_school_class_merge_student_id</a:Name> <a:Code>teacher_open_course_school_class_merge_student_id</a:Code> @@ -15273,7 +15285,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o837"> +<o:Column Id="o838"> <a:ObjectID>4DEDD3F6-3919-4602-B549-7CC54021AC30</a:ObjectID> <a:Name>teacher_open_course_id</a:Name> <a:Code>teacher_open_course_id</a:Code> @@ -15284,7 +15296,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>课程开课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o838"> +<o:Column Id="o839"> <a:ObjectID>2BB34D52-A2A7-44F1-8A98-FC8B5C0A955A</a:ObjectID> <a:Name>student_id</a:Name> <a:Code>student_id</a:Code> @@ -15295,7 +15307,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>学生ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o839"> +<o:Column Id="o840"> <a:ObjectID>EC319A55-6852-40CB-88C0-DE1F41F9D7DF</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -15306,7 +15318,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o840"> +<o:Column Id="o841"> <a:ObjectID>A54FFF36-56CC-427C-BFA0-6376D3B6EEE3</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -15317,7 +15329,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o841"> +<o:Column Id="o842"> <a:ObjectID>EA0BF245-9346-4119-915C-F4ED28BC545B</a:ObjectID> <a:Name>teacher_open_course_school_class_merge_student_add_time</a:Name> <a:Code>teacher_open_course_school_class_merge_student_add_time</a:Code> @@ -15330,7 +15342,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o842"> +<o:Key Id="o843"> <a:ObjectID>33D305FE-8588-4D40-B7D4-E228D91FD068</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -15339,12 +15351,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1661955443</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o836"/> +<o:Column Ref="o837"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o842"/> +<o:Key Ref="o843"/> </c:PrimaryKey> </o:Table> <o:Table Id="o184"> @@ -15362,7 +15374,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o843"> +<o:Column Id="o844"> <a:ObjectID>AF3D06D0-8046-407D-8D01-0EB4F7C4430B</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_id</a:Name> <a:Code>teacher_open_course_schedule_session_tag_id</a:Code> @@ -15374,7 +15386,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o844"> +<o:Column Id="o845"> <a:ObjectID>63C7BC3C-E3F7-4260-836A-0B2D076E27C8</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_name</a:Name> <a:Code>teacher_open_course_schedule_session_tag_name</a:Code> @@ -15386,7 +15398,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o845"> +<o:Column Id="o846"> <a:ObjectID>FCC2ACE6-2A14-4428-A607-72EE9B21B5E6</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_duration</a:Name> <a:Code>teacher_open_course_schedule_session_tag_duration</a:Code> @@ -15397,7 +15409,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>课程时长(分钟)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o846"> +<o:Column Id="o847"> <a:ObjectID>8851F4F5-A578-41C8-9DAF-B7A2F7796E7D</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_add_time</a:Name> <a:Code>teacher_open_course_schedule_session_tag_add_time</a:Code> @@ -15408,7 +15420,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o847"> +<o:Column Id="o848"> <a:ObjectID>BE3DB6FF-142D-4A29-A9A3-B10FF0C5759B</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_start_time</a:Name> <a:Code>teacher_open_course_schedule_session_tag_start_time</a:Code> @@ -15420,7 +15432,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(10)</a:DataType> <a:Length>10</a:Length> </o:Column> -<o:Column Id="o848"> +<o:Column Id="o849"> <a:ObjectID>48411774-FB89-4143-9D62-59DEF8EE1E32</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_end_time</a:Name> <a:Code>teacher_open_course_schedule_session_tag_end_time</a:Code> @@ -15432,7 +15444,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(10)</a:DataType> <a:Length>10</a:Length> </o:Column> -<o:Column Id="o849"> +<o:Column Id="o850"> <a:ObjectID>C346B065-C2ED-4D45-A0D7-F357EFD8839A</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -15443,7 +15455,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o850"> +<o:Column Id="o851"> <a:ObjectID>F58C2E06-124C-4A14-B564-A92BCE8B2AB6</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -15456,7 +15468,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o851"> +<o:Key Id="o852"> <a:ObjectID>6A318D25-C9C4-44C9-9C79-18E725965208</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -15465,12 +15477,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662810962</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o843"/> +<o:Column Ref="o844"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o851"/> +<o:Key Ref="o852"/> </c:PrimaryKey> </o:Table> <o:Table Id="o185"> @@ -15488,7 +15500,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o852"> +<o:Column Id="o853"> <a:ObjectID>5F40DE55-D689-437C-AA5A-D68EE5177EBA</a:ObjectID> <a:Name>teacher_open_course_student_signin_setting_id</a:Name> <a:Code>teacher_open_course_student_signin_setting_id</a:Code> @@ -15500,7 +15512,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o853"> +<o:Column Id="o854"> <a:ObjectID>45A0C89F-9D2D-42C1-8666-997CE6D29EB1</a:ObjectID> <a:Name>open_course_id</a:Name> <a:Code>open_course_id</a:Code> @@ -15511,7 +15523,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>开课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o854"> +<o:Column Id="o855"> <a:ObjectID>3A7ED4E2-6702-471D-BB8C-97028D55FCD0</a:ObjectID> <a:Name>school_class_id</a:Name> <a:Code>school_class_id</a:Code> @@ -15522,7 +15534,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>班级ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o855"> +<o:Column Id="o856"> <a:ObjectID>D5476993-DD9A-4B96-9C4B-183D5FB88447</a:ObjectID> <a:Name>type</a:Name> <a:Code>type</a:Code> @@ -15534,7 +15546,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(50)</a:DataType> <a:Length>50</a:Length> </o:Column> -<o:Column Id="o856"> +<o:Column Id="o857"> <a:ObjectID>3A0547DC-282A-4E24-AB04-6F8D270E3422</a:ObjectID> <a:Name>value</a:Name> <a:Code>value</a:Code> @@ -15546,7 +15558,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(50)</a:DataType> <a:Length>50</a:Length> </o:Column> -<o:Column Id="o857"> +<o:Column Id="o858"> <a:ObjectID>F844F21D-B808-46C3-8B99-FF63B1DD6F60</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -15557,7 +15569,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o858"> +<o:Column Id="o859"> <a:ObjectID>5E7E66D8-A3B5-4355-9A11-5942AEE4D028</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -15568,7 +15580,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o859"> +<o:Column Id="o860"> <a:ObjectID>C953231B-E473-4F11-9DDB-57C25077D504</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -15581,7 +15593,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o860"> +<o:Key Id="o861"> <a:ObjectID>EB349942-35A7-44DC-A505-B80E66CA1F63</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -15590,12 +15602,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1661960474</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o852"/> +<o:Column Ref="o853"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o860"/> +<o:Key Ref="o861"/> </c:PrimaryKey> </o:Table> <o:Table Id="o186"> @@ -15613,7 +15625,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o861"> +<o:Column Id="o862"> <a:ObjectID>C9A3B75C-FBF8-4D85-BE76-72E3FC2C2B1F</a:ObjectID> <a:Name>teacher_open_course_chat_log_id</a:Name> <a:Code>teacher_open_course_chat_log_id</a:Code> @@ -15625,7 +15637,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o862"> +<o:Column Id="o863"> <a:ObjectID>4A6E2BA8-7896-4993-8CC0-CFD616E08BBB</a:ObjectID> <a:Name>teacher_open_course_chat_log_parent_id</a:Name> <a:Code>teacher_open_course_chat_log_parent_id</a:Code> @@ -15636,7 +15648,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>上级ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o863"> +<o:Column Id="o864"> <a:ObjectID>9FB26692-4080-41CD-AE24-7FD5A53526C6</a:ObjectID> <a:Name>teacher_open_course_id</a:Name> <a:Code>teacher_open_course_id</a:Code> @@ -15647,7 +15659,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>课程开课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o864"> +<o:Column Id="o865"> <a:ObjectID>D7BD01D2-4D7E-4228-B94F-711BB78D809D</a:ObjectID> <a:Name>school_class_ids</a:Name> <a:Code>school_class_ids</a:Code> @@ -15659,7 +15671,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(4000)</a:DataType> <a:Length>4000</a:Length> </o:Column> -<o:Column Id="o865"> +<o:Column Id="o866"> <a:ObjectID>18589108-4394-4335-8B90-7E3795F82B8A</a:ObjectID> <a:Name>teacher_id</a:Name> <a:Code>teacher_id</a:Code> @@ -15670,7 +15682,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>教师ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o866"> +<o:Column Id="o867"> <a:ObjectID>2EDC1791-6AB4-47F1-8A97-4E8B2EE17830</a:ObjectID> <a:Name>student_id</a:Name> <a:Code>student_id</a:Code> @@ -15681,7 +15693,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>学生ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o867"> +<o:Column Id="o868"> <a:ObjectID>320B068F-2EFF-4C93-9044-C188C5E1BD85</a:ObjectID> <a:Name>chat_content</a:Name> <a:Code>chat_content</a:Code> @@ -15695,7 +15707,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </a:ExtendedAttributesText> </o:Column> -<o:Column Id="o868"> +<o:Column Id="o869"> <a:ObjectID>D2108D51-47D4-4398-942C-4DA987E91A52</a:ObjectID> <a:Name>keywords</a:Name> <a:Code>keywords</a:Code> @@ -15707,7 +15719,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(500)</a:DataType> <a:Length>500</a:Length> </o:Column> -<o:Column Id="o869"> +<o:Column Id="o870"> <a:ObjectID>087CD32F-4937-42CD-BD4C-474406B07466</a:ObjectID> <a:Name>score</a:Name> <a:Code>student_score</a:Code> @@ -15718,7 +15730,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>学生得分</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o870"> +<o:Column Id="o871"> <a:ObjectID>CAF2D8D3-F5A5-4FDF-B876-2EDBFE0FAC7D</a:ObjectID> <a:Name>chat_files</a:Name> <a:Code>chat_files</a:Code> @@ -15730,7 +15742,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(4000)</a:DataType> <a:Length>4000</a:Length> </o:Column> -<o:Column Id="o871"> +<o:Column Id="o872"> <a:ObjectID>73146904-4C03-4C3F-A10C-34E2F07E3F5A</a:ObjectID> <a:Name>teacher_open_course_chat_log_status</a:Name> <a:Code>teacher_open_course_chat_log_status</a:Code> @@ -15741,7 +15753,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态 (1正常 2删除)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o872"> +<o:Column Id="o873"> <a:ObjectID>F4E24A74-7879-4FA7-A31A-1DF43C87CCA9</a:ObjectID> <a:Name>teacher_open_course_chat_log_add_time</a:Name> <a:Code>teacher_open_course_chat_log_add_time</a:Code> @@ -15752,7 +15764,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o873"> +<o:Column Id="o874"> <a:ObjectID>915B6210-D43D-4773-A051-C208B1123038</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -15763,7 +15775,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o874"> +<o:Column Id="o875"> <a:ObjectID>052B1726-9F05-49F3-9AE1-E73D36F22ED1</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -15776,7 +15788,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o875"> +<o:Key Id="o876"> <a:ObjectID>A2E2569E-143D-40A6-AFFD-4B17369021C3</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -15785,12 +15797,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662020297</a:ModificationDate> <a:Modifier>87966</a:Modifier> <c:Key.Columns> -<o:Column Ref="o861"/> +<o:Column Ref="o862"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o875"/> +<o:Key Ref="o876"/> </c:PrimaryKey> </o:Table> <o:Table Id="o187"> @@ -15808,7 +15820,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o876"> +<o:Column Id="o877"> <a:ObjectID>009A23DE-07AF-4EA6-BBDD-26850AABC8AC</a:ObjectID> <a:Name>teacher_open_course_homework_question_log_id</a:Name> <a:Code>teacher_open_course_homework_question_log_id</a:Code> @@ -15820,7 +15832,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o877"> +<o:Column Id="o878"> <a:ObjectID>E732E580-555A-47D5-864B-E868302C4391</a:ObjectID> <a:Name>teacher_open_course_question_homework_id</a:Name> <a:Code>teacher_open_course_question_homework_id</a:Code> @@ -15831,7 +15843,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>题库作业ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o878"> +<o:Column Id="o879"> <a:ObjectID>7492312E-B2F8-4A26-A165-E1D31D254D90</a:ObjectID> <a:Name>student_upload_file</a:Name> <a:Code>student_upload_file</a:Code> @@ -15843,7 +15855,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(200)</a:DataType> <a:Length>200</a:Length> </o:Column> -<o:Column Id="o879"> +<o:Column Id="o880"> <a:ObjectID>908C4B9C-AFDD-46B4-9E2F-BC84BEB3395B</a:ObjectID> <a:Name>student_score</a:Name> <a:Code>student_score</a:Code> @@ -15854,7 +15866,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>学生得分</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o880"> +<o:Column Id="o881"> <a:ObjectID>10DDF717-440B-465D-A18F-E9935C9BA8E4</a:ObjectID> <a:Name>reply_content</a:Name> <a:Code>reply_content</a:Code> @@ -15866,7 +15878,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(500)</a:DataType> <a:Length>500</a:Length> </o:Column> -<o:Column Id="o881"> +<o:Column Id="o882"> <a:ObjectID>C06A272B-5147-40B7-8E49-1E6B509123F6</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -15877,7 +15889,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o882"> +<o:Column Id="o883"> <a:ObjectID>F8795A3A-9DD9-4F5A-906A-E6964444570C</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -15888,7 +15900,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o883"> +<o:Column Id="o884"> <a:ObjectID>1993A879-EC68-450A-B775-D7C2671BDA96</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -15901,7 +15913,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o884"> +<o:Key Id="o885"> <a:ObjectID>FF4A3064-63A4-4FAD-A71D-F66FD27F3A94</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -15910,12 +15922,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662044179</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o876"/> +<o:Column Ref="o877"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o884"/> +<o:Key Ref="o885"/> </c:PrimaryKey> </o:Table> <o:Table Id="o189"> @@ -15939,7 +15951,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> } </a:Description> <c:Columns> -<o:Column Id="o885"> +<o:Column Id="o886"> <a:ObjectID>03C2172E-8A06-48E0-8C25-4102C8253653</a:ObjectID> <a:Name>core_setting_id</a:Name> <a:Code>core_setting_id</a:Code> @@ -15951,7 +15963,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o886"> +<o:Column Id="o887"> <a:ObjectID>5090D458-E136-4D46-9D89-930A55ED9A2C</a:ObjectID> <a:Name>setting_key</a:Name> <a:Code>setting_key</a:Code> @@ -15963,7 +15975,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o887"> +<o:Column Id="o888"> <a:ObjectID>0D922C4C-8420-482B-87B6-B0E99FBA62E0</a:ObjectID> <a:Name>setting_value</a:Name> <a:Code>setting_value</a:Code> @@ -15974,7 +15986,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>配置项</a:Comment> <a:DataType>text</a:DataType> </o:Column> -<o:Column Id="o888"> +<o:Column Id="o889"> <a:ObjectID>A89D7A99-CD44-4F4E-8337-14A5D4BEE13E</a:ObjectID> <a:Name>core_setting_stauts</a:Name> <a:Code>core_setting_stauts</a:Code> @@ -15985,7 +15997,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态 (1正常 2删除)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o889"> +<o:Column Id="o890"> <a:ObjectID>D4790CD3-3634-4FB5-B1F8-DDCA61E7AC11</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -15996,7 +16008,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o890"> +<o:Column Id="o891"> <a:ObjectID>A9346C05-5EA0-4D30-A522-9DD5B13FCE7E</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -16007,7 +16019,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o891"> +<o:Column Id="o892"> <a:ObjectID>D46E4A36-6D0D-4F64-9C58-CAC3D1285F24</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -16020,7 +16032,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o892"> +<o:Key Id="o893"> <a:ObjectID>8E777505-B813-4D1D-8C5F-B6F9747BA0F4</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -16029,12 +16041,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662045362</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o885"/> +<o:Column Ref="o886"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o892"/> +<o:Key Ref="o893"/> </c:PrimaryKey> </o:Table> <o:Table Id="o190"> @@ -16052,7 +16064,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o893"> +<o:Column Id="o894"> <a:ObjectID>18F050CC-F084-477F-8759-28E1D015FE0B</a:ObjectID> <a:Name>teacher_open_course_score_dashboard_id</a:Name> <a:Code>teacher_open_course_score_dashboard_id</a:Code> @@ -16064,7 +16076,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o894"> +<o:Column Id="o895"> <a:ObjectID>C33241B0-D288-44ED-8554-C7086F839648</a:ObjectID> <a:Name>student_id</a:Name> <a:Code>student_id</a:Code> @@ -16075,7 +16087,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>学生ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o895"> +<o:Column Id="o896"> <a:ObjectID>155275C4-795A-4763-9C39-3FDF35ECECCA</a:ObjectID> <a:Name>signin_score</a:Name> <a:Code>signin_score</a:Code> @@ -16086,7 +16098,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>签到成绩</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o896"> +<o:Column Id="o897"> <a:ObjectID>26A9701D-C572-427D-8AD8-4D4D9DDC105D</a:ObjectID> <a:Name>course_score</a:Name> <a:Code>course_score</a:Code> @@ -16097,7 +16109,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>章节练习成绩</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o897"> +<o:Column Id="o898"> <a:ObjectID>B1C7AFAC-3115-4EEF-855F-7578BE5C5555</a:ObjectID> <a:Name>real_operation_score</a:Name> <a:Code>real_operation_score</a:Code> @@ -16108,7 +16120,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>课程实操成绩</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o898"> +<o:Column Id="o899"> <a:ObjectID>AC3C7572-A095-42DE-99A5-3E8D2B9D3602</a:ObjectID> <a:Name>question_homework_score</a:Name> <a:Code>question_homework_score</a:Code> @@ -16119,7 +16131,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>作业成绩</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o899"> +<o:Column Id="o900"> <a:ObjectID>CB0FDAE5-DDBD-42D1-8E59-3B91E44A45C8</a:ObjectID> <a:Name>exam_score</a:Name> <a:Code>exam_score</a:Code> @@ -16130,7 +16142,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>考试成绩</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o900"> +<o:Column Id="o901"> <a:ObjectID>A37D010B-5B7E-4815-AC10-65C79F878234</a:ObjectID> <a:Name>chat_score</a:Name> <a:Code>chat_score</a:Code> @@ -16141,7 +16153,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>互动成绩</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o901"> +<o:Column Id="o902"> <a:ObjectID>D91526BC-31BA-4121-9416-7DB95281202C</a:ObjectID> <a:Name>total_score</a:Name> <a:Code>total_score</a:Code> @@ -16152,7 +16164,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>总成绩</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o902"> +<o:Column Id="o903"> <a:ObjectID>95464B6A-6611-4674-BBA4-EF869A472F84</a:ObjectID> <a:Name>manual_score</a:Name> <a:Code>manual_score</a:Code> @@ -16163,7 +16175,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>手动调整的分数</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o903"> +<o:Column Id="o904"> <a:ObjectID>8E062DAC-DA29-4940-AEC3-1B8EFB468904</a:ObjectID> <a:Name>last_score</a:Name> <a:Code>last_score</a:Code> @@ -16174,7 +16186,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>最终成绩</a:Comment> <a:DataType>float</a:DataType> </o:Column> -<o:Column Id="o904"> +<o:Column Id="o905"> <a:ObjectID>696B62F5-6BCE-4377-8F04-F452C9FE5368</a:ObjectID> <a:Name>last_status</a:Name> <a:Code>last_status</a:Code> @@ -16186,7 +16198,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(10)</a:DataType> <a:Length>10</a:Length> </o:Column> -<o:Column Id="o905"> +<o:Column Id="o906"> <a:ObjectID>D2334132-07CC-40C5-8A37-6F95CC12A041</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -16197,7 +16209,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o906"> +<o:Column Id="o907"> <a:ObjectID>7BBBDC7F-C5E3-424A-AC3C-00E94E564F45</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -16208,7 +16220,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o907"> +<o:Column Id="o908"> <a:ObjectID>CE5A2441-64A4-4C2A-8646-8D6CFE6C2A73</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -16221,7 +16233,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o908"> +<o:Key Id="o909"> <a:ObjectID>6B3359F7-B844-4B95-9C3B-A4AAFBA27617</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -16230,12 +16242,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662045706</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o893"/> +<o:Column Ref="o894"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o908"/> +<o:Key Ref="o909"/> </c:PrimaryKey> </o:Table> <o:Table Id="o191"> @@ -16258,7 +16270,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> } </a:Description> <c:Columns> -<o:Column Id="o909"> +<o:Column Id="o910"> <a:ObjectID>318651DC-E71A-449A-96A8-19F27C71F4AC</a:ObjectID> <a:Name>teacher_open_course_notice_id</a:Name> <a:Code>teacher_open_course_notice_id</a:Code> @@ -16270,7 +16282,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o910"> +<o:Column Id="o911"> <a:ObjectID>F972E98C-839A-4F8E-B2B7-A92F064483DB</a:ObjectID> <a:Name>school_class_ids</a:Name> <a:Code>school_class_ids</a:Code> @@ -16282,7 +16294,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(2000)</a:DataType> <a:Length>2000</a:Length> </o:Column> -<o:Column Id="o911"> +<o:Column Id="o912"> <a:ObjectID>E3F89C48-E4A1-4B9B-AE85-66EE2378EC58</a:ObjectID> <a:Name>teacher_open_course_ids</a:Name> <a:Code>teacher_open_course_ids</a:Code> @@ -16294,7 +16306,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(2000)</a:DataType> <a:Length>2000</a:Length> </o:Column> -<o:Column Id="o912"> +<o:Column Id="o913"> <a:ObjectID>9072D638-91A2-45E3-B01A-56FD07AC2DBC</a:ObjectID> <a:Name>notice_title</a:Name> <a:Code>notice_title</a:Code> @@ -16306,7 +16318,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o913"> +<o:Column Id="o914"> <a:ObjectID>2AED03DE-64F7-47AF-810B-CC78F23EEF22</a:ObjectID> <a:Name>notice_content</a:Name> <a:Code>notice_content</a:Code> @@ -16318,7 +16330,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o914"> +<o:Column Id="o915"> <a:ObjectID>08862E80-7DDC-40DF-8E1B-DCFED6B33AC8</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -16329,7 +16341,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o915"> +<o:Column Id="o916"> <a:ObjectID>A04525A6-FB16-4CCC-9753-4907D73BA676</a:ObjectID> <a:Name>create_by_teacher_id</a:Name> <a:Code>create_by_teacher_id</a:Code> @@ -16340,7 +16352,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>消息创建--老师ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o916"> +<o:Column Id="o917"> <a:ObjectID>3B6BA47A-A3E1-41B3-B8E8-B877AF7DFB5B</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -16351,7 +16363,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o917"> +<o:Column Id="o918"> <a:ObjectID>E49B7F20-513A-4E10-BEE8-D5B768200303</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -16362,7 +16374,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o918"> +<o:Column Id="o919"> <a:ObjectID>C28FF8AA-D0BD-4EFE-8BEE-802D56989498</a:ObjectID> <a:Name>del_flag</a:Name> <a:Code>del_flag</a:Code> @@ -16375,7 +16387,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o919"> +<o:Key Id="o920"> <a:ObjectID>3D2650BD-129F-48EC-B75C-872417A4E822</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -16384,12 +16396,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662046440</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o909"/> +<o:Column Ref="o910"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o919"/> +<o:Key Ref="o920"/> </c:PrimaryKey> </o:Table> <o:Table Id="o192"> @@ -16412,7 +16424,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> } </a:Description> <c:Columns> -<o:Column Id="o920"> +<o:Column Id="o921"> <a:ObjectID>3DB701D7-DA2C-4296-853B-38D2E719CCA6</a:ObjectID> <a:Name>teacher_open_course_knowledge_point_id</a:Name> <a:Code>teacher_open_course_knowledge_point_id</a:Code> @@ -16424,7 +16436,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o921"> +<o:Column Id="o922"> <a:ObjectID>171BF047-E676-4C5B-89B3-8B25136416A7</a:ObjectID> <a:Name>teacher_open_course_id</a:Name> <a:Code>teacher_open_course_id</a:Code> @@ -16435,7 +16447,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>课程开课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o922"> +<o:Column Id="o923"> <a:ObjectID>0B7D7F9A-015D-42DD-8116-30CEC65236D8</a:ObjectID> <a:Name>chapter_id</a:Name> <a:Code>chapter_id</a:Code> @@ -16446,7 +16458,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>章节ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o923"> +<o:Column Id="o924"> <a:ObjectID>E622D525-8AFB-4926-AE32-117E18C429E0</a:ObjectID> <a:Name>teacher_open_course_knowledge_point_title</a:Name> <a:Code>teacher_open_course_knowledge_point_title</a:Code> @@ -16458,7 +16470,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o924"> +<o:Column Id="o925"> <a:ObjectID>B1BD789A-9684-4E7A-AD8A-BE79C7B6C7C8</a:ObjectID> <a:Name>teacher_open_course_knowledge_point_content</a:Name> <a:Code>teacher_open_course_knowledge_point_content</a:Code> @@ -16470,7 +16482,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(4000)</a:DataType> <a:Length>4000</a:Length> </o:Column> -<o:Column Id="o925"> +<o:Column Id="o926"> <a:ObjectID>C44A8ACF-B4BC-4140-9003-1ADAC230C1DA</a:ObjectID> <a:Name>teacher_open_course_knowledge_point_status</a:Name> <a:Code>teacher_open_course_knowledge_point_status</a:Code> @@ -16481,7 +16493,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态 (1正常 2删除)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o926"> +<o:Column Id="o927"> <a:ObjectID>35B92FEF-A383-4FD2-AAC3-10355BCA6896</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -16492,7 +16504,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o927"> +<o:Column Id="o928"> <a:ObjectID>2745088B-3993-46E7-9035-2EF382FEC082</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -16503,7 +16515,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o928"> +<o:Column Id="o929"> <a:ObjectID>9699889E-0268-4565-971A-41D449A2A5F2</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -16516,7 +16528,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o929"> +<o:Key Id="o930"> <a:ObjectID>75299271-38A3-44A7-824D-00792734CF12</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -16525,12 +16537,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662047767</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o920"/> +<o:Column Ref="o921"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o929"/> +<o:Key Ref="o930"/> </c:PrimaryKey> </o:Table> <o:Table Id="o194"> @@ -16548,7 +16560,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o930"> +<o:Column Id="o931"> <a:ObjectID>326FA1E3-0BA3-420E-8242-ED8A4A4F0617</a:ObjectID> <a:Name>student_client_link_id</a:Name> <a:Code>student_client_link_id</a:Code> @@ -16560,7 +16572,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o931"> +<o:Column Id="o932"> <a:ObjectID>E2FC1BD3-0EBA-4330-A432-204E68A01861</a:ObjectID> <a:Name>student_client_link_order</a:Name> <a:Code>student_client_link_order</a:Code> @@ -16571,7 +16583,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>导航栏排序</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o932"> +<o:Column Id="o933"> <a:ObjectID>A897CD71-A97A-450E-92FA-72474727C640</a:ObjectID> <a:Name>student_client_link_title</a:Name> <a:Code>student_client_link_title</a:Code> @@ -16583,7 +16595,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(50)</a:DataType> <a:Length>50</a:Length> </o:Column> -<o:Column Id="o933"> +<o:Column Id="o934"> <a:ObjectID>B988F3BD-EEE2-40FB-9E5E-73ABC59935D9</a:ObjectID> <a:Name>student_client_link_content</a:Name> <a:Code>student_client_link_content</a:Code> @@ -16595,7 +16607,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(2000)</a:DataType> <a:Length>2000</a:Length> </o:Column> -<o:Column Id="o934"> +<o:Column Id="o935"> <a:ObjectID>C9FBBBB6-7477-4B29-8A15-08222FB01DE8</a:ObjectID> <a:Name>student_client_link_type</a:Name> <a:Code>student_client_link_type</a:Code> @@ -16607,7 +16619,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(50)</a:DataType> <a:Length>50</a:Length> </o:Column> -<o:Column Id="o935"> +<o:Column Id="o936"> <a:ObjectID>B5987B41-6AE9-469F-A36F-48C3C9674252</a:ObjectID> <a:Name>student_client_link_img</a:Name> <a:Code>student_client_link_img</a:Code> @@ -16618,7 +16630,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>链接图片(可用于轮播大图,icon小图等功能)</a:Comment> <a:DataType>text</a:DataType> </o:Column> -<o:Column Id="o936"> +<o:Column Id="o937"> <a:ObjectID>DD99CF28-4303-4935-8168-CE022C8C31CD</a:ObjectID> <a:Name>student_client_link_status</a:Name> <a:Code>student_client_link_status</a:Code> @@ -16629,7 +16641,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态( 1 正常 2删除)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o937"> +<o:Column Id="o938"> <a:ObjectID>963FA155-9A25-41BA-8B52-209536B76758</a:ObjectID> <a:Name>student_client_link_open_type</a:Name> <a:Code>student_client_link_open_type</a:Code> @@ -16641,7 +16653,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(50)</a:DataType> <a:Length>50</a:Length> </o:Column> -<o:Column Id="o938"> +<o:Column Id="o939"> <a:ObjectID>05CE988B-2AF5-4A63-9451-25A9EF95C5DB</a:ObjectID> <a:Name>create_time</a:Name> <a:Code>create_time</a:Code> @@ -16652,7 +16664,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o939"> +<o:Column Id="o940"> <a:ObjectID>1E5FBB70-DADA-4251-9BDA-85E132223109</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -16663,7 +16675,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o940"> +<o:Column Id="o941"> <a:ObjectID>F1483087-727F-4BFE-97BA-9692FD8D1AB2</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -16676,7 +16688,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o941"> +<o:Key Id="o942"> <a:ObjectID>B095A5B3-D6C4-40C4-B986-497B3849ED54</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -16685,12 +16697,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662554252</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o930"/> +<o:Column Ref="o931"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o941"/> +<o:Key Ref="o942"/> </c:PrimaryKey> </o:Table> <o:Table Id="o196"> @@ -16708,7 +16720,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o942"> +<o:Column Id="o943"> <a:ObjectID>CCCB7690-1E0F-4355-AC7A-ABB58CC8632B</a:ObjectID> <a:Name>university_system_id</a:Name> <a:Code>university_system_id</a:Code> @@ -16720,7 +16732,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o943"> +<o:Column Id="o944"> <a:ObjectID>B0D08F82-9D1C-42E8-B332-4422FC72BF67</a:ObjectID> <a:Name>university_system_name</a:Name> <a:Code>university_system_name</a:Code> @@ -16732,7 +16744,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o944"> +<o:Column Id="o945"> <a:ObjectID>8A8F809D-A11E-4F1E-AB4B-C8B02D1DA3AB</a:ObjectID> <a:Name>university_system_contact</a:Name> <a:Code>university_system_contact</a:Code> @@ -16744,7 +16756,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(50)</a:DataType> <a:Length>50</a:Length> </o:Column> -<o:Column Id="o945"> +<o:Column Id="o946"> <a:ObjectID>1F10D7BD-3F66-4E4E-AA41-06A06D9D00D1</a:ObjectID> <a:Name>university_system_contact_tel</a:Name> <a:Code>university_system_contact_tel</a:Code> @@ -16756,7 +16768,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(20)</a:DataType> <a:Length>20</a:Length> </o:Column> -<o:Column Id="o946"> +<o:Column Id="o947"> <a:ObjectID>139361B7-C257-4094-9BCE-1F8A44668480</a:ObjectID> <a:Name>university_system_add_time</a:Name> <a:Code>university_system_add_time</a:Code> @@ -16767,7 +16779,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o947"> +<o:Column Id="o948"> <a:ObjectID>7BA84D60-66CD-47EA-8DCB-025AEFC85CFF</a:ObjectID> <a:Name>university_system_status</a:Name> <a:Code>university_system_status</a:Code> @@ -16778,7 +16790,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态 (1正常 2删除)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o948"> +<o:Column Id="o949"> <a:ObjectID>EE6D1A35-06C2-4560-B40B-D1E87CA5F291</a:ObjectID> <a:Name>university_faculty_id</a:Name> <a:Code>university_faculty_id</a:Code> @@ -16789,7 +16801,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>院系ID(学院ID)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o949"> +<o:Column Id="o950"> <a:ObjectID>87AEE496-5BD2-4A50-ACC8-980A708FC4DB</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -16800,7 +16812,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o950"> +<o:Column Id="o951"> <a:ObjectID>6D140299-48E6-4630-99C8-D96E361AB3B1</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -16813,7 +16825,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o951"> +<o:Key Id="o952"> <a:ObjectID>F02FEAFC-6CDC-461B-BCD4-A60CB97164BA</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -16822,12 +16834,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662648377</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o942"/> +<o:Column Ref="o943"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o951"/> +<o:Key Ref="o952"/> </c:PrimaryKey> </o:Table> <o:Table Id="o198"> @@ -16845,7 +16857,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o952"> +<o:Column Id="o953"> <a:ObjectID>884F2204-DCE1-485E-A4B2-D4378BEE2044</a:ObjectID> <a:Name>university_faculty_id</a:Name> <a:Code>university_faculty_id</a:Code> @@ -16857,7 +16869,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o953"> +<o:Column Id="o954"> <a:ObjectID>2AB481C3-D261-4ADD-B9F9-146124372F4B</a:ObjectID> <a:Name>university_faculty_name</a:Name> <a:Code>university_faculty_name</a:Code> @@ -16869,7 +16881,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o954"> +<o:Column Id="o955"> <a:ObjectID>04BE427C-8D5A-48B8-808F-80D87158F9E4</a:ObjectID> <a:Name>university_faculty_contact</a:Name> <a:Code>university_faculty_contact</a:Code> @@ -16881,7 +16893,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(50)</a:DataType> <a:Length>50</a:Length> </o:Column> -<o:Column Id="o955"> +<o:Column Id="o956"> <a:ObjectID>A6EF43AB-F19B-4BE5-B34E-D4AE59D57B17</a:ObjectID> <a:Name>university_faculty_contact_tel</a:Name> <a:Code>university_faculty_contact_tel</a:Code> @@ -16893,7 +16905,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(20)</a:DataType> <a:Length>20</a:Length> </o:Column> -<o:Column Id="o956"> +<o:Column Id="o957"> <a:ObjectID>C8BE2BF4-F676-43CB-A1CE-369836C8D540</a:ObjectID> <a:Name>university_faculty_contact_address</a:Name> <a:Code>university_faculty_contact_address</a:Code> @@ -16905,7 +16917,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(200)</a:DataType> <a:Length>200</a:Length> </o:Column> -<o:Column Id="o957"> +<o:Column Id="o958"> <a:ObjectID>68386B1B-1359-4E14-80BB-D40EB3E6D05E</a:ObjectID> <a:Name>universities_colleges_id</a:Name> <a:Code>universities_colleges_id</a:Code> @@ -16916,7 +16928,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>院校ID (院系的上一级)</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o958"> +<o:Column Id="o959"> <a:ObjectID>34891715-8E26-4F10-A789-93454383373B</a:ObjectID> <a:Name>university_faculty_status</a:Name> <a:Code>university_faculty_status</a:Code> @@ -16927,7 +16939,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态( 1 正常 2删除)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o959"> +<o:Column Id="o960"> <a:ObjectID>7EA4E9C0-C919-4B3F-8300-66888606CDFE</a:ObjectID> <a:Name>university_faculty_add_time</a:Name> <a:Code>university_faculty_add_time</a:Code> @@ -16938,7 +16950,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o960"> +<o:Column Id="o961"> <a:ObjectID>860EA0A3-DB84-4B76-BB61-CD32C4838D5E</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -16949,7 +16961,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o961"> +<o:Column Id="o962"> <a:ObjectID>6D5D545B-7423-4471-B969-D5AD4F7D6459</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -16962,7 +16974,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o962"> +<o:Key Id="o963"> <a:ObjectID>8827D654-DDB8-4D1E-A500-362CE79333F8</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -16971,12 +16983,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662648708</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o952"/> +<o:Column Ref="o953"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o962"/> +<o:Key Ref="o963"/> </c:PrimaryKey> </o:Table> <o:Table Id="o199"> @@ -16994,7 +17006,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o963"> +<o:Column Id="o964"> <a:ObjectID>5288224C-53C1-4C24-B9E9-054F89E3408E</a:ObjectID> <a:Name>teacher_open_course_schedule_session_class_id</a:Name> <a:Code>teacher_open_course_schedule_session_class_id</a:Code> @@ -17006,7 +17018,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o964"> +<o:Column Id="o965"> <a:ObjectID>9F4A9A8A-17A5-4DDE-B4C8-5B1CAB398160</a:ObjectID> <a:Name>teacher_open_course_schedule_session_class_name</a:Name> <a:Code>teacher_open_course_schedule_session_class_name</a:Code> @@ -17018,7 +17030,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o965"> +<o:Column Id="o966"> <a:ObjectID>9BC97CEE-44E7-4253-BD67-61CE17D5A991</a:ObjectID> <a:Name>teacher_open_course_schedule_session_class_parent_id</a:Name> <a:Code>teacher_open_course_schedule_session_class_parent_id</a:Code> @@ -17030,7 +17042,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o966"> +<o:Column Id="o967"> <a:ObjectID>B86F6DCB-0565-4214-A6DA-1A973CE66EA1</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -17041,7 +17053,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o967"> +<o:Column Id="o968"> <a:ObjectID>056FDBB3-D0F8-4845-BD40-72B5A4B1932F</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -17052,7 +17064,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o968"> +<o:Column Id="o969"> <a:ObjectID>095D37B8-4403-4981-AFB2-8D79C7F04A9A</a:ObjectID> <a:Name>teacher_open_course_schedule_session_class_add_time</a:Name> <a:Code>teacher_open_course_schedule_session_class_add_time</a:Code> @@ -17065,7 +17077,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o969"> +<o:Key Id="o970"> <a:ObjectID>8F5B1BAF-BE16-44DE-8DF5-9A1EAD731C04</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -17074,12 +17086,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662808852</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o963"/> +<o:Column Ref="o964"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o969"/> +<o:Key Ref="o970"/> </c:PrimaryKey> </o:Table> <o:Table Id="o200"> @@ -17097,7 +17109,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o970"> +<o:Column Id="o971"> <a:ObjectID>6392E614-144C-4A81-B339-C428F15B45D9</a:ObjectID> <a:Name>teacher_open_course_schedule_session_id</a:Name> <a:Code>teacher_open_course_schedule_session_id</a:Code> @@ -17109,7 +17121,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o971"> +<o:Column Id="o972"> <a:ObjectID>84F8C272-4766-4209-9667-728323948B7D</a:ObjectID> <a:Name>teacher_open_course_schedule_session_add_time</a:Name> <a:Code>teacher_open_course_schedule_session_add_time</a:Code> @@ -17120,7 +17132,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o972"> +<o:Column Id="o973"> <a:ObjectID>379DA977-579C-4E07-B57C-A112F3DDE178</a:ObjectID> <a:Name>teacher_open_course_schedule_session_status</a:Name> <a:Code>teacher_open_course_schedule_session_status</a:Code> @@ -17131,7 +17143,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态(1正常 2删除)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o973"> +<o:Column Id="o974"> <a:ObjectID>D506683D-A194-4D05-ADB9-BB50C1250024</a:ObjectID> <a:Name>teacher_open_course_id</a:Name> <a:Code>teacher_open_course_id</a:Code> @@ -17142,7 +17154,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>课程开课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o974"> +<o:Column Id="o975"> <a:ObjectID>3C52ADED-57C3-4912-BE68-3F75ADDB2382</a:ObjectID> <a:Name>teacher_id</a:Name> <a:Code>teacher_id</a:Code> @@ -17153,7 +17165,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>教师ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o975"> +<o:Column Id="o976"> <a:ObjectID>8CD1F62C-46A8-4CF0-B2BD-294B7516B104</a:ObjectID> <a:Name>school_class_Ids</a:Name> <a:Code>school_class_Ids</a:Code> @@ -17165,7 +17177,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(4000)</a:DataType> <a:Length>4000</a:Length> </o:Column> -<o:Column Id="o976"> +<o:Column Id="o977"> <a:ObjectID>7A7E2C88-8FF1-48BA-A8DF-4A9A96368B9B</a:ObjectID> <a:Name>teacher_open_course_schedule_session_start_date</a:Name> <a:Code>teacher_open_course_schedule_session_start_date</a:Code> @@ -17177,7 +17189,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(20)</a:DataType> <a:Length>20</a:Length> </o:Column> -<o:Column Id="o977"> +<o:Column Id="o978"> <a:ObjectID>9BEAE88E-4EA1-4171-8315-D61CE82BCADD</a:ObjectID> <a:Name>teacher_open_course_schedule_session_end_date</a:Name> <a:Code>teacher_open_course_schedule_session_end_date</a:Code> @@ -17189,7 +17201,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(20)</a:DataType> <a:Length>20</a:Length> </o:Column> -<o:Column Id="o978"> +<o:Column Id="o979"> <a:ObjectID>01EA483A-4478-44D1-8032-98E2EB7DCB79</a:ObjectID> <a:Name>teacher_open_course_schedule_session_week_num</a:Name> <a:Code>teacher_open_course_schedule_session_week_num</a:Code> @@ -17200,7 +17212,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>周次</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o979"> +<o:Column Id="o980"> <a:ObjectID>A6D7EF46-7437-4280-B26D-396E02AF3FBD</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -17211,7 +17223,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o980"> +<o:Column Id="o981"> <a:ObjectID>4DCDE709-2B62-4BCE-B430-60038263BD7B</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -17224,7 +17236,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o981"> +<o:Key Id="o982"> <a:ObjectID>F50CC5A3-3465-4699-8F69-A29E98FE137C</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -17233,12 +17245,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662809607</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o970"/> +<o:Column Ref="o971"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o981"/> +<o:Key Ref="o982"/> </c:PrimaryKey> </o:Table> <o:Table Id="o201"> @@ -17256,7 +17268,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o982"> +<o:Column Id="o983"> <a:ObjectID>E2A6360D-5714-41B5-955B-89945A175C59</a:ObjectID> <a:Name>teacher_open_course_merge_teacher_id</a:Name> <a:Code>teacher_open_course_merge_teacher_id</a:Code> @@ -17268,7 +17280,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o983"> +<o:Column Id="o984"> <a:ObjectID>B09D0BDB-132E-4575-8B29-2EE351C1FE23</a:ObjectID> <a:Name>teacher_open_course_id</a:Name> <a:Code>teacher_open_course_id</a:Code> @@ -17279,7 +17291,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>课程开课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o984"> +<o:Column Id="o985"> <a:ObjectID>7E53D94D-754B-44D9-959E-A49A6AFCA849</a:ObjectID> <a:Name>teacher_id</a:Name> <a:Code>teacher_id</a:Code> @@ -17290,7 +17302,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>教师ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o985"> +<o:Column Id="o986"> <a:ObjectID>3A68DDB6-31E8-415D-B94B-92B9DF070D92</a:ObjectID> <a:Name>teacher_open_course_merge_teacher_status</a:Name> <a:Code>teacher_open_course_merge_teacher_status</a:Code> @@ -17301,7 +17313,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态(1启用 2禁用)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o986"> +<o:Column Id="o987"> <a:ObjectID>7B27FB20-159E-4340-AF84-992446D3D88E</a:ObjectID> <a:Name>teacher_open_course_merge_teacher_add_time</a:Name> <a:Code>teacher_open_course_merge_teacher_add_time</a:Code> @@ -17312,7 +17324,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o987"> +<o:Column Id="o988"> <a:ObjectID>90845833-CF23-465B-B143-5499ABC48D61</a:ObjectID> <a:Name>teacher_open_course_merge_teacher_auth_code</a:Name> <a:Code>teacher_open_course_merge_teacher_auth_code</a:Code> @@ -17325,7 +17337,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Length>10</a:Length> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o988"> +<o:Column Id="o989"> <a:ObjectID>279FE47F-88A8-4633-A510-B081884ABC72</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -17336,7 +17348,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o989"> +<o:Column Id="o990"> <a:ObjectID>CB1C06E4-C2EC-48D0-B1DA-529BE729E99E</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -17349,7 +17361,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o990"> +<o:Key Id="o991"> <a:ObjectID>C35D2586-F094-4112-8601-9F10D6A9DB41</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -17358,12 +17370,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662865695</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o982"/> +<o:Column Ref="o983"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o990"/> +<o:Key Ref="o991"/> </c:PrimaryKey> </o:Table> <o:Table Id="o203"> @@ -17381,7 +17393,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o991"> +<o:Column Id="o992"> <a:ObjectID>17B370CF-378E-4E64-A980-89882213C82C</a:ObjectID> <a:Name>teacher_open_course_merge_school_class_id</a:Name> <a:Code>teacher_open_course_merge_school_class_id</a:Code> @@ -17393,7 +17405,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o992"> +<o:Column Id="o993"> <a:ObjectID>236A83D5-0BEE-4129-8525-6B8D3A1B4EC6</a:ObjectID> <a:Name>teacher_open_course_id</a:Name> <a:Code>teacher_open_course_id</a:Code> @@ -17404,7 +17416,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>教师开课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o993"> +<o:Column Id="o994"> <a:ObjectID>6EEFBCF7-F309-4402-9BC6-A8BD70197B84</a:ObjectID> <a:Name>school_class_id</a:Name> <a:Code>school_class_id</a:Code> @@ -17415,7 +17427,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>班级ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o994"> +<o:Column Id="o995"> <a:ObjectID>CD1F7C9F-FAA1-48E5-B65E-A4677E110748</a:ObjectID> <a:Name>teacher_open_course_merge_school_class_status</a:Name> <a:Code>teacher_open_course_merge_school_class_status</a:Code> @@ -17426,7 +17438,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态(1启用 2禁用)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o995"> +<o:Column Id="o996"> <a:ObjectID>C090103F-8A84-4BDA-A330-9AE196279EB2</a:ObjectID> <a:Name>teacher_open_course_merge_school_class_add_time</a:Name> <a:Code>teacher_open_course_merge_school_class_add_time</a:Code> @@ -17437,7 +17449,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o996"> +<o:Column Id="o997"> <a:ObjectID>7B7183A9-BB12-43ED-B36E-F3143A525E40</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -17448,7 +17460,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o997"> +<o:Column Id="o998"> <a:ObjectID>9174FB98-B263-42AB-9B54-6F9CBBA31A42</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -17461,7 +17473,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o998"> +<o:Key Id="o999"> <a:ObjectID>2AFFDC6B-82E6-4E75-8F04-36F0FCDAD767</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -17470,12 +17482,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1662982569</a:ModificationDate> <a:Modifier>lx</a:Modifier> <c:Key.Columns> -<o:Column Ref="o991"/> +<o:Column Ref="o992"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o998"/> +<o:Key Ref="o999"/> </c:PrimaryKey> </o:Table> <o:Table Id="o205"> @@ -17493,7 +17505,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o999"> +<o:Column Id="o1000"> <a:ObjectID>FB211503-CF3E-4103-B61C-2E325317C715</a:ObjectID> <a:Name>data_contest_application_id</a:Name> <a:Code>data_contest_application_id</a:Code> @@ -17505,7 +17517,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o1000"> +<o:Column Id="o1001"> <a:ObjectID>3EA632DB-A439-4642-9D80-00C4162E3D55</a:ObjectID> <a:Name>data_contest_application_name</a:Name> <a:Code>data_contest_application_name</a:Code> @@ -17516,7 +17528,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>大赛名称</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o1001"> +<o:Column Id="o1002"> <a:ObjectID>5EEBC61F-D540-4B9F-BC81-9A7686F4CDF5</a:ObjectID> <a:Name>data_contest_application_host_name</a:Name> <a:Code>data_contest_application_host_name</a:Code> @@ -17528,7 +17540,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(200)</a:DataType> <a:Length>200</a:Length> </o:Column> -<o:Column Id="o1002"> +<o:Column Id="o1003"> <a:ObjectID>1C6BBDA4-F9EE-4CA1-BB5D-06670A2F4123</a:ObjectID> <a:Name>data_contest_application_technical_name</a:Name> <a:Code>data_contest_application_technical_name</a:Code> @@ -17540,7 +17552,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(200)</a:DataType> <a:Length>200</a:Length> </o:Column> -<o:Column Id="o1003"> +<o:Column Id="o1004"> <a:ObjectID>E13737EE-A348-45CD-8CB2-7121F0BEB925</a:ObjectID> <a:Name>data_contest_application_lowest_number</a:Name> <a:Code>data_contest_application_lowest_number</a:Code> @@ -17551,7 +17563,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>参与最低人数</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o1004"> +<o:Column Id="o1005"> <a:ObjectID>36AD5B45-E7B1-4921-B976-F32F2FB68819</a:ObjectID> <a:Name>data_contest_application_highest_number</a:Name> <a:Code>data_contest_application_highest_number</a:Code> @@ -17562,7 +17574,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>参与最高人数</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o1005"> +<o:Column Id="o1006"> <a:ObjectID>15593A04-28EB-46C8-A5F2-55297E67B2C5</a:ObjectID> <a:Name>data_contest_application_status</a:Name> <a:Code>data_contest_application_status</a:Code> @@ -17573,7 +17585,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态( 1 正常 2删除)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o1006"> +<o:Column Id="o1007"> <a:ObjectID>1D111CDF-52D5-4666-86F0-EE3A6253D200</a:ObjectID> <a:Name>data_contest_application_model</a:Name> <a:Code>data_contest_application_model</a:Code> @@ -17585,7 +17597,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(50)</a:DataType> <a:Length>50</a:Length> </o:Column> -<o:Column Id="o1007"> +<o:Column Id="o1008"> <a:ObjectID>6A6E7C74-8503-4C41-A3CC-AB7600975C83</a:ObjectID> <a:Name>data_contest_application_add_time</a:Name> <a:Code>data_contest_application_add_time</a:Code> @@ -17596,7 +17608,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o1008"> +<o:Column Id="o1009"> <a:ObjectID>618BF08C-52DE-4104-878C-F4C852499EDC</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -17607,7 +17619,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>用户ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o1009"> +<o:Column Id="o1010"> <a:ObjectID>86EE9B2C-375E-43DD-A5E3-442A1C7B68F8</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -17618,7 +17630,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o1010"> +<o:Column Id="o1011"> <a:ObjectID>69E30F12-548D-4F86-AF60-423761BC363F</a:ObjectID> <a:Name>data_contest_application_apply_start_time</a:Name> <a:Code>data_contest_application_apply_start_time</a:Code> @@ -17629,7 +17641,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>报名开始时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o1011"> +<o:Column Id="o1012"> <a:ObjectID>B033AC6A-AD19-4BDB-9C21-160BD3FFB825</a:ObjectID> <a:Name>data_contest_application_apply_end_time</a:Name> <a:Code>data_contest_application_apply_end_time</a:Code> @@ -17640,7 +17652,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>报名结束时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o1012"> +<o:Column Id="o1013"> <a:ObjectID>D39E9505-70CC-448B-8D7D-99F588F8426D</a:ObjectID> <a:Name>data_contest_application_try_play_start_time</a:Name> <a:Code>data_contest_application_try_play_start_time</a:Code> @@ -17651,7 +17663,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>试玩开始时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o1013"> +<o:Column Id="o1014"> <a:ObjectID>8E5672AE-76FC-48A1-A626-8074CAA46BB3</a:ObjectID> <a:Name>data_contest_application_try_play_end_time</a:Name> <a:Code>data_contest_application_try_play_end_time</a:Code> @@ -17662,7 +17674,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>试玩结束时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o1014"> +<o:Column Id="o1015"> <a:ObjectID>97B3D96F-68C3-4E5E-9859-86A1A64A0E55</a:ObjectID> <a:Name>data_contest_application_stage_start_time</a:Name> <a:Code>data_contest_application_stage_start_time</a:Code> @@ -17673,7 +17685,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>大赛开始时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o1015"> +<o:Column Id="o1016"> <a:ObjectID>0A898BC9-890E-496F-8263-ED3A460A3574</a:ObjectID> <a:Name>data_contest_application_stage_end_time</a:Name> <a:Code>data_contest_application_stage_end_time</a:Code> @@ -17684,7 +17696,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>大赛结束时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o1016"> +<o:Column Id="o1017"> <a:ObjectID>6359ED80-8E01-41C8-A409-10DEEDFF293C</a:ObjectID> <a:Name>data_contest_application_shrink_img</a:Name> <a:Code>data_contest_application_shrink_img</a:Code> @@ -17696,7 +17708,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(1000)</a:DataType> <a:Length>1000</a:Length> </o:Column> -<o:Column Id="o1017"> +<o:Column Id="o1018"> <a:ObjectID>ECEF8ECF-C531-4ADE-8BBA-25BE7DD95249</a:ObjectID> <a:Name>data_contest_application_carousel_img</a:Name> <a:Code>data_contest_application_carousel_img</a:Code> @@ -17710,7 +17722,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o1018"> +<o:Key Id="o1019"> <a:ObjectID>B03D33F0-85A3-419F-8575-83AC3B8F2AAF</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -17719,12 +17731,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1663686482</a:ModificationDate> <a:Modifier>87966</a:Modifier> <c:Key.Columns> -<o:Column Ref="o999"/> +<o:Column Ref="o1000"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o1018"/> +<o:Key Ref="o1019"/> </c:PrimaryKey> </o:Table> <o:Table Id="o207"> @@ -17742,7 +17754,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci</a:PhysicalOptions> <a:TotalSavingCurrency/> <c:Columns> -<o:Column Id="o1019"> +<o:Column Id="o1020"> <a:ObjectID>37C90E98-0F71-453A-9BB7-BCF0E255B57E</a:ObjectID> <a:Name>teacher_open_course_schedule_session_snap_id</a:Name> <a:Code>teacher_open_course_schedule_session_snap_id</a:Code> @@ -17754,7 +17766,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>bigint</a:DataType> <a:Column.Mandatory>1</a:Column.Mandatory> </o:Column> -<o:Column Id="o1020"> +<o:Column Id="o1021"> <a:ObjectID>F2F5E447-FAD6-4BE6-BA46-51C24C2BDBD4</a:ObjectID> <a:Name>teacher_open_course_schedule_session_id</a:Name> <a:Code>teacher_open_course_schedule_session_id</a:Code> @@ -17765,7 +17777,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>关联排课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o1021"> +<o:Column Id="o1022"> <a:ObjectID>70519675-39D3-4A62-BE68-038DF130B07D</a:ObjectID> <a:Name>teacher_open_course_id</a:Name> <a:Code>teacher_open_course_id</a:Code> @@ -17776,7 +17788,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>教师开课ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o1022"> +<o:Column Id="o1023"> <a:ObjectID>A7BF3423-E11D-416F-A731-F45356E01DA9</a:ObjectID> <a:Name>teacher_open_course_schedule_session_snap_status</a:Name> <a:Code>teacher_open_course_schedule_session_snap_status</a:Code> @@ -17787,7 +17799,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>状态(1正常 2删除)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o1023"> +<o:Column Id="o1024"> <a:ObjectID>2A1826B2-F029-47F5-88EA-8E840861A445</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_name</a:Name> <a:Code>teacher_open_course_schedule_session_tag_name</a:Code> @@ -17799,7 +17811,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> </o:Column> -<o:Column Id="o1024"> +<o:Column Id="o1025"> <a:ObjectID>70662FD1-C20F-4B7C-BFED-66B4A94EBD61</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_duration</a:Name> <a:Code>teacher_open_course_schedule_session_tag_duration</a:Code> @@ -17810,7 +17822,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>课程时长(分钟)</a:Comment> <a:DataType>int</a:DataType> </o:Column> -<o:Column Id="o1025"> +<o:Column Id="o1026"> <a:ObjectID>3E372D23-EA27-45DF-A011-4B6D6383E811</a:ObjectID> <a:Name>teacher_open_course_schedule_session_day_time</a:Name> <a:Code>teacher_open_course_schedule_session_day_time</a:Code> @@ -17822,7 +17834,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(20)</a:DataType> <a:Length>20</a:Length> </o:Column> -<o:Column Id="o1026"> +<o:Column Id="o1027"> <a:ObjectID>16A7E02B-46FB-4640-86EE-AABB4E9C3E1A</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_start_time</a:Name> <a:Code>teacher_open_course_schedule_session_tag_start_time</a:Code> @@ -17834,7 +17846,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(10)</a:DataType> <a:Length>10</a:Length> </o:Column> -<o:Column Id="o1027"> +<o:Column Id="o1028"> <a:ObjectID>6FFBF9E4-D1A0-45F1-B109-BA039EB05C86</a:ObjectID> <a:Name>teacher_open_course_schedule_session_tag_end_time</a:Name> <a:Code>teacher_open_course_schedule_session_tag_end_time</a:Code> @@ -17846,7 +17858,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(10)</a:DataType> <a:Length>10</a:Length> </o:Column> -<o:Column Id="o1028"> +<o:Column Id="o1029"> <a:ObjectID>6C030A2B-C219-4C7D-A44D-EA4A86820E5C</a:ObjectID> <a:Name>teacher_open_course_schedule_session_class_name</a:Name> <a:Code>teacher_open_course_schedule_session_class_name</a:Code> @@ -17858,7 +17870,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:DataType>varchar(255)</a:DataType> <a:Length>255</a:Length> </o:Column> -<o:Column Id="o1029"> +<o:Column Id="o1030"> <a:ObjectID>24CA63C4-331D-4E55-A333-A20B4A6DE11F</a:ObjectID> <a:Name>teacher_open_course_schedule_session_snap_add_time</a:Name> <a:Code>teacher_open_course_schedule_session_snap_add_time</a:Code> @@ -17869,7 +17881,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>创建时间</a:Comment> <a:DataType>datetime</a:DataType> </o:Column> -<o:Column Id="o1030"> +<o:Column Id="o1031"> <a:ObjectID>CB6EFB98-C675-42D2-8BE1-87A762BAFBA1</a:ObjectID> <a:Name>org_id</a:Name> <a:Code>org_id</a:Code> @@ -17880,7 +17892,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:Comment>组织ID</a:Comment> <a:DataType>bigint</a:DataType> </o:Column> -<o:Column Id="o1031"> +<o:Column Id="o1032"> <a:ObjectID>2C5F2D72-CD86-4110-B751-E1A9F8DC1EE4</a:ObjectID> <a:Name>user_id</a:Name> <a:Code>user_id</a:Code> @@ -17893,7 +17905,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:Column> </c:Columns> <c:Keys> -<o:Key Id="o1032"> +<o:Key Id="o1033"> <a:ObjectID>34B82EA4-DFF5-4DAA-8DC5-88016A7E9853</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -17902,17 +17914,17 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <a:ModificationDate>1663743144</a:ModificationDate> <a:Modifier>87966</a:Modifier> <c:Key.Columns> -<o:Column Ref="o1019"/> +<o:Column Ref="o1020"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> -<o:Key Ref="o1032"/> +<o:Key Ref="o1033"/> </c:PrimaryKey> </o:Table> </c:Tables> <c:DefaultGroups> -<o:Group Id="o1033"> +<o:Group Id="o1034"> <a:ObjectID>BFEA4109-96F9-4074-AF58-B84D6574A7FC</a:ObjectID> <a:Name>PUBLIC</a:Name> <a:Code>PUBLIC</a:Code> @@ -18040,7 +18052,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> <o:Table Ref="o168"/> </c:Object2> </o:ExtendedDependency> -<o:ExtendedDependency Id="o1034"> +<o:ExtendedDependency Id="o1035"> <a:ObjectID>ABEFC813-1056-4507-A9A7-809C149B4ABE</a:ObjectID> <a:CreationDate>1661954753</a:CreationDate> <a:Creator>lx</a:Creator> @@ -18263,7 +18275,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions> </o:ExtendedDependency> </c:ChildTraceabilityLinks> <c:TargetModels> -<o:TargetModel Id="o1035"> +<o:TargetModel Id="o1036"> <a:ObjectID>5963E417-B2CE-431D-988A-B3493AAE5EE4</a:ObjectID> <a:Name>MySQL 5.0</a:Name> <a:Code>MYSQL50</a:Code> diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql index ee952036..3d9b7082 100644 --- a/doc/sql/mysql/tianze-pro-update.sql +++ b/doc/sql/mysql/tianze-pro-update.sql @@ -35,21 +35,3 @@ CREATE TABLE `sys_log_text` ( PRIMARY KEY (`id`) USING BTREE, INDEX `sys_id`(`sys_id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; - --- ---------------------------- --- TEACHER_OPEN_COURSE_HOMEWORK_SETTING 字段调整 --- ---------------------------- -# 删除作业ID -ALTER TABLE teacher_open_course_homework_setting DROP teacher_open_course_question_homework_id; -# 其他属性增加表名前缀 -ALTER TABLE teacher_open_course_homework_setting CHANGE do_count teacher_open_course_question_homework_setting_do_count INT(5); -ALTER TABLE teacher_open_course_homework_setting CHANGE question_no_order teacher_open_course_question_homework_setting_question_no_order INT(5); -ALTER TABLE teacher_open_course_homework_setting CHANGE option_no_order teacher_open_course_question_homework_setting_option_no_order INT(5); -ALTER TABLE teacher_open_course_homework_setting CHANGE end_show_qa teacher_open_course_question_homework_setting_end_show_qa INT(5); -ALTER TABLE teacher_open_course_homework_setting CHANGE create_time teacher_open_course_question_homework_setting_add_time DATETIME; -# 增加字段注释 -ALTER TABLE teacher_open_course_homework_setting MODIFY COLUMN teacher_open_course_question_homework_setting_do_count INT(5) COMMENT '作答次数'; -ALTER TABLE teacher_open_course_homework_setting MODIFY COLUMN teacher_open_course_question_homework_setting_question_no_order INT(5) COMMENT '题目乱序(同一大题内)'; -ALTER TABLE teacher_open_course_homework_setting MODIFY COLUMN teacher_open_course_question_homework_setting_option_no_order INT(5) COMMENT '选项乱序(限单选、多选)'; -ALTER TABLE teacher_open_course_homework_setting MODIFY COLUMN teacher_open_course_question_homework_setting_end_show_qa INT(5) COMMENT '答卷后显示答案解析'; -ALTER TABLE teacher_open_course_homework_setting MODIFY COLUMN teacher_open_course_question_homework_setting_add_time INT(5) cOMMENT '创建时间'; diff --git a/doc/sql/mysql/tianze-pro.sql b/doc/sql/mysql/tianze-pro.sql index 15232066..084cf998 100644 --- a/doc/sql/mysql/tianze-pro.sql +++ b/doc/sql/mysql/tianze-pro.sql @@ -28637,27 +28637,31 @@ CREATE TABLE `teacher_open_course_homework_question_log` ( -- Records of teacher_open_course_homework_question_log -- ---------------------------- --- ---------------------------- --- Table structure for teacher_open_course_homework_setting --- ---------------------------- -DROP TABLE IF EXISTS `teacher_open_course_homework_setting`; -CREATE TABLE `teacher_open_course_homework_setting` ( - `teacher_open_course_question_homework_setting_id` bigint(20) NOT NULL COMMENT '作业设置ID', - `teacher_open_course_question_homework_id` bigint(20) NULL DEFAULT NULL COMMENT '题库作业ID', - `do_count` int(11) NULL DEFAULT NULL COMMENT '作答次数', - `question_no_order` int(11) NULL DEFAULT NULL COMMENT '题目乱序(同一大题内)', - `option_no_order` int(11) NULL DEFAULT NULL COMMENT '选项乱序(限单选、多选)', - `end_show_qa` int(11) NULL DEFAULT NULL COMMENT '答卷后显示答案解析', - `end_show_true_false` int(11) NULL DEFAULT NULL COMMENT '答卷后显示答案对错', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `org_id` bigint(20) NULL DEFAULT NULL COMMENT '组织ID', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID', - PRIMARY KEY (`teacher_open_course_question_homework_setting_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '我的课程-题库作业-作业设置' ROW_FORMAT = DYNAMIC; +drop table if exists teacher_open_course_homework_setting; --- ---------------------------- --- Records of teacher_open_course_homework_setting --- ---------------------------- +/*==============================================================*/ +/* Table: teacher_open_course_homework_setting */ +/*==============================================================*/ +create table teacher_open_course_homework_setting +( + teacher_open_course_question_homework_setting_id bigint not null comment '作业设置ID', + teacher_open_course_question_homework_setting_school_class_ids varchar(2000) comment '班级ID集合(逗号隔开)', + teacher_open_course_question_homework_setting_do_count int comment '作答次数', + teacher_open_course_question_homework_setting_question_no_order int comment '题目乱序(同一大题内)', + teacher_open_course_question_homework_setting_option_no_order int comment '选项乱序(限单选、多选)', + teacher_open_course_question_homework_setting_end_show_qa int comment '答卷后显示答案解析', + teacher_open_course_question_homework_setting_end_show_true_fals int comment '答卷后显示答案对错', + teacher_open_course_question_homework_setting_add_time datetime comment '创建时间', + org_id bigint comment '组织ID', + user_id bigint comment '用户ID', + primary key (teacher_open_course_question_homework_setting_id) +) +auto_increment = 1 +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_general_ci; + +alter table teacher_open_course_homework_setting comment '我的课程-题库作业-作业设置'; -- ---------------------------- -- Table structure for teacher_open_course_knowledge_point diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkSetting.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkSetting.java index 22b90edb..da4523f8 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkSetting.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkSetting.java @@ -1,10 +1,12 @@ 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 org.beetl.sql.annotation.entity.AssignID; import javax.validation.constraints.NotNull; +import java.util.Date; /* * 我的课程-题库作业-作业设置 @@ -19,6 +21,11 @@ public class TeacherOpenCourseHomeworkSetting extends BaseEntity{ private Long teacherOpenCourseQuestionHomeworkSettingId ; + //班级ID集合(逗号隔开) + @Dict(type="school_class.class_name.class_status=1") + + private String teacherOpenCourseQuestionHomeworkSettingSchoolClassIds ; + //作答次数 private Integer teacherOpenCourseQuestionHomeworkSettingDoCount ; @@ -37,11 +44,11 @@ public class TeacherOpenCourseHomeworkSetting extends BaseEntity{ //答卷后显示答案对错 - private Integer endShowTrueFalse ; + private Integer teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals ; //创建时间 - private Integer teacherOpenCourseQuestionHomeworkSettingAddTime ; + private Date teacherOpenCourseQuestionHomeworkSettingAddTime ; //组织ID @@ -67,6 +74,19 @@ public class TeacherOpenCourseHomeworkSetting extends BaseEntity{ this.teacherOpenCourseQuestionHomeworkSettingId = teacherOpenCourseQuestionHomeworkSettingId; } + /**班级ID集合(逗号隔开) + *@return + */ + public String getTeacherOpenCourseQuestionHomeworkSettingSchoolClassIds(){ + return teacherOpenCourseQuestionHomeworkSettingSchoolClassIds; + } + /**班级ID集合(逗号隔开) + *@param teacherOpenCourseQuestionHomeworkSettingSchoolClassIds + */ + public void setTeacherOpenCourseQuestionHomeworkSettingSchoolClassIds(String teacherOpenCourseQuestionHomeworkSettingSchoolClassIds){ + this.teacherOpenCourseQuestionHomeworkSettingSchoolClassIds = teacherOpenCourseQuestionHomeworkSettingSchoolClassIds; + } + /**作答次数 *@return */ @@ -122,26 +142,26 @@ public class TeacherOpenCourseHomeworkSetting extends BaseEntity{ /**答卷后显示答案对错 *@return */ - public Integer getEndShowTrueFalse(){ - return endShowTrueFalse; + public Integer getTeacherOpenCourseQuestionHomeworkSettingEndShowTrueFals(){ + return teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals; } /**答卷后显示答案对错 - *@param endShowTrueFalse + *@param teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals */ - public void setEndShowTrueFalse(Integer endShowTrueFalse){ - this.endShowTrueFalse = endShowTrueFalse; + public void setTeacherOpenCourseQuestionHomeworkSettingEndShowTrueFals(Integer teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals){ + this.teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals = teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals; } /**创建时间 *@return */ - public Integer getTeacherOpenCourseQuestionHomeworkSettingAddTime(){ + public Date getTeacherOpenCourseQuestionHomeworkSettingAddTime(){ return teacherOpenCourseQuestionHomeworkSettingAddTime; } /**创建时间 *@param teacherOpenCourseQuestionHomeworkSettingAddTime */ - public void setTeacherOpenCourseQuestionHomeworkSettingAddTime(Integer teacherOpenCourseQuestionHomeworkSettingAddTime){ + public void setTeacherOpenCourseQuestionHomeworkSettingAddTime(Date teacherOpenCourseQuestionHomeworkSettingAddTime){ this.teacherOpenCourseQuestionHomeworkSettingAddTime = teacherOpenCourseQuestionHomeworkSettingAddTime; } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java index f049504c..b46ebcad 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.service; +import cn.hutool.core.util.StrUtil; import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -88,7 +89,11 @@ public class TeacherOpenCourseHomeworkSettingService extends CoreBaseService<Tea String msg = ""; TeacherOpenCourseHomeworkSetting teacherOpenCourseHomeworkSetting = teacherOpenCourseHomeworkSettingQuery.pojo(); teacherOpenCourseHomeworkSettingDao.insert(teacherOpenCourseHomeworkSetting); + teacherOpenCourseHomeworkSettingQuery.setTeacherOpenCourseQuestionHomeworkSettingId(teacherOpenCourseHomeworkSetting.getTeacherOpenCourseQuestionHomeworkSettingId()); + + // 布置作业方法 + make(teacherOpenCourseHomeworkSettingQuery); JsonResult jsonResult = new JsonResult(); jsonResult.setData(teacherOpenCourseHomeworkSetting.getTeacherOpenCourseQuestionHomeworkSettingId());//自增的ID丢进去 jsonResult.setCode(JsonReturnCode.SUCCESS.getCode()); @@ -96,6 +101,31 @@ public class TeacherOpenCourseHomeworkSettingService extends CoreBaseService<Tea return jsonResult; } + /** + * 课程作业布置 + * @param query + */ + private void make(TeacherOpenCourseHomeworkSettingQuery query) { + // 最大做题次数 + Integer settingDoCount = query.getTeacherOpenCourseQuestionHomeworkSettingDoCount(); + // 答卷后显示答案解析 + Integer settingEndShowQa = query.getTeacherOpenCourseQuestionHomeworkSettingEndShowQa(); + // 答卷后显示答案对错 + Integer endShowTrueFals = query.getTeacherOpenCourseQuestionHomeworkSettingEndShowTrueFals(); + // 题目乱序(同一大题内) + Integer settingOptionNoOrder = query.getTeacherOpenCourseQuestionHomeworkSettingOptionNoOrder(); + // 班级ID集合,逗号隔开 + String settingSchoolClassIds = query.getTeacherOpenCourseQuestionHomeworkSettingSchoolClassIds(); + // 题目ID多个逗号隔开 + String resourcesQuestionIdPlural = query.getResourcesQuestionIdPlural(); + + String[] schoolClassIds = settingSchoolClassIds.split(StrUtil.COMMA); + String[] resourcesQuestionIds = resourcesQuestionIdPlural.split(StrUtil.COMMA); + + // TODO 开课作业设置,未完待续 + + } + public String edit(TeacherOpenCourseHomeworkSettingQuery teacherOpenCourseHomeworkSettingQuery){ String msg = ""; TeacherOpenCourseHomeworkSetting teacherOpenCourseHomeworkSetting = teacherOpenCourseHomeworkSettingQuery.pojo(); diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkSettingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkSettingQuery.java index 06092317..fef29a0c 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkSettingQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkSettingQuery.java @@ -3,9 +3,12 @@ package com.ibeetl.jlw.web.query; 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.ResourcesQuestion; import com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkSetting; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.util.Date; /** *作业布置查询 @@ -14,6 +17,9 @@ public class TeacherOpenCourseHomeworkSettingQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "作业设置ID", display = false) private Long teacherOpenCourseQuestionHomeworkSettingId; + @Query(name = "班级ID集合(逗号隔开)", display = true,type=Query.TYPE_DICT,dict="school_class.class_name.class_status=1") + @NotBlank(message = "teacherOpenCourseQuestionHomeworkSettingSchoolClassIds 班级ID不能为空!", groups =ValidateConfig.ADD.class) + private String teacherOpenCourseQuestionHomeworkSettingSchoolClassIds; @Query(name = "作答次数", display = false) private Integer teacherOpenCourseQuestionHomeworkSettingDoCount; @Query(name = "题目乱序(同一大题内)", display = false) @@ -23,14 +29,21 @@ public class TeacherOpenCourseHomeworkSettingQuery extends PageParam { @Query(name = "答卷后显示答案解析", display = false) private Integer teacherOpenCourseQuestionHomeworkSettingEndShowQa; @Query(name = "答卷后显示答案对错", display = false) - private Integer endShowTrueFalse; + private Integer teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals; @Query(name = "创建时间", display = false) - private Integer teacherOpenCourseQuestionHomeworkSettingAddTime; + private Date teacherOpenCourseQuestionHomeworkSettingAddTime; @Query(name = "组织ID", display = false) private Long orgId; @Query(name = "用户ID", display = false) private Long userId; + /** + * 上传的题目ID,逗号隔开 + * 对应{@link ResourcesQuestion#getResourcesQuestionId()} 集合 + */ + @NotBlank(message = "resourcesQuestionIdPlural 题目ID不能为空!", groups =ValidateConfig.ADD.class) + private String resourcesQuestionIdPlural; + private String teacherOpenCourseQuestionHomeworkSettingIdPlural; private String orgIdPlural; private String userIdPlural; @@ -45,6 +58,12 @@ public class TeacherOpenCourseHomeworkSettingQuery extends PageParam { public void setTeacherOpenCourseQuestionHomeworkSettingId(Long teacherOpenCourseQuestionHomeworkSettingId ){ this.teacherOpenCourseQuestionHomeworkSettingId = teacherOpenCourseQuestionHomeworkSettingId; } + public String getTeacherOpenCourseQuestionHomeworkSettingSchoolClassIds(){ + return teacherOpenCourseQuestionHomeworkSettingSchoolClassIds; + } + public void setTeacherOpenCourseQuestionHomeworkSettingSchoolClassIds(String teacherOpenCourseQuestionHomeworkSettingSchoolClassIds ){ + this.teacherOpenCourseQuestionHomeworkSettingSchoolClassIds = teacherOpenCourseQuestionHomeworkSettingSchoolClassIds; + } public Integer getTeacherOpenCourseQuestionHomeworkSettingDoCount(){ return teacherOpenCourseQuestionHomeworkSettingDoCount; } @@ -69,16 +88,16 @@ public class TeacherOpenCourseHomeworkSettingQuery extends PageParam { public void setTeacherOpenCourseQuestionHomeworkSettingEndShowQa(Integer teacherOpenCourseQuestionHomeworkSettingEndShowQa ){ this.teacherOpenCourseQuestionHomeworkSettingEndShowQa = teacherOpenCourseQuestionHomeworkSettingEndShowQa; } - public Integer getEndShowTrueFalse(){ - return endShowTrueFalse; + public Integer getTeacherOpenCourseQuestionHomeworkSettingEndShowTrueFals(){ + return teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals; } - public void setEndShowTrueFalse(Integer endShowTrueFalse ){ - this.endShowTrueFalse = endShowTrueFalse; + public void setTeacherOpenCourseQuestionHomeworkSettingEndShowTrueFals(Integer teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals ){ + this.teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals = teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals; } - public Integer getTeacherOpenCourseQuestionHomeworkSettingAddTime(){ + public Date getTeacherOpenCourseQuestionHomeworkSettingAddTime(){ return teacherOpenCourseQuestionHomeworkSettingAddTime; } - public void setTeacherOpenCourseQuestionHomeworkSettingAddTime(Integer teacherOpenCourseQuestionHomeworkSettingAddTime ){ + public void setTeacherOpenCourseQuestionHomeworkSettingAddTime(Date teacherOpenCourseQuestionHomeworkSettingAddTime ){ this.teacherOpenCourseQuestionHomeworkSettingAddTime = teacherOpenCourseQuestionHomeworkSettingAddTime; } public Long getOrgId(){ @@ -97,11 +116,12 @@ public class TeacherOpenCourseHomeworkSettingQuery extends PageParam { public TeacherOpenCourseHomeworkSetting pojo(){ TeacherOpenCourseHomeworkSetting pojo = new TeacherOpenCourseHomeworkSetting(); pojo.setTeacherOpenCourseQuestionHomeworkSettingId(this.getTeacherOpenCourseQuestionHomeworkSettingId()); + pojo.setTeacherOpenCourseQuestionHomeworkSettingSchoolClassIds(this.getTeacherOpenCourseQuestionHomeworkSettingSchoolClassIds()); pojo.setTeacherOpenCourseQuestionHomeworkSettingDoCount(this.getTeacherOpenCourseQuestionHomeworkSettingDoCount()); pojo.setTeacherOpenCourseQuestionHomeworkSettingQuestionNoOrder(this.getTeacherOpenCourseQuestionHomeworkSettingQuestionNoOrder()); pojo.setTeacherOpenCourseQuestionHomeworkSettingOptionNoOrder(this.getTeacherOpenCourseQuestionHomeworkSettingOptionNoOrder()); pojo.setTeacherOpenCourseQuestionHomeworkSettingEndShowQa(this.getTeacherOpenCourseQuestionHomeworkSettingEndShowQa()); - pojo.setEndShowTrueFalse(this.getEndShowTrueFalse()); + pojo.setTeacherOpenCourseQuestionHomeworkSettingEndShowTrueFals(this.getTeacherOpenCourseQuestionHomeworkSettingEndShowTrueFals()); pojo.setTeacherOpenCourseQuestionHomeworkSettingAddTime(this.getTeacherOpenCourseQuestionHomeworkSettingAddTime()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); @@ -138,4 +158,12 @@ public class TeacherOpenCourseHomeworkSettingQuery extends PageParam { public void set_given(String _given) { this._given = _given; } + + public String getResourcesQuestionIdPlural() { + return resourcesQuestionIdPlural; + } + + public void setResourcesQuestionIdPlural(String resourcesQuestionIdPlural) { + this.resourcesQuestionIdPlural = resourcesQuestionIdPlural; + } } diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkSetting.md index 4212e5ef..7a453f53 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkSetting.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkSetting.md @@ -16,23 +16,26 @@ queryByCondition @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingIdPlural)){ and find_in_set(t.teacher_open_course_question_homework_setting_id,#teacherOpenCourseQuestionHomeworkSettingIdPlural#) @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingSchoolClassIds)){ + and t.teacher_open_course_question_homework_setting_school_class_ids =#teacherOpenCourseQuestionHomeworkSettingSchoolClassIds# + @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT =#teacherOpenCourseQuestionHomeworkSettingDoCount# + and t.teacher_open_course_question_homework_setting_do_count =#teacherOpenCourseQuestionHomeworkSettingDoCount# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# + and t.teacher_open_course_question_homework_setting_question_no_order =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# + and t.teacher_open_course_question_homework_setting_option_no_order =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# + and t.teacher_open_course_question_homework_setting_end_show_qa =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# @} - @if(!isEmpty(endShowTrueFalse)){ - and t.end_show_true_false =#endShowTrueFalse# + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals)){ + and t.teacher_open_course_question_homework_setting_end_show_true_fals =#teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME =#teacherOpenCourseQuestionHomeworkSettingAddTime# + and t.teacher_open_course_question_homework_setting_add_time =#teacherOpenCourseQuestionHomeworkSettingAddTime# @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -64,23 +67,26 @@ queryByConditionQuery @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingIdPlural)){ and find_in_set(t.teacher_open_course_question_homework_setting_id,#teacherOpenCourseQuestionHomeworkSettingIdPlural#) @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingSchoolClassIds)){ + and t.teacher_open_course_question_homework_setting_school_class_ids =#teacherOpenCourseQuestionHomeworkSettingSchoolClassIds# + @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT =#teacherOpenCourseQuestionHomeworkSettingDoCount# + and t.teacher_open_course_question_homework_setting_do_count =#teacherOpenCourseQuestionHomeworkSettingDoCount# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# + and t.teacher_open_course_question_homework_setting_question_no_order =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# + and t.teacher_open_course_question_homework_setting_option_no_order =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# + and t.teacher_open_course_question_homework_setting_end_show_qa =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# @} - @if(!isEmpty(endShowTrueFalse)){ - and t.end_show_true_false =#endShowTrueFalse# + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals)){ + and t.teacher_open_course_question_homework_setting_end_show_true_fals =#teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME =#teacherOpenCourseQuestionHomeworkSettingAddTime# + and t.teacher_open_course_question_homework_setting_add_time =#teacherOpenCourseQuestionHomeworkSettingAddTime# @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -120,46 +126,53 @@ updateGivenByIds update teacher_open_course_homework_setting set + @if(contain("teacherOpenCourseQuestionHomeworkSettingSchoolClassIds",_given)){ + @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingSchoolClassIds)){ + teacher_open_course_question_homework_setting_school_class_ids = null , + @}else{ + teacher_open_course_question_homework_setting_school_class_ids = #teacherOpenCourseQuestionHomeworkSettingSchoolClassIds# , + @} + @} @if(contain("teacherOpenCourseQuestionHomeworkSettingDoCount",_given)){ @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT = null , + teacher_open_course_question_homework_setting_do_count = null , @}else{ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT = #teacherOpenCourseQuestionHomeworkSettingDoCount# , + teacher_open_course_question_homework_setting_do_count = #teacherOpenCourseQuestionHomeworkSettingDoCount# , @} @} @if(contain("teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder",_given)){ @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER = null , + teacher_open_course_question_homework_setting_question_no_order = null , @}else{ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER = #teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# , + teacher_open_course_question_homework_setting_question_no_order = #teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# , @} @} @if(contain("teacherOpenCourseQuestionHomeworkSettingOptionNoOrder",_given)){ @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER = null , + teacher_open_course_question_homework_setting_option_no_order = null , @}else{ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER = #teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# , + teacher_open_course_question_homework_setting_option_no_order = #teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# , @} @} @if(contain("teacherOpenCourseQuestionHomeworkSettingEndShowQa",_given)){ @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA = null , + teacher_open_course_question_homework_setting_end_show_qa = null , @}else{ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA = #teacherOpenCourseQuestionHomeworkSettingEndShowQa# , + teacher_open_course_question_homework_setting_end_show_qa = #teacherOpenCourseQuestionHomeworkSettingEndShowQa# , @} @} - @if(contain("endShowTrueFalse",_given)){ - @if(isEmpty(endShowTrueFalse)){ - end_show_true_false = null , + @if(contain("teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals",_given)){ + @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals)){ + teacher_open_course_question_homework_setting_end_show_true_fals = null , @}else{ - end_show_true_false = #endShowTrueFalse# , + teacher_open_course_question_homework_setting_end_show_true_fals = #teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals# , @} @} @if(contain("teacherOpenCourseQuestionHomeworkSettingAddTime",_given)){ @if(isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME = null , + teacher_open_course_question_homework_setting_add_time = null , @}else{ - TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME = #teacherOpenCourseQuestionHomeworkSettingAddTime# , + teacher_open_course_question_homework_setting_add_time = #teacherOpenCourseQuestionHomeworkSettingAddTime# , @} @} @if(contain("orgId",_given)){ @@ -192,23 +205,26 @@ getTeacherOpenCourseHomeworkSettingValues @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingId)){ and t.teacher_open_course_question_homework_setting_id =#teacherOpenCourseQuestionHomeworkSettingId# @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingSchoolClassIds)){ + and t.teacher_open_course_question_homework_setting_school_class_ids =#teacherOpenCourseQuestionHomeworkSettingSchoolClassIds# + @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT =#teacherOpenCourseQuestionHomeworkSettingDoCount# + and t.teacher_open_course_question_homework_setting_do_count =#teacherOpenCourseQuestionHomeworkSettingDoCount# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# + and t.teacher_open_course_question_homework_setting_question_no_order =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# + and t.teacher_open_course_question_homework_setting_option_no_order =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# + and t.teacher_open_course_question_homework_setting_end_show_qa =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# @} - @if(!isEmpty(endShowTrueFalse)){ - and t.end_show_true_false =#endShowTrueFalse# + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals)){ + and t.teacher_open_course_question_homework_setting_end_show_true_fals =#teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME =#teacherOpenCourseQuestionHomeworkSettingAddTime# + and t.teacher_open_course_question_homework_setting_add_time =#teacherOpenCourseQuestionHomeworkSettingAddTime# @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -232,23 +248,26 @@ getValuesByQuery @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingIdPlural)){ and find_in_set(t.teacher_open_course_question_homework_setting_id,#teacherOpenCourseQuestionHomeworkSettingIdPlural#) @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingSchoolClassIds)){ + and t.teacher_open_course_question_homework_setting_school_class_ids =#teacherOpenCourseQuestionHomeworkSettingSchoolClassIds# + @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingDoCount)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_DO_COUNT =#teacherOpenCourseQuestionHomeworkSettingDoCount# + and t.teacher_open_course_question_homework_setting_do_count =#teacherOpenCourseQuestionHomeworkSettingDoCount# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_QUESTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# + and t.teacher_open_course_question_homework_setting_question_no_order =#teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingOptionNoOrder)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_OPTION_NO_ORDER =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# + and t.teacher_open_course_question_homework_setting_option_no_order =#teacherOpenCourseQuestionHomeworkSettingOptionNoOrder# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowQa)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_END_SHOW_QA =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# + and t.teacher_open_course_question_homework_setting_end_show_qa =#teacherOpenCourseQuestionHomeworkSettingEndShowQa# @} - @if(!isEmpty(endShowTrueFalse)){ - and t.end_show_true_false =#endShowTrueFalse# + @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals)){ + and t.teacher_open_course_question_homework_setting_end_show_true_fals =#teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals# @} @if(!isEmpty(teacherOpenCourseQuestionHomeworkSettingAddTime)){ - and t.TEACHER_OPEN_COURSE_QUESTION_HOMEWORK_SETTING_ADD_TIME =#teacherOpenCourseQuestionHomeworkSettingAddTime# + and t.teacher_open_course_question_homework_setting_add_time =#teacherOpenCourseQuestionHomeworkSettingAddTime# @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/index.js index bf889ab8..6d27279b 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkSetting/index.js @@ -41,6 +41,13 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { width : 60, }, + { + field : 'teacherOpenCourseQuestionHomeworkSettingSchoolClassIdsText', //数据字典类型为 school_class.class_name.class_status=1 + title : '班级ID集合(逗号隔开)', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkSettingSchoolClassIdsText'])?false:sx_['teacherOpenCourseQuestionHomeworkSettingSchoolClassIdsText'], + }, { field : 'teacherOpenCourseQuestionHomeworkSettingDoCount', title : '作答次数', @@ -70,11 +77,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkSettingEndShowQa'])?false:sx_['teacherOpenCourseQuestionHomeworkSettingEndShowQa'], }, { - field : 'endShowTrueFalse', + field : 'teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals', title : '答卷后显示答案对错', align:"center", hideField :false, - hide:$.isEmpty(sx_['endShowTrueFalse'])?false:sx_['endShowTrueFalse'], + hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals'])?false:sx_['teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals'], }, { field : 'teacherOpenCourseQuestionHomeworkSettingAddTime', diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/add.html index 76dbc166..197a395c 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/add.html @@ -4,15 +4,16 @@ <div class="layui-row"> <div class="layui-form-item"> <div class="layui-inline"> - <label class="layui-form-label">作答次数</label> + <label class="layui-form-label">班级ID集合(逗号隔开)</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingDoCount" name="teacherOpenCourseQuestionHomeworkSettingDoCount" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingDoCount}" class="layui-input" > + <layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1" + id="teacherOpenCourseQuestionHomeworkSettingSchoolClassIds" name="teacherOpenCourseQuestionHomeworkSettingSchoolClassIds" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingSchoolClassIds}" layVerify="" /> </div> </div> <div class="layui-inline"> - <label class="layui-form-label">题目乱序(同一大题内)</label> + <label class="layui-form-label">作答次数</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingDoCount" name="teacherOpenCourseQuestionHomeworkSettingDoCount" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingDoCount}" class="layui-input" > </div> </div> </div> @@ -20,15 +21,15 @@ <div class="layui-row"> <div class="layui-form-item"> <div class="layui-inline"> - <label class="layui-form-label">选项乱序(限单选、多选)</label> + <label class="layui-form-label">题目乱序(同一大题内)</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingOptionNoOrder}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder}" class="layui-input" > </div> </div> <div class="layui-inline"> - <label class="layui-form-label">答卷后显示答案解析</label> + <label class="layui-form-label">选项乱序(限单选、多选)</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingEndShowQa" name="teacherOpenCourseQuestionHomeworkSettingEndShowQa" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingEndShowQa}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingOptionNoOrder}" class="layui-input" > </div> </div> </div> @@ -36,27 +37,37 @@ <div class="layui-row"> <div class="layui-form-item"> <div class="layui-inline"> - <label class="layui-form-label">答卷后显示答案对错</label> + <label class="layui-form-label">答卷后显示答案解析</label> <div class="layui-input-inline"> - <input type="text" id="endShowTrueFalse" name="endShowTrueFalse" value="${teacherOpenCourseHomeworkSetting.endShowTrueFalse}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingEndShowQa" name="teacherOpenCourseQuestionHomeworkSettingEndShowQa" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingEndShowQa}" class="layui-input" > </div> </div> <div class="layui-inline"> - <label class="layui-form-label">创建时间</label> + <label class="layui-form-label">答卷后显示答案对错</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingAddTime" name="teacherOpenCourseQuestionHomeworkSettingAddTime" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingAddTime}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals" name="teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals}" class="layui-input" > </div> </div> </div> </div> <div class="layui-row"> <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">创建时间</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingAddTime" name="teacherOpenCourseQuestionHomeworkSettingAddTime" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingAddTime,"yyyy-MM-dd"}" class="layui-input input-date" > + </div> + </div> <div class="layui-inline"> <label class="layui-form-label">组织ID</label> <div class="layui-input-inline"> <input type="text" id="orgId" name="orgId" value="${teacherOpenCourseHomeworkSetting.orgId}" class="layui-input" > </div> </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label">用户ID</label> <div class="layui-input-inline"> diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/edit.html index 82267bda..bbe6f79d 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/edit.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkSetting/edit.html @@ -4,15 +4,16 @@ <div class="layui-row"> <div class="layui-form-item"> <div class="layui-inline"> - <label class="layui-form-label">作答次数</label> + <label class="layui-form-label">班级ID集合(逗号隔开)</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingDoCount" name="teacherOpenCourseQuestionHomeworkSettingDoCount" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingDoCount}" class="layui-input" > + <layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1" + id="teacherOpenCourseQuestionHomeworkSettingSchoolClassIds" name="teacherOpenCourseQuestionHomeworkSettingSchoolClassIds" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingSchoolClassIds}" layVerify="" /> </div> </div> <div class="layui-inline"> - <label class="layui-form-label">题目乱序(同一大题内)</label> + <label class="layui-form-label">作答次数</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingDoCount" name="teacherOpenCourseQuestionHomeworkSettingDoCount" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingDoCount}" class="layui-input" > </div> </div> </div> @@ -20,15 +21,15 @@ <div class="layui-row"> <div class="layui-form-item"> <div class="layui-inline"> - <label class="layui-form-label">选项乱序(限单选、多选)</label> + <label class="layui-form-label">题目乱序(同一大题内)</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingOptionNoOrder}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingQuestionNoOrder}" class="layui-input" > </div> </div> <div class="layui-inline"> - <label class="layui-form-label">答卷后显示答案解析</label> + <label class="layui-form-label">选项乱序(限单选、多选)</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingEndShowQa" name="teacherOpenCourseQuestionHomeworkSettingEndShowQa" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingEndShowQa}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" name="teacherOpenCourseQuestionHomeworkSettingOptionNoOrder" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingOptionNoOrder}" class="layui-input" > </div> </div> </div> @@ -36,27 +37,37 @@ <div class="layui-row"> <div class="layui-form-item"> <div class="layui-inline"> - <label class="layui-form-label">答卷后显示答案对错</label> + <label class="layui-form-label">答卷后显示答案解析</label> <div class="layui-input-inline"> - <input type="text" id="endShowTrueFalse" name="endShowTrueFalse" value="${teacherOpenCourseHomeworkSetting.endShowTrueFalse}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingEndShowQa" name="teacherOpenCourseQuestionHomeworkSettingEndShowQa" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingEndShowQa}" class="layui-input" > </div> </div> <div class="layui-inline"> - <label class="layui-form-label">创建时间</label> + <label class="layui-form-label">答卷后显示答案对错</label> <div class="layui-input-inline"> - <input type="text" id="teacherOpenCourseQuestionHomeworkSettingAddTime" name="teacherOpenCourseQuestionHomeworkSettingAddTime" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingAddTime}" class="layui-input" > + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals" name="teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingEndShowTrueFals}" class="layui-input" > </div> </div> </div> </div> <div class="layui-row"> <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">创建时间</label> + <div class="layui-input-inline"> + <input type="text" id="teacherOpenCourseQuestionHomeworkSettingAddTime" name="teacherOpenCourseQuestionHomeworkSettingAddTime" value="${teacherOpenCourseHomeworkSetting.teacherOpenCourseQuestionHomeworkSettingAddTime,"yyyy-MM-dd"}" class="layui-input input-date" > + </div> + </div> <div class="layui-inline"> <label class="layui-form-label">组织ID</label> <div class="layui-input-inline"> <input type="text" id="orgId" name="orgId" value="${teacherOpenCourseHomeworkSetting.orgId}" class="layui-input" > </div> </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label">用户ID</label> <div class="layui-input-inline">