From fe206697142127373257d12e68a93aab6fbd63f7 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 3 Nov 2022 00:02:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=A2=E6=A0=A1=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/core/web/query/PageParam.java | 6 ++-- .../jlw/entity/UniversitiesColleges.java | 7 ++-- ...ollegesJurisdictionExperimentalSystem.java | 16 ++++++---- .../com/ibeetl/jlw/web/TeacherController.java | 4 +-- .../web/UniversitiesCollegesController.java | 18 +++++------ ...isdictionExperimentalSystemController.java | 32 +++++++++++++++++++ .../js/jlw/universitiesColleges/index.js | 12 ++++--- .../universitiesCollegesApi.js | 4 +++ .../index.js | 9 ++++-- ...llegesJurisdictionExperimentalSystemApi.js | 26 ++++++++------- .../jlw/universitiesColleges/index.html | 2 +- 11 files changed, 95 insertions(+), 41 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java b/admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java index a8bf9f6c..58524ae8 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java @@ -12,7 +12,7 @@ import java.lang.reflect.Field; */ public class PageParam { private Integer page = null; - private Integer limit = 10; + private Long limit = 10L; public Integer getPage() { return page; @@ -53,11 +53,11 @@ public class PageParam { return query; } - public Integer getLimit() { + public Long getLimit() { return limit; } - public void setLimit(Integer limit) { + public void setLimit(Long limit) { this.limit = limit; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java index 9aab28f6..d44d1187 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.entity; +import cn.hutool.core.date.DateTime; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; @@ -10,6 +11,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; +import static cn.hutool.core.date.DateUtil.date; + /* * 院校管理 * gen by Spring Boot2 Admin 2021-06-19 @@ -62,7 +65,7 @@ public class UniversitiesColleges extends BaseEntity{ //添加时间 - private Date addTime ; + private DateTime addTime ; //动态授权码（每1小时更新一次） @@ -228,7 +231,7 @@ public class UniversitiesColleges extends BaseEntity{ *@param addTime */ public void setAddTime(Date addTime){ - this.addTime = addTime; + this.addTime = date(addTime); } /**组织机构ID diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java index 0bc47cb3..f82bbcd9 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java @@ -1,12 +1,16 @@ package com.ibeetl.jlw.entity; +import cn.hutool.core.date.DateTime; import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; import javax.validation.constraints.NotNull; import java.util.Date; +import static cn.hutool.core.date.DateUtil.date; + /* * 院校权限管理 - 实验系统 * gen by Spring Boot2 Admin 2021-07-20 @@ -23,7 +27,7 @@ public class UniversitiesCollegesJurisdictionExperimentalSystem extends BaseEnti //院校ID private Long universitiesCollegesId ; - + //类型(1子应用系统 2实务课程系统 3考证课程类系统) private Integer type ; @@ -33,16 +37,16 @@ public class UniversitiesCollegesJurisdictionExperimentalSystem extends BaseEnti private Long typeId ; //使用级别(0不使用 1购买 2试用) - + @Dict(type="use_type") private Integer useType ; //开始时间 - private Date useStartTime ; + private DateTime useStartTime ; //结束时间 - private Date useEndTime ; + private DateTime useEndTime ; //子系统登录页logo @@ -146,7 +150,7 @@ public class UniversitiesCollegesJurisdictionExperimentalSystem extends BaseEnti *@param useStartTime */ public void setUseStartTime(Date useStartTime){ - this.useStartTime = useStartTime; + this.useStartTime = date(useStartTime); } /**结束时间 @@ -159,7 +163,7 @@ public class UniversitiesCollegesJurisdictionExperimentalSystem extends BaseEnti *@param useEndTime */ public void setUseEndTime(Date useEndTime){ - this.useEndTime = useEndTime; + this.useEndTime = date(useEndTime); } /**子系统登录页logo diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java index c3f9398a..9e9c1d2d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java @@ -359,7 +359,7 @@ public class TeacherController{ } ResourcesCompetitionQuery r = new ResourcesCompetitionQuery(); - r.setLimit(1); + r.setLimit(1L); r.setPage(resourcesCompetitionQuery.getPage()); if(ToolUtils.findInSet(courseInfo.getResourcesCompetitionIds(),resourcesCompetitionQuery.getResourcesCompetitionId()) || null == resourcesCompetitionQuery.getResourcesCompetitionId()){ r.setResourcesCompetitionIds(resourcesCompetitionQuery.getResourcesCompetitionId()+","+courseInfo.getResourcesCompetitionIds().replace(resourcesCompetitionQuery.getResourcesCompetitionId().toString(),"")); @@ -414,7 +414,7 @@ public class TeacherController{ } ResourcesTrainingQuery r = new ResourcesTrainingQuery(); - r.setLimit(1); + r.setLimit(1L); r.setPage(resourcesTrainingQuery.getPage()); if(ToolUtils.findInSet(courseInfo.getResourcesTrainingIds(),resourcesTrainingQuery.getResourcesTrainingId()) || null == resourcesTrainingQuery.getResourcesTrainingId()){ diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java index 2a8fa4a5..d922f79f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java @@ -216,21 +216,19 @@ public class UniversitiesCollegesController{ } else { /** 构建表头 */ Map header = new LinkedHashMap<>(11); - header.put("studentIdText", "学生姓名"); - header.put("studentSn", "学号"); - header.put("teacherOpenCourseIdText", "开课名称"); - header.put("schoolClassIdText", "班级名称"); - header.put("teacherOpenCourseStudentSigninSettingSessionTime", "签到场次"); - header.put("teacherOpenCourseStudentSigninLogTypeText", "签到类型"); - header.put("teacherOpenCourseStudentSigninLogTagText", "签到标签"); - header.put("teacherOpenCourseStudentSigninLogAddTime", "签到时间"); - header.put("teacherOpenCourseStudentSigninLogRemark", "备注"); + header.put("universitiesCollegesName", "院校名称"); + header.put("universitiesCollegesProvince", "所属省份"); + header.put("universitiesCollegesCity", "所属城市"); + header.put("universitiesCollegesContacts", "院校联系人"); + header.put("universitiesCollegesContactsMobile", "联系人电话"); + header.put("universitiesCollegesContactsEmail", "联系人邮箱"); + header.put("addTime", "添加时间"); List datas = universitiesCollegesService.getValues(param); List> maps = BaseEntity2MapWithParallel(datas); - String filename = StrUtil.format("签到日志导出-{}.xlsx", DateUtil.formatDate(DateUtil.date())); + String filename = StrUtil.format("院校导出-{}.xlsx", DateUtil.formatDate(DateUtil.date())); write(resp, filename,"Sheet1", header.values(), convertData(header.keySet(), maps)); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java index 16dd6641..6fd9a151 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java @@ -1,13 +1,18 @@ 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.util.PlatformException; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem; import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService; import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionExperimentalSystemService; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionExperimentalSystemQuery; +import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery; +import lombok.SneakyThrows; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.beetl.sql.core.engine.PageQuery; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -164,4 +170,30 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemController{ return JsonResult.success(); } + @SneakyThrows + @PostMapping(MODEL + "/export.json") + @ResponseBody + public void export(UniversitiesCollegesQuery param, @SCoreUser CoreUser coreUser, HttpServletResponse resp) { + if(null == coreUser){ + throw new PlatformException("请登录后再操作"); + } else { +// /** 构建表头 */ +// Map header = new LinkedHashMap<>(11); +// header.put("universitiesCollegesName", "院校名称"); +// header.put("universitiesCollegesProvince", "所属省份"); +// header.put("universitiesCollegesCity", "所属城市"); +// header.put("universitiesCollegesContacts", "院校联系人"); +// header.put("universitiesCollegesContactsMobile", "联系人电话"); +// header.put("universitiesCollegesContactsEmail", "联系人邮箱"); +// header.put("addTime", "添加时间"); +// +// List datas = universitiesCollegesJurisdictionExperimentalSystemService.getValues(param); +// +// List> maps = BaseEntity2MapWithParallel(datas); +// +// String filename = StrUtil.format("院校权限导出-{}.xlsx", DateUtil.formatDate(DateUtil.date())); +// write(resp, filename,"Sheet1", header.values(), convertData(header.keySet(), maps)); + } + } + } diff --git a/web/src/main/resources/static/js/jlw/universitiesColleges/index.js b/web/src/main/resources/static/js/jlw/universitiesColleges/index.js index bc86d414..4d2a5a1b 100644 --- a/web/src/main/resources/static/js/jlw/universitiesColleges/index.js +++ b/web/src/main/resources/static/js/jlw/universitiesColleges/index.js @@ -102,10 +102,14 @@ layui.define(['form', 'laydate', 'table'], function (exports) { search: function () { Lib.doSearchForm($("#searchForm"), universitiesCollegesTable, 1); }, - export: function () { - // TODO 继续 - window.open(Common.ctxPath + "/jlw/universitiesColleges/export.json?resourcesInfoId="+data.resourcesInfoId); - } + exportDocument: function () { + layui.use([ 'universitiesCollegesApi' ], function() { + var universitiesCollegesApi = layui.universitiesCollegesApi + Common.openConfirm("确认要导出这些数据?", function() { + universitiesCollegesApi.exportExcel($("#searchForm")) + }) + }); + }, }; $('.ext-toolbar').on('click', function () { var type = $(this).data('type'); diff --git a/web/src/main/resources/static/js/jlw/universitiesColleges/universitiesCollegesApi.js b/web/src/main/resources/static/js/jlw/universitiesColleges/universitiesCollegesApi.js index 97bb8c94..ceebdc67 100644 --- a/web/src/main/resources/static/js/jlw/universitiesColleges/universitiesCollegesApi.js +++ b/web/src/main/resources/static/js/jlw/universitiesColleges/universitiesCollegesApi.js @@ -11,6 +11,10 @@ layui.define([], function(exports) { Common.post("/jlw/universitiesColleges/delete.json",{"ids":ids},function(){ callback(); }) + }, + exportExcel:function(form, callback){ + var formPara = form.serializeJson(); + Common.downLoad("/jlw/universitiesColleges/export.json", formPara, 'POST') } }; diff --git a/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.js b/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.js index 6f5063f4..543b0ae8 100644 --- a/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.js +++ b/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.js @@ -97,8 +97,13 @@ layui.define(['form', 'laydate', 'table'], function (exports) { search: function () { Lib.doSearchForm($("#searchForm"), universitiesCollegesJurisdictionExperimentalSystemTable, 1); }, - export: function () { - + exportDocument: function () { + layui.use([ 'universitiesCollegesJurisdictionExperimentalSystemApi' ], function() { + var universitiesCollegesJurisdictionExperimentalSystemApi = layui.universitiesCollegesJurisdictionExperimentalSystemApi + Common.openConfirm("确认要导出这些数据?", function() { + universitiesCollegesJurisdictionExperimentalSystemApi.exportExcel($("#searchForm")) + }) + }); }, clipboard: function () { console.log(this) diff --git a/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/universitiesCollegesJurisdictionExperimentalSystemApi.js b/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/universitiesCollegesJurisdictionExperimentalSystemApi.js index 3ad17e4c..9483dcd6 100644 --- a/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/universitiesCollegesJurisdictionExperimentalSystemApi.js +++ b/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/universitiesCollegesJurisdictionExperimentalSystemApi.js @@ -1,17 +1,21 @@ /*访问后台的代码*/ layui.define([], function(exports) { var api={ - updateUniversitiesCollegesJurisdictionExperimentalSystem:function(form,callback){ - Lib.submitForm("/jlw/universitiesCollegesJurisdictionExperimentalSystem/edit.json",form,{},callback) - }, - addUniversitiesCollegesJurisdictionExperimentalSystem:function(form,callback){ - Lib.submitForm("/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.json",form,{},callback) - }, - del:function(ids,callback){ - Common.post("/jlw/universitiesCollegesJurisdictionExperimentalSystem/delete.json",{"ids":ids},function(){ - callback(); - }) - } + updateUniversitiesCollegesJurisdictionExperimentalSystem:function(form,callback){ + Lib.submitForm("/jlw/universitiesCollegesJurisdictionExperimentalSystem/edit.json",form,{},callback) + }, + addUniversitiesCollegesJurisdictionExperimentalSystem:function(form,callback){ + Lib.submitForm("/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.json",form,{},callback) + }, + del:function(ids,callback){ + Common.post("/jlw/universitiesCollegesJurisdictionExperimentalSystem/delete.json",{"ids":ids},function(){ + callback(); + }) + }, + exportExcel:function(form, callback){ + var formPara = form.serializeJson(); + Common.downLoad("/jlw/universitiesCollegesJurisdictionExperimentalSystem/export.json", formPara, 'POST') + } }; exports('universitiesCollegesJurisdictionExperimentalSystemApi',api); diff --git a/web/src/main/resources/templates/jlw/universitiesColleges/index.html b/web/src/main/resources/templates/jlw/universitiesColleges/index.html index cf71a9ac..d1583703 100644 --- a/web/src/main/resources/templates/jlw/universitiesColleges/index.html +++ b/web/src/main/resources/templates/jlw/universitiesColleges/index.html @@ -15,7 +15,7 @@
新增 - 导出 刷新