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

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 359c9379a0 c05883eac0
commit 2441ace4b9
12 changed files with 267 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java
Unescape Escape View File

@ -149,7 +149,7 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
// 缺勤 schoolClassIds
@FetchSql("select if((#signinStudentTotalCount# - #signinTotalCount#) < 0, 0, (#signinStudentTotalCount# - #signinTotalCount#))")
@FetchSql("select case when #teacherOpenCourseStudentSigninSettingStartStatus# = 'READY' then 0 else if((#signinStudentTotalCount# - #signinTotalCount#) < 0, 0, (#signinStudentTotalCount# - #signinTotalCount#)) end")
@UpdateIgnore
@InsertIgnore
private Integer unsigninCount;

1
web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java
Unescape Escape View File

@ -594,6 +594,7 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
Assert.notNull(student, "该接口只允许学生访问");
PageQuery pageQuery = query.getPageQuery();
pageQuery.setPara("studentId", student.getStudentId());
pageQuery.setPara("classIds", student.getClassId().toString());
// 默认只查询普通最终提交
query.setQuestionLogAddType(defaultIfNull(query.getQuestionLogAddType(), FINALLY_SUBMIT));
PageQuery<TeacherOpenCourseQuestionTestSimpleInfoVO> questionTestSimpleInfo = resourcesQuestionSnapshotDao.getQuestionTestSimpleInfo(pageQuery);

13
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java
Unescape Escape View File

@ -2,7 +2,6 @@ package com.ibeetl.jlw.web;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@ -41,9 +40,13 @@ import org.springframework.web.servlet.ModelAndView;
import javax.validation.constraints.NotNull;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.*;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import static cn.jlw.util.CacheUserUtil.getStudent;
import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
import static com.ibeetl.admin.core.util.ExcelUtil.write;
@ -270,6 +273,12 @@ public class TeacherOpenCourseChatLogController extends BaseController {
if (!coreUser.isAdmin()) {
condition.setOrgId(coreUser.getOrgId());
}
// 学生身份过滤班级
if (coreUser.isStudent()) {
condition.setSchoolClassIds(getStudent().getClassId().toString());
}
PageQuery page = condition.getPageQuery();
// 为空则查询顶级
condition.setTeacherOpenCourseChatLogParentId(ObjectUtil.defaultIfNull(condition.getTeacherOpenCourseChatLogParentId(), 0L));

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

@ -63,6 +63,8 @@ public class TeacherOpenCourseQuestionSettingController {
if (coreUser.isStudent()) {
condition.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
condition.setTeacherOpenCourseQuestionSettingStatus(1);
condition.setTeacherOpenCourseQuestionSettingSchoolClassIds(getStudent().getClassId().toString());
}
PageQuery page = condition.getPageQuery();

3
web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md
Unescape Escape View File

@ -743,6 +743,9 @@ getQuestionTestSimpleInfo
AND t.teacher_open_course_question_setting_status = 1
AND t.teacher_open_course_question_setting_type = #teacherOpenCourseQuestionSettingType#
AND t.teacher_open_course_id = #teacherOpenCourseId#
@if(!isEmpty(classIds)){
and find_in_set(t.teacher_open_course_question_setting_school_class_ids, #classIds#)
@}
AND ( select count(distinct(tb.resources_question_snapshot_id)) from resources_question_snapshot tb
where tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id
and tb.question_status = 1

2
web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md
Unescape Escape View File

@ -33,7 +33,7 @@ queryByCondition
and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
@}
@if(!isEmpty(schoolClassIds)){
and t.school_class_ids =#schoolClassIds#
and find_in_set(t.school_class_ids, #schoolClassIds#)
@}
@if(!isEmpty(teacherId)){
and t.teacher_id =#teacherId#

4
web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md
Unescape Escape View File

@ -107,7 +107,7 @@ queryByConditionQuery
and t.teacher_open_course_question_setting_id =#teacherOpenCourseQuestionSettingId#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingIdPlural)){
and find_in_set(t.teacher_open_course_question_setting_id,#teacherOpenCourseQuestionSettingIdPlural#)
and find_in_set(t.teacher_open_course_question_setting_id, #teacherOpenCourseQuestionSettingIdPlural#)
@}
@if(!isEmpty(teacherOpenCourseId)){
and t.teacher_open_course_id =#teacherOpenCourseId#
@ -116,7 +116,7 @@ queryByConditionQuery
and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingSchoolClassIds)){
and t.teacher_open_course_question_setting_school_class_ids =#teacherOpenCourseQuestionSettingSchoolClassIds#
and find_in_set(t.teacher_open_course_question_setting_school_class_ids, #teacherOpenCourseQuestionSettingSchoolClassIds#)
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingDoCount)){
and t.teacher_open_course_question_setting_do_count =#teacherOpenCourseQuestionSettingDoCount#

5
web/src/main/resources/static/js/jlw/handsOn/add.js
Unescape Escape View File

@ -26,6 +26,7 @@ layui.define(['form', 'laydate', 'table','laytpl','upload','layedit', 'handsOnAp
}
var handsOnId = $("input[name='handsOnId']").val();
var courseInfoId_ = $("input[name='courseInfoId_']").val();
var one = layedit.build('test-editor'); //建立编辑器
if(!$.isEmpty(handsOnId)){
var ret = Common.getAjax("/jlw/handsOn/view.json",{handsOnId:handsOnId});
if(ret.code == 0){
@ -38,7 +39,7 @@ layui.define(['form', 'laydate', 'table','laytpl','upload','layedit', 'handsOnAp
});
}
}
var one = layedit.build('test-editor'); //建立编辑器
var view = {
init: function () {
Lib.initGenrealForm($("#addForm"), form);
@ -114,7 +115,7 @@ layui.define(['form', 'laydate', 'table','laytpl','upload','layedit', 'handsOnAp
//选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
form.on('select(select_courseInfoIds)', function (obj) {
let sourceType = $("select[name='courseChildNode']").find('option:selected').attr("status");
let sourceType = $("select[name='courseInfoId']").find('option:selected').attr("status");
let courseInfoType = 2;//courseInfoType（2 章节，3 节）
Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value,courseInfoType,sourceType, 1);
});

2
web/src/main/resources/static/js/jlw/handsOn/index.js
Unescape Escape View File

@ -155,7 +155,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
if (obj.event === 'edit') {
var url = "/jlw/handsOn/add.do?handsOnId=" + data.handsOnId;
if(data.dataType == 'FACULTY_ADD'){
url = "/jlw/teacherOpenCourseHandsOn/edit.do?resourcesInfoId=" + data.handsOnId;
url = "/jlw/teacherOpenCourseHandsOn/edit.do?handsOnId=" + data.handsOnId;
}
Common.openDlg(url, "实操管理>" + data.handsOnName + ">编辑");
} else if (obj.event === "result") {

86
web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js
Unescape Escape View File

@ -1,7 +1,42 @@
layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnApi'], function(exports) {
layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOpenCourseHandsOnApi'], function(exports) {
var form = layui.form;
var teacherOpenCourseHandsOnApi = layui.teacherOpenCourseHandsOnApi;
var index = layui.index;
var upload = layui.upload;
var layedit = layui.layedit;
var laytpl = layui.laytpl
layedit.set({ //富文本上传图片
uploadImage: {
url: Common.ctxPath + "/jlw/file/update.do",
imgUrl:Common.ctxPath
}
});
var courseInfoParentId = $("select[name='courseInfoId']").val();//课程ID
var sourceType = $("select[name='courseInfoId']").find('option:selected').attr("status");
var childValue = $("#courseChildNode").val();
//反显章节下拉框（key,courseInfoParentId,courseInfoType,sourceType,resourcesQuestionIdsIsNotNull）
Lib.getCourseInfo($("select[name='courseChildNode']"),courseInfoParentId,2,sourceType,'',childValue);
form.render();
window.loadList = function (){//重新加载实训任务列表
getListInfo();
}
var handsOnId = $("input[name='handsOnId']").val();
var teacherOpenCourseId = $("input[name='teacherOpenCourseId']").val();
var one = layedit.build('test-editor'); //建立编辑器
if(!$.isEmpty(handsOnId)){
var ret = Common.getAjax("/jlw/handsOn/view.json",{handsOnId:handsOnId});
if(ret.code == 0){
layedit.setContent(one,Lib.repLaceltgt(ret.data.applicationIntroduction),false);
}else {
layer.msg(ret.msg, {
offset: ['50%'],
icon: 2,
time: 1500 //2秒关闭（如果不配置，默认是3秒）
});
}
}
var view = {
init:function(){
Lib.initGenrealForm($("#updateForm"),form);
@ -23,6 +58,55 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnApi'], functi
}
}
//选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
form.on('select(select_courseInfoIds)', function (obj) {
let sourceType = $("select[name='courseInfoId']").find('option:selected').attr("status");
let courseInfoType = 2;//courseInfoType（2 章节，3 节）
Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value,courseInfoType,sourceType);
});
$(".button_add").click(() => {
handsOnId = $("#updateForm input[name='handsOnId']").val();
if (!$.isEmpty(handsOnId)){
var url = "/jlw/handsOnSimulationTasks/add.do?handsOnId="+handsOnId+'&courseInfoId='+teacherOpenCourseId;
Common.openDlg(url);
}
});
//实训任务编辑
$(".bj").click(edit_simu)
function edit_simu(){
var taskId = $(this).attr("taskid");
var url = "/jlw/handsOnSimulationTasks/add.do?taskId="+taskId + "&handsOnId="+handsOnId;
Common.openDlg(url,"");
}
//实训任务删除
$(".sc").click(del_simu)
function del_simu(){
var taskId = $(this).attr("taskid");
var ret = Common.postAjax("/jlw/handsOnSimulationTasks/delete.json",{ids:taskId})
if (ret.code == 0) {
$(this).parent().parent().remove()
}
}
$(".uploader-file-cancel").click(function () {
$(this).parent().parent().remove()
});
function getListInfo(){ //获取
var ret = Common.postAjax("/api/handsOnSimulationTasks/getPageList.do",{handsOnId:$("#updateForm input[name='handsOnId']").val()})
if (ret.code == 0) {
var getTpl = sc_demo.innerHTML
,view = document.getElementById('sc_view');
laytpl(getTpl).render({list:ret.data}, function(html){
view.innerHTML = html;
$(".bj").unbind();
$(".sc").unbind();
$(".bj").click(edit_simu);
$(".sc").click(del_simu);
});
}
}
exports('edit',view);
});

2
web/src/main/resources/templates/jlw/handsOn/add.html
Unescape Escape View File

@ -225,7 +225,7 @@
</div>
<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
<input type="hidden" name="handsOnId" value="${handsOn.handsOnId}"/>
<input type="hidden" name="courseInfoId_" value="${courseInfoId}"/>
</form>
<!--#} -->
<script>

166
web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html
Unescape Escape View File

@ -1,23 +1,168 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseHandsOn/"}){ -->
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<link rel="stylesheet" href="${ctxPath}/plugins/editorMd/css/editormd.css"/>
<script src="${ctxPath}/plugins/editorMd/editormd.min.js"></script>
<link rel="stylesheet" href="${ctxPath}/plugins/highlight/styles/a11y-light.min.css"/>
<script type="text/javascript" src="${ctxPath}/plugins/highlight/highlight.min.js?v=${jsVer}"></script>
<script type="text/javascript" src="${ctxPath}/plugins/simple-uploader/public/uploader.js?v=${jsVer}"></script>
<script type="text/javascript" src="${ctxPath}/plugins/simple-uploader/public/app.js?v=${jsVer}"></script>
<form class="layui-form" id="updateForm">
<div class="layui-row" style="margin: 0 auto;">
<a class="layui-btn layui-btn-primary" id="addButton-cancel" style="margin-bottom: 10px;padding: 0 30px;">返回</a>
<a class="layui-btn bg_button" id="addButton"
style="${!user.get().isAdmin ? 'margin-bottom: 10px;padding: 0 28px;':'display: none;'}">确定</a>
</div>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label"><span class="req">*</span>归属课程：</label>
<div class="layui-input-block" style="width: 400px;">
<!--<layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseHandsOn.courseInfoId}"
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
id="courseInfoIds" name="courseInfoId" layFilter="select_courseInfoIds"/>-->
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoId", "isShowGroupName": "true","filterName": "理论课程类,开课类","defaultValue": teacherOpenCourseHandsOn.courseInfoId}) {} -->
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label"><span class="req">*</span>归属章节：</label>
<div class="layui-input-block" style="width: 400px;">
<input type="hidden" id="courseChildNode" value="${teacherOpenCourseHandsOn.courseChildNode}"/>
<select name="courseChildNode" lay-filter="select_courseInfoIds_1">
<option value="">请选择</option>
</select>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label"><span class="req">*</span>实操名称：</label>
<div class="layui-input-block" style="width: 400px;">
<input type="text" id="handsOnName" name="handsOnName" value="${teacherOpenCourseHandsOn.handsOnName}"
class="layui-input">
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label"><span class="req">*</span>实操介绍：</label>
<div class="layui-input-block">
<div>
<!-- <textarea style="display:none;"></textarea>-->
<textarea style="display:none;" id="test-editor">${teacherOpenCourseHandsOn.handsOnRecommend}</textarea>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label">数据集：</label>
<div class="layui-input-block">
<div class="layui-upload">
<div class="uploader-drop" ondragenter="jQuery(this).addClass('uploader-dragover');"
ondragend="jQuery(this).removeClass('uploader-dragover');"
ondrop="jQuery(this).removeClass('uploader-dragover');">
<a class="uploader-browse-folder" style="display: none;"><u>select folder</u></a>
<a class="uploader-browse-image" style="display: none;"><u>select images</u></a>
<a class="uploader-browse-pvwpm" style="display: none;"><u>select [.ppt', '.pptx', '.doc', '.docx', '.pdf', '.mp4']</u></a>
<button type="button" class="layui-btn bg_button uploader-browse">选择文件</button>
<button type="button" class="layui-btn bg_button" style="display: none;" id="testListAction">
开始上传
</button>
</div>
<div class="layui-upload-list" style="max-width: 80%;min-width: 800px;">
<table class="layui-table" id="updateFileList">
<colgroup>
<col>
<col width="150">
<col width="260">
<col width="150">
</colgroup>
<thead>
<tr>
<th style="text-align: center;">文件名</th>
<th style="text-align: center;">大小</th>
<th style="text-align: center;">上传进度</th>
<th style="text-align: center;">操作</th>
</tr>
</thead>
<tbody id="demoList">
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div class="layui-row" id="handsOnSimulationTasks" style="${teacherOpenCourseHandsOn.handsOnId != null?'':'display: none;'}">
<div>
<label class="layui-form-label">实操任务：</label>
<div class="layui-input-block">
<button type="button" class="layui-btn bg_button button_add" style="float: left"><i class="layui-icon">&#xe654;</i>
</button>
</div>
</div>
<div class="layui-row">
<div class="layui-input-block">
<table class="layui-table" style="width: 60%;min-width: 1000px;">
<colgroup>
<col width="200">
<col>
<col>
<col width="200">
</colgroup>
<thead>
<tr>
<th>任务顺序</th>
<th>任务标题</th>
<th>任务类型</th>
<th>分值</th>
<th>操作</th>
</tr>
</thead>
<script id="sc_demo" type="text/html">
{{# layui.each(d.list, function(index, item){ }}
<tr>
<td>{{item.taskOrder}}</td>
<td>{{item.taskTitle}}</td>
<td>{{item.taskType == '1'?'观看视频':item.taskType == '2'?'观看PPT': item.taskType ==
'3'?'理论测评':item.taskType == '4'?'实训操作步骤':item.taskType == '5'?'报告撰写':'其他'}}
</td>
<td>{{item.taskScore}}</td>
<td><a taskid="{{item.taskId}}" class="layui-btn layui-btn-sm bg_button bj">编辑</a> <a
taskid="{{item.taskId}}" style="background-color: red" class="layui-btn layui-btn-sm sc">删除</a>
</td>
</tr>
{{# }); }}
</script>
<tbody id="sc_view">
</tbody>
</table>
</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="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseHandsOn.teacherOpenCourseId}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
</div>-->
<!--<div class="layui-inline">
<label class="layui-form-label">归属课程</label>
<div class="layui-input-inline">
<input type="text" id="courseInfoId" name="courseInfoId" value="${teacherOpenCourseHandsOn.courseInfoId}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
</div>-->
<!--<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">归属章节</label>
@ -32,8 +177,8 @@
</div>
</div>
</div>
</div>
<div class="layui-row">
</div>-->
<!--<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">实操介绍</label>
@ -64,8 +209,8 @@
</div>
</div>
</div>
</div>
<div class="layui-row">
</div>-->
<!--<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">数据集（多个地址，逗号隔开）</label>
@ -74,10 +219,11 @@
</div>
</div>
</div>
</div>
</div>-->
<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
<input type="hidden" name="handsOnId" value="${teacherOpenCourseHandsOn.handsOnId}" />
<layui:submitButtons id="updateButton" buttonType="" showExamine="2" />
<input type="hidden" id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseHandsOn.teacherOpenCourseId}" class="layui-input" >
<!-- <layui:submitButtons id="updateButton" buttonType="" showExamine="2" />-->
</form>
<!--#} -->
<script>

Write Preview
Loading…
Cancel
Save