From 284a7b50e8cb9178ffbba2a42e1537df3a8e259a Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Tue, 1 Jun 2021 17:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E7=8F=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E5=92=8CPDF?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dtos/classplan/ClassPlanDTO.java | 20 ++ .../pojo/vos/classplan/ClassPlanVO.java | 20 ++ .../classplan/impl/ClassPlanServiceImpl.java | 2 + .../teacher/impl/TeacherServiceImpl.java | 4 +- .../mapper/classplan/class-plan-mapper.xml | 20 +- .../static/assets/images/pdf_icon.jpg | Bin 0 -> 17422 bytes .../static/route/classplan/save.html | 224 +++++++++++++++++- .../static/route/classplan/show.html | 192 ++++++++++++++- .../static/route/classplan/update.html | 220 ++++++++++++++++- .../resources/static/route/teacher/save.html | 2 +- .../static/route/teacher/update.html | 2 +- 11 files changed, 674 insertions(+), 32 deletions(-) create mode 100644 src/main/resources/static/assets/images/pdf_icon.jpg diff --git a/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanDTO.java index 885cb9f..b7a488d 100644 --- a/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanDTO.java @@ -77,6 +77,10 @@ public class ClassPlanDTO { private String examReason; @ApiModelProperty(name = "examStatus", value = "考点信息分配状态0未分配1已分配") private String examStatus; + @ApiModelProperty(name = "planImages", value = "开班申请图片") + private String planImages; + @ApiModelProperty(name = "planPDF", value = "开班申请PDF") + private String planPDF; public String getPlanNumber() { @@ -289,4 +293,20 @@ public class ClassPlanDTO { public void setExamStatus(String examStatus) { this.examStatus = examStatus; } + + public String getPlanImages() { + return planImages == null ? "" : planImages; + } + + public void setPlanImages(String planImages) { + this.planImages = planImages; + } + + public String getPlanPDF() { + return planPDF == null ? "" : planPDF; + } + + public void setPlanPDF(String planPDF) { + this.planPDF = planPDF; + } } diff --git a/src/main/java/cn/com/tenlion/materialstore/pojo/vos/classplan/ClassPlanVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/classplan/ClassPlanVO.java index f118000..1721aa0 100644 --- a/src/main/java/cn/com/tenlion/materialstore/pojo/vos/classplan/ClassPlanVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/classplan/ClassPlanVO.java @@ -54,6 +54,10 @@ public class ClassPlanVO { private String estimateEnd; @ApiModelProperty(name = "examType", value = "考试申请类型1理论2实操3理论与实操") private String examType; + @ApiModelProperty(name = "planImages", value = "开班申请图片") + private String planImages; + @ApiModelProperty(name = "planPDF", value = "开班申请PDF") + private String planPDF; public String getPlanNumber() { return planNumber == null ? "" : planNumber.trim(); @@ -214,4 +218,20 @@ public class ClassPlanVO { public void setEstimateEnd(String estimateEnd) { this.estimateEnd = estimateEnd; } + + public String getPlanImages() { + return planImages == null ? "" : planImages; + } + + public void setPlanImages(String planImages) { + this.planImages = planImages; + } + + public String getPlanPDF() { + return planPDF == null ? "" : planPDF; + } + + public void setPlanPDF(String planPDF) { + this.planPDF = planPDF; + } } diff --git a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java index be5f127..0b93eb1 100644 --- a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java @@ -143,6 +143,8 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl classPlanVO.setPlanAddress(obj.getString("planAddress")); classPlanVO.setChargePerson(obj.getString("chargePerson")); classPlanVO.setChargePersonTel(obj.getString("chargePersonTel")); + classPlanVO.setPlanImages(obj.getString("planImages")); + classPlanVO.setPlanPDF(obj.getString("planPDF")); Map params = HashMapUtil.beanToMap(classPlanVO); params.put("classPlanId", classPlanId); setSaveInfo(params); diff --git a/src/main/java/cn/com/tenlion/service/teacher/impl/TeacherServiceImpl.java b/src/main/java/cn/com/tenlion/service/teacher/impl/TeacherServiceImpl.java index 0351b7b..95a9d3b 100644 --- a/src/main/java/cn/com/tenlion/service/teacher/impl/TeacherServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/teacher/impl/TeacherServiceImpl.java @@ -178,9 +178,7 @@ public class TeacherServiceImpl extends DefaultBaseService implements ITeacherSe public List listTeacherLessonsTime(Map params) { List list = teacherDao.listTeacherLessonsTimeDTO(params); for(TeacherLessonsTimeDTO item : list){ - // 查询考试机构名称 - InstitutionDTO institutionDTO = iInstitutionService.get(item.getOrgId()); - item.setOrgName(institutionDTO.getInstitutionName()); + item.setOrgName(""); // 查询讲师名称 TeacherDTO byId = getById(item.getTeacherId()); item.setTeacherName(byId.getTeacherName()); diff --git a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml index 2584db9..f48543f 100644 --- a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml +++ b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml @@ -20,6 +20,8 @@ + + @@ -74,6 +76,8 @@ charge_person_tel, report_type, report_reason, + plan_images, + plan_pdf, creator, gmt_create, modifier, @@ -95,6 +99,8 @@ #{chargePersonTel}, #{reportType}, #{reportReason}, + #{planImages}, + #{planPDF}, #{creator}, #{gmtCreate}, #{modifier}, @@ -178,6 +184,12 @@ report_reason = #{reportReason}, + + + plan_images = #{planImages}, + + + plan_pdf = #{planPDF}, class_plan_id = class_plan_id WHERE @@ -203,7 +215,9 @@ t1.charge_person_tel, t1.class_plan_id, t1.report_type, - t1.report_reason + t1.report_reason, + t1.plan_images, + t1.plan_pdf FROM e_class_plan t1 WHERE @@ -289,7 +303,9 @@ t1.charge_person, t1.charge_person_tel, t1.report_type, - t1.report_reason + t1.report_reason, + t1.plan_images, + t1.plan_pdf FROM e_class_plan t1 WHERE diff --git a/src/main/resources/static/assets/images/pdf_icon.jpg b/src/main/resources/static/assets/images/pdf_icon.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f6f22a2afbd26b45acfc3103cdfb893bddf4d6c1 GIT binary patch literal 17422 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 C{tF@i literal 0 HcmV?d00001 diff --git a/src/main/resources/static/route/classplan/save.html b/src/main/resources/static/route/classplan/save.html index 376889f..db1d758 100644 --- a/src/main/resources/static/route/classplan/save.html +++ b/src/main/resources/static/route/classplan/save.html @@ -108,6 +108,70 @@ +
+
+
+ +
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+ +
+
+
+
@@ -194,7 +242,8 @@ var teacherList = []; var classPlanLessons = []; var classPlanId = top.restAjax.params(window.location.href).classPlanId; - var orgId = '' + var orgId = ''; + var planImagesViewerObj = {}; // 初始化内容 function initData() { @@ -218,6 +267,8 @@ initTeacherList(data.orgId); classPlanLessons = data.classPlanLessons; orgId = data.orgId; + initPlanImagesUploadFile(); + initPlanPDFUploadFile(); }, function(code, data) { top.dialog.msg(data.msg); }, function() { @@ -264,6 +315,110 @@ }); } + // 初始化图片上传 + function initPlanImagesUploadFile() { + var files = $('#planImages').val(); + initFileList('planImages', files, function(fileName) { + var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false}); + planImagesViewerObj[fileName] = viewer; + }); + + form.on('button(planImagesUploadFile)', function(obj) { + var name = this.dataset.name; + var explain = this.dataset.explain; + top.dialog.file({ + type: 'image', + title: '上传'+ explain, + width: '400px', + height: '420px', + maxFileCount: '1', + onClose: function() { + var uploadFileArray = top.dialog.dialogData.uploadFileArray; + if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) { + var files = $('#'+ name).val(); + for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) { + if(files.length > 0) { + files += ','; + } + files += file.data; + } + initFileList(name, files, function(fileName) { + planImagesViewerObj[fileName].update(); + }); + } + } + }); + }); + + form.on('button(planImagesRemoveFile)', function(obj) { + var name = this.dataset.name; + var id = this.dataset.id; + var files = $('#'+ name).val().replace(id, ''); + files = files.replace(/\,+/g, ','); + if(files.charAt(0) == ',') { + files = files.substring(1); + } + if(files.charAt(files.length - 1) == ',') { + files = files.substring(0, files.length - 1); + } + initFileList(name, files, function(fileName) { + planImagesViewerObj[fileName].update(); + }); + }); + } + + // 初始化PDF上传 + function initPlanPDFUploadFile() { + var files = $('#planPDF').val(); + initFileList('planPDF', files, function(fileName) { + $(document).on('click', '.pdf-open-show', function(obj){ + var fileId = this.dataset.id; + window.open('route/file/download/true/' + fileId); + }) + }); + + form.on('button(planPDFUploadFile)', function(obj) { + var name = this.dataset.name; + var explain = this.dataset.explain; + top.dialog.file({ + type: 'file', + title: '上传'+ explain, + width: '400px', + height: '420px', + maxFileCount: '1', + onClose: function() { + var uploadFileArray = top.dialog.dialogData.uploadFileArray; + if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) { + var files = $('#'+ name).val(); + for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) { + if(files.length > 0) { + files += ','; + } + files += file.data; + } + initFileList(name, files, function(fileName) { + }); + } + } + }); + }); + + form.on('button(planPDFRemoveFile)', function(obj) { + var name = this.dataset.name; + var id = this.dataset.id; + var files = $('#'+ name).val().replace(id, ''); + files = files.replace(/\,+/g, ','); + if(files.charAt(0) == ',') { + files = files.substring(1); + } + if(files.charAt(files.length - 1) == ',') { + files = files.substring(0, files.length - 1); + } + initFileList(name, files, function(fileName) { + }); + }); + } + function reloadLessonsList(){ if(typeof (classPlanLessons) != 'undefined' && classPlanLessons.length > 0) $.each(classPlanLessons,function(i,e){ @@ -281,6 +436,41 @@ parent.layer.close(parent.layer.getFrameIndex(window.name)); } + function refreshDownloadTemplet(fileName, file) { + var dataRander = {}; + dataRander[fileName] = file; + + laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) { + document.getElementById(fileName +'FileBox').innerHTML = html; + }); + } + + // 初始化文件列表 + function initFileList(fileName, ids, callback) { + var dataForm = {}; + dataForm[fileName] = ids; + form.val('dataForm', dataForm); + + if(!ids) { + refreshDownloadTemplet(fileName, []); + if(callback) { + callback(fileName, []); + } + return; + } + + top.restAjax.get(top.restAjax.path('api/file/list', []), { + ids: ids + }, null, function(code, data) { + refreshDownloadTemplet(fileName, data); + if(callback) { + callback(fileName, data); + } + }, function(code, data) { + top.dialog.msg(data.msg); + }); + } + $('.close').on('click', function() { closeBox(); }); diff --git a/src/main/resources/static/route/classplan/update.html b/src/main/resources/static/route/classplan/update.html index 451673b..8f69a97 100644 --- a/src/main/resources/static/route/classplan/update.html +++ b/src/main/resources/static/route/classplan/update.html @@ -107,6 +107,70 @@ +
+
+
+ +
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+ +
+
+
+
@@ -203,6 +267,7 @@ var classPlanLessons = []; var classPlanId = top.restAjax.params(window.location.href).classPlanId; var orgId = ''; + var planImagesViewerObj = {}; // 初始化内容 function initData() { @@ -231,6 +296,8 @@ initTeacherList(data.orgId); classPlanLessons = data.classPlanLessons; orgId = data.orgId + initPlanImagesUploadFile(); + initPlanPDFUploadFile(); }, function(code, data) { top.dialog.msg(data.msg); }, function() { @@ -310,6 +377,145 @@ }); } + // 初始化图片上传 + function initPlanImagesUploadFile() { + var files = $('#planImages').val(); + initFileList('planImages', files, function(fileName) { + var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false}); + planImagesViewerObj[fileName] = viewer; + }); + + form.on('button(planImagesUploadFile)', function(obj) { + var name = this.dataset.name; + var explain = this.dataset.explain; + top.dialog.file({ + type: 'image', + title: '上传'+ explain, + width: '400px', + height: '420px', + maxFileCount: '1', + onClose: function() { + var uploadFileArray = top.dialog.dialogData.uploadFileArray; + if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) { + var files = $('#'+ name).val(); + for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) { + if(files.length > 0) { + files += ','; + } + files += file.data; + } + initFileList(name, files, function(fileName) { + planImagesViewerObj[fileName].update(); + }); + } + } + }); + }); + + form.on('button(planImagesRemoveFile)', function(obj) { + var name = this.dataset.name; + var id = this.dataset.id; + var files = $('#'+ name).val().replace(id, ''); + files = files.replace(/\,+/g, ','); + if(files.charAt(0) == ',') { + files = files.substring(1); + } + if(files.charAt(files.length - 1) == ',') { + files = files.substring(0, files.length - 1); + } + initFileList(name, files, function(fileName) { + planImagesViewerObj[fileName].update(); + }); + }); + } + + // 初始化PDF上传 + function initPlanPDFUploadFile() { + var files = $('#planPDF').val(); + initFileList('planPDF', files, function(fileName) { + $(document).on('click', '.pdf-open-show', function(obj){ + var fileId = this.dataset.id; + window.open('route/file/download/true/' + fileId); + }) + }); + + form.on('button(planPDFUploadFile)', function(obj) { + var name = this.dataset.name; + var explain = this.dataset.explain; + top.dialog.file({ + type: 'file', + title: '上传'+ explain, + width: '400px', + height: '420px', + maxFileCount: '1', + onClose: function() { + var uploadFileArray = top.dialog.dialogData.uploadFileArray; + if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) { + var files = $('#'+ name).val(); + for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) { + if(files.length > 0) { + files += ','; + } + files += file.data; + } + initFileList(name, files, function(fileName) { + }); + } + } + }); + }); + + form.on('button(planPDFRemoveFile)', function(obj) { + var name = this.dataset.name; + var id = this.dataset.id; + var files = $('#'+ name).val().replace(id, ''); + files = files.replace(/\,+/g, ','); + if(files.charAt(0) == ',') { + files = files.substring(1); + } + if(files.charAt(files.length - 1) == ',') { + files = files.substring(0, files.length - 1); + } + initFileList(name, files, function(fileName) { + }); + }); + } + + function refreshDownloadTemplet(fileName, file) { + var dataRander = {}; + dataRander[fileName] = file; + + laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) { + document.getElementById(fileName +'FileBox').innerHTML = html; + }); + } + + // 初始化文件列表 + function initFileList(fileName, ids, callback) { + var dataForm = {}; + dataForm[fileName] = ids; + form.val('dataForm', dataForm); + + if(!ids) { + refreshDownloadTemplet(fileName, []); + if(callback) { + callback(fileName, []); + } + return; + } + + top.restAjax.get(top.restAjax.path('api/file/list', []), { + ids: ids + }, null, function(code, data) { + refreshDownloadTemplet(fileName, data); + if(callback) { + callback(fileName, data); + } + }, function(code, data) { + top.dialog.msg(data.msg); + }); + } + form.on('checkbox(lessonCheckBox)',function(data){ var lessonId = $(data.elem).attr('data-lesson-id'); var teacherId = $('#select-' + lessonId).val(); @@ -480,18 +686,8 @@ top.dialog.close(index); var loadLayerIndex; top.restAjax.put(top.restAjax.path('api/classplan/update/{classPlanId}', [classPlanId]), formData.field, null, function(code, data) { - var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { - time: 0, - btn: [top.dataMessage.button.yes, top.dataMessage.button.no], - shade: 0.3, - yes: function(index) { - top.dialog.close(index); - closeBox(); - }, - btn2: function() { - closeBox(); - } - }); + top.dialog.close(index); + closeBox(); }, function(code, data) { top.dialog.msg(data.msg); }, function() { diff --git a/src/main/resources/static/route/teacher/save.html b/src/main/resources/static/route/teacher/save.html index ee06327..8b8770a 100644 --- a/src/main/resources/static/route/teacher/save.html +++ b/src/main/resources/static/route/teacher/save.html @@ -211,7 +211,7 @@ layer.open({ type: 2, title: '选择授课工种', - closeBtn: 0, + closeBtn: 1, area: ['400px', '500px'], shadeClose: false, anim: 2, diff --git a/src/main/resources/static/route/teacher/update.html b/src/main/resources/static/route/teacher/update.html index c5590c7..d9d9f0e 100644 --- a/src/main/resources/static/route/teacher/update.html +++ b/src/main/resources/static/route/teacher/update.html @@ -243,7 +243,7 @@ layer.open({ type: 2, title: '选择授课工种', - closeBtn: 0, + closeBtn: 1, area: ['400px', '500px'], shadeClose: false, anim: 2,