文件存档

web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java

@@ -223,14 +223,16 @@ public class QuestionLogSummaryController extends BaseController {
     /**
     *@author 姚丹
     *@data 2023/01/11
+     * 章节、考试、作业的详情
      */
     @GetMapping(MODEL + "/indexInfo.do")
     @Function("questionLogSummary.query")
-    public ModelAndView indexInfo(Long teacherOpenCourseId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType) {
+    public ModelAndView indexInfo(Long teacherOpenCourseId,Long questionSettingId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType) {
         ModelAndView view = new ModelAndView("/jlw/questionLogSummary/indexInfo.html") ;
         view.addObject("search", QuestionLogSummaryQuery.class.getName());
         view.addObject("teacherOpenCourseId", teacherOpenCourseId);
         view.addObject("questionSettingType", questionSettingType);
+        view.addObject("questionSettingId", questionSettingId);
         return view;
     }
 
@@ -602,7 +604,7 @@ public class QuestionLogSummaryController extends BaseController {
      * @return
      */
     @SneakyThrows
-    @PostMapping(MODEL + "/homeworkFileAnalysisExport.json")
+    @GetMapping(MODEL + "/homeworkFileAnalysisExport.json")
     @ResponseBody
     public String homeworkFileAnalysisExport(Long teacherOpenCourseId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) {
         PageQuery<Object> pageQuery = new PageQuery<>();

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java

@@ -317,7 +317,7 @@ public class TeacherOpenCourseQuestionLogController extends BaseController {
      * @return
      */
     @SneakyThrows
-    @PostMapping(API + "/export.do")
+    @GetMapping(API + "/export.do")
     public void tuckExport(HttpServletResponse resp, TeacherOpenCourseQuestionLogQuery condition, @SCoreUser CoreUser coreUser) {
 
         Assert.notNull(getUser(), "请登录后再操作");

web/src/main/resources/static/js/jlw/questionLogSummary/index.js

@@ -39,12 +39,12 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
     });
     var view ={
         init:function(){
-            var that = this
+            var that = this;
             this.initTable();
             this.initSearchForm();
             this.initToolBar();
             window.dataReload = function(){
-                Lib.doSearchForm($("#searchForm"),questionLogSummaryTable)
+                Lib.doSearchForm($("#searchForm"),questionLogSummaryTable);
                 that.initToolBar();
             }
         },
@@ -80,12 +80,15 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
                     hide: questionSettingType == "CHAPTER_EXERCISE" ? false : true,
                 },
                 {
-                    field: 'avgFinishTime',
+                    field: 'startTime,endTime',
                     title: '考试时间',
                     align: "center",
-                    hideField: false,
+                    width: 320,
-                    hide: $.isEmpty(sx_['avgFinishTime']) ? false : sx_['avgFinishTime'],
                     hide: questionSettingType == "EXAM" ? false : true,
+                    templet:function (d) {
+                        var htm = d.startTime+" ~ "+ d.endTime;
+                        return htm;
+                    }
                 },
                 {
                     field : 'avgCorrectCount',
@@ -178,7 +181,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
                     });*/
                     layer.confirm('是否确定导出章节练习表吗？', function (index) {
                         var url = Common.ctxPath + "/jlw/questionLogSummary/exportAnalysis.json?teacherOpenCourseId=" + teacherOpenCourseId + '&questionSettingType=' + questionSettingType;
-                        $.downFile(url);
+                        $.downFile(url,'章节练习表');
                         layer.close(index);
                     });
                 },
@@ -216,7 +219,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
                     });
                 });
             }else if (obj.event === 'details') {
-                var url = "/jlw/questionLogSummary/indexInfo.do?teacherOpenCourseId=" + teacherOpenCourseId + "&questionSettingType=" + questionSettingType;
+                var url = "/jlw/questionLogSummary/indexInfo.do?teacherOpenCourseId=" + teacherOpenCourseId + "&questionSettingType=" + questionSettingType + "&questionSettingId=" + data.questionSettingId;
                 Common.openDlg(url, "详情");
             }
         })

web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js

@@ -225,11 +225,11 @@ layui.define([ 'form', 'laydate', 'table','laytpl'], function(exports) {
                 exportDocument: function () {
                     layui.use([ 'teacherOpenCourseStudentSigninLogApi' ], function() {
                         var teacherOpenCourseStudentSigninLogApi = layui.teacherOpenCourseStudentSigninLogApi
-                        Common.openConfirm("确认要导出签到详情?", function() {
+                        Common.openConfirm("确认要导出签到详情表?", function() {
                             // teacherOpenCourseStudentSigninLogApi.exportExcel($("#searchForm"), function(fileId) {
                             //     // Lib.download(fileId);
                             // })
-                            $.downFile(Common.ctxPath + "/api/teacherOpenCourseStudentSigninLog/export.do?teacherOpenCourseId="+teacherOpenCourseId);
+                            $.downFile(Common.ctxPath + "/api/teacherOpenCourseStudentSigninLog/export.do?teacherOpenCourseId="+teacherOpenCourseId,"签到详情表");
                         })
                     });
                 },

web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js

@@ -223,7 +223,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
                     Common.downLoad("/jlw/teacherOpenCourseMergeScheduleSession/excel/export.json", formPara, 'POST')
                 */
                     layer.confirm('是否确定导出签到汇总表吗？', function (index) {
-                        $.downFile(Common.ctxPath + "/jlw/teacherOpenCourseStudentSigninSetting/exportSummary.json");
+                        $.downFile(Common.ctxPath + "/jlw/teacherOpenCourseStudentSigninSetting/exportSummary.json",'签到汇总表');
                         layer.close(index);
                     });
                 }

web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html

@@ -44,7 +44,7 @@
         var table = layui.table;
         var laytpl = layui.laytpl;
         var element = layui.element;
-        ///jlw/teacherOpenCourseQuestionSetting/analysis.json
+
 
         var questionLogSummaryTable = null;
         var teacherOpenCourseId = $("input[name='teacherOpenCourseId']").val();
@@ -72,11 +72,17 @@
         getCount(questionSettingType);
 
         function getCount(questionSettingType) {
-            var url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json',
+            var url,
                 param = {
                     teacherOpenCourseId: teacherOpenCourseId,
                     questionSettingType: questionSettingType
                 };
+            if(questionSettingType == "HOMEWORK_QUESTION"){
+                url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json';
+            }else if(questionSettingType == "HOMEWORK_FILE"){
+                url = '/jlw/questionLogSummary/homeworkFileAnalysis.json'
+            }
+
             var ret = Common.postAjax(url, param);
             if (ret.code == 0) {
                 var data = ret.data;
@@ -199,9 +205,17 @@
                         Lib.closeFrame();
                     },
                     exportDocument: function () {
-                        layer.confirm('是否确定导出'+(questionSettingType == "HOMEWORK_QUESTION" ? '题库作业表' : '附件作业表')+'吗？', function (index) {
+                        var url,title;
-                            var url = Common.ctxPath + "/jlw/questionLogSummary/exportAnalysis.json?teacherOpenCourseId=" + teacherOpenCourseId + '&questionSettingType=' + questionSettingType;
+                        if(questionSettingType == "HOMEWORK_QUESTION"){///jlw/questionLogSummary/homeworkFileAnalysisExport.json
-                            $.downFile(url);
+                            title ="题库作业表";
+                            url = "/jlw/questionLogSummary/exportAnalysis.json?teacherOpenCourseId=" + teacherOpenCourseId + '&questionSettingType=' + questionSettingType;
+                        }else{
+                            title = '附件作业表';
+                            url = url = '/jlw/questionLogSummary/homeworkFileAnalysisExport.json?teacherOpenCourseId=' + teacherOpenCourseId + "&questionSettingType=" + questionSettingType;
+                        }
+                        layer.confirm('是否确定导出'+title+'吗？', function (index) {
+                            var url = Common.ctxPath + url;
+                            $.downFile(url,title);
                             layer.close(index);
                         });
                     },
@@ -239,7 +253,7 @@
                         });
                     });
                 } else if (obj.event === 'details') {
-                    var url = "/jlw/questionLogSummary/indexInfo.do?teacherOpenCourseId=" + teacherOpenCourseId + "&questionSettingType=" + questionSettingType;
+                    var url = "/jlw/questionLogSummary/indexInfo.do?teacherOpenCourseId=" + teacherOpenCourseId + "&questionSettingType=" + questionSettingType + "&questionSettingId=" + data.questionSettingId;
                     Common.openDlg(url, "详情");
                 }
             })

web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html

@@ -26,8 +26,17 @@
     <div class="layui-col-md9">
         <div class="layui-inline">
             <layui:searchForm formId="searchForm" searchList="" condition="${search}">
-                <div class="layui-inline" id="opTime_view">
+                <div class="layui-inline">
-
+                    <!--#if(questionSettingType=='CHAPTER_EXERCISE'){-->
+                    <label class="layui-form-label">章节名称</label>
+                    <!--#}else if(questionSettingType=='EXAM'){-->
+                    <label class="layui-form-label">考试名称</label>
+                    <!--#}else if(questionSettingType=='HOMEWORK_FILE('){-->
+                    <label class="layui-form-label" style="width: 85px">附件作业名称</label>
+                    <!--#}else if(questionSettingType=='HOMEWORK_QUESTION'){-->
+                    <label class="layui-form-label" style="width: 85px">题库作业名称</label>
+                    <!--#}-->
+                    <div class="layui-input-inline" id="view"></div>
                 </div>
             </layui:searchForm>
         </div>
@@ -46,7 +55,17 @@
 </div>
 <input type="hidden" name="teacherOpenCourseId" autocomplete="off" class="layui-input" value="${teacherOpenCourseId}"/>
 <input type="hidden" name="questionSettingType" autocomplete="off" class="layui-input" value="${questionSettingType}"/>
+<input type="hidden" name="questionSettingId" autocomplete="off" class="layui-input" value="${questionSettingId}"/>
 <!--#} -->
+<script id="demo" type="text/html">
+    <select name="teacherOpenCourseQuestionSettingId" lay-verify="">
+        <option value="">请选择</option>
+        {{# layui.each(d, function(index, item){ }}
+        <option value="{{item.teacherOpenCourseQuestionSettingId}}">{{item.teacherOpenCourseQuestionSettingName}}
+        </option>
+        {{# }); }}
+    </select>
+</script>
 <script id="CHAPTER_EXERCISE_demo" type="text/html">
     <label class="layui-form-label">章节名称</label>
     <div class="layui-input-block">
@@ -102,10 +121,9 @@ layui.use(['form','laydate','table','laytpl'], function(){
     var teacherOpenCourseQuestionLogTable = null;
     var studentTable = null;
 
-    var teacherOpenCourseStudentSigninSettingId=$("input[name='teacherOpenCourseStudentSigninSettingId']").val();
+    var questionSettingId = $("input[name='questionSettingId']").val();
     var teacherOpenCourseId=$("input[name='teacherOpenCourseId']").val();
     var questionSettingType = $("input[name='questionSettingType']").val();
-
     laydate.render({
         elem: '#test5'
         ,type: 'datetime'
@@ -113,59 +131,13 @@ layui.use(['form','laydate','table','laytpl'], function(){
     });
     var data = [];
 
-    var getTpl, view;
+    var url = "/api/teacherOpenCourseQuestionSetting/getList.do?teacherOpenCourseId=" + teacherOpenCourseId + "&teacherOpenCourseQuestionSettingType=" + questionSettingType;
-
+    var ret = Common.getAjax(url);
-    if (questionSettingType == "CHAPTER_EXERCISE") {
+    if (ret.code == 0) {
-
+        data = ret.data;
-        var paras = {
-            //courseInfoParentId: teacherOpenCourseId,
-            courseInfoType: 2,
-            courseInfoStatus: 1
-        };
-        var ret = Common.getAjax("/jlw/courseInfo/getValues.json", paras);
-        if (ret.code == 0) {
-            data = ret.data;
-        }
-        var getTpl = CHAPTER_EXERCISE_demo.innerHTML
-            , view = document.getElementById('opTime_view');
-
-    } else if (questionSettingType == "EXAM") {
-
-        var ret = Common.postAjax("/jlw/questionLogSummary/analysisPageList.json", {
-            "teacherOpenCourseId": teacherOpenCourseId,
-            'questionSettingType': questionSettingType
-        });
-        if (ret.code == 0) {
-            data = ret.data;
-        }
-        var getTpl = EXAM_demo.innerHTML
-            , view = document.getElementById('opTime_view');
-
-    } else if (questionSettingType == "HOMEWORK_FILE") {
-
-        var ret = Common.postAjax("/jlw/questionLogSummary/analysisPageList.json", {
-            "teacherOpenCourseId": teacherOpenCourseId,
-            'questionSettingType': questionSettingType
-        });
-        if (ret.code == 0) {
-            data = ret.data;
-        }
-        var getTpl = HOMEWORK_FILE_demo.innerHTML
-            , view = document.getElementById('opTime_view');
-
-    } else if (questionSettingType == "HOMEWORK_QUESTION") {
-
-        var ret = Common.postAjax("/jlw/questionLogSummary/analysisPageList.json", {
-            "teacherOpenCourseId": teacherOpenCourseId,
-            'questionSettingType': questionSettingType
-        });
-        if (ret.code == 0) {
-            data = ret.data;
-        }
-        var getTpl = HOMEWORK_QUESTION_demo.innerHTML
-            , view = document.getElementById('opTime_view');
     }
-
+    var getTpl = demo.innerHTML
+        , view = document.getElementById('view');
 
     laytpl(getTpl).render(data, function(html){
         view.innerHTML = html;
@@ -195,6 +167,7 @@ layui.use(['form','laydate','table','laytpl'], function(){
                 ,page : Lib.tablePage // 开启分页
                 /*  ,toolbar: '#toolbar_teacherOpenCourseQuestionLog' //自定义头部左侧工具栏
                   ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
+                ,where:{'teacherOpenCourseQuestionSettingId':questionSettingId}
                 ,limit : 10,
                 cols : [ [ // 表头
                     {
@@ -289,7 +262,7 @@ layui.use(['form','laydate','table','laytpl'], function(){
                 method: 'post',
                 even: true,
                 // skin:'nob',
-                // where:getParam_s(),
+                where:getParam_s(),
                 size: "sm",
                 url: Common.ctxPath + '/api/teacherOpenCourseQuestionLog/studentScoreList.do' // 数据接口
                 , page: Lib.tablePage // 开启分页
@@ -319,11 +292,11 @@ layui.use(['form','laydate','table','laytpl'], function(){
             });
             //触发行单击事件
             table.on('row(studentTable)', function(obj){
+                var settingId = $("select[name='teacherOpenCourseQuestionSettingId']").val();
                 var param={
-                    'teacherOpenCourseStudentSigninSettingId': teacherOpenCourseStudentSigninSettingId,
+                    'studentId':obj.data.studentId,
-                    'courseInfoId': $("select[name='courseInfoId']").val(),
+                    'teacherOpenCourseQuestionSettingId':$.isEmpty(settingId)?questionSettingId:settingId,
-                    'studentId':obj.data.studentId
+                };
-                }
 
                 teacherOpenCourseQuestionLogTable.reload({
                     where: param,
@@ -341,6 +314,8 @@ layui.use(['form','laydate','table','laytpl'], function(){
             var btn_s = $("#searchFormSearch");
             btn_s.on('click', function () {
                 var data = $("#searchForm").serializeJson();
+                data.teacherOpenCourseQuestionSettingId =$.isEmpty(data.teacherOpenCourseQuestionSettingId)?questionSettingId:data.teacherOpenCourseQuestionSettingId
+
                 teacherOpenCourseQuestionLogTable.reload({
                     where: data,
                     page: {
@@ -399,8 +374,27 @@ layui.use(['form','laydate','table','laytpl'], function(){
                     Common.openDlg(url, "teacherOpenCourseQuestionLog管理>上传");
                 },*/
                 exportDocument: function () {
-                    Common.openConfirm("确认要导出该详情?", function () {
+                    var url,title;
-                        //$.downFile(Common.ctxPath + "/api/teacherOpenCourseQuestionLog/export.do?teacherOpenCourseId="+teacherOpenCourseId);
+                    var settingId = $("select[name='teacherOpenCourseQuestionSettingId']").val();
+                    settingId = $.isEmpty(settingId)?questionSettingId:settingId
+
+                    if(questionSettingType == "CHAPTER_EXERCISE"){///jlw/questionLogSummary/homeworkFileAnalysisExport.json
+                        title = '章节详情表';
+                        url = "/api/teacherOpenCourseQuestionLog/zyDetailExport.do?teacherOpenCourseQuestionSettingId=" + settingId;
+                            //+ teacherOpenCourseId + '&questionSettingType=' + questionSettingType;
+                    }else if(questionSettingType == "EXAM"){
+                        title = '考试详情表';
+                        url = "/api/teacherOpenCourseQuestionLog/zyDetailExport.do?teacherOpenCourseQuestionSettingId=" + settingId;
+                    }else if(questionSettingType == "HOMEWORK_FILE"){
+                        title = '附件作业详情表';
+                    }else if(questionSettingType == "HOMEWORK_QUESTION"){
+                        title ="题库作业详情表";
+                        url = "/api/teacherOpenCourseQuestionLog/zyDetailExport.do?teacherOpenCourseQuestionSettingId=" + settingId;
+                    }
+
+                    Common.openConfirm("确认要导出"+title+"?", function (index) {
+                        $.downFile(Common.ctxPath + url,title);
+                        layer.close(index);
                     })
                 },
                 addButton_cancel:function () {
@@ -437,10 +431,9 @@ layui.use(['form','laydate','table','laytpl'], function(){
     };
     function getParam_s(){
         var param = {
-            //"teacherOpenCourseStudentSigninSettingSessionTime":$("select[name='teacherOpenCourseStudentSigninSettingSessionTime']").val(),
             "schoolClassIdPlural":$("#studentForm select[name='classId']").val(),
             "studentSnOrName":$("#studentForm input[name='studentOrName']").val(),
-            //'teacherOpenCourseId':teacherOpenCourseId
+            'teacherOpenCourseId': teacherOpenCourseId
         };
 
         return param