ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ruoyi-exam/src/main/resources/mapper/exam/ExamPracticeMapper.xml
This commit is contained in:
flower 2019-01-10 01:32:41 +08:00
parent 55f1cc845d 090877c845
commit a9b920e8bd
9 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-exam/src/main/resources/mapper/exam/ExamPracticeMapper.xml
View File

@ -48,8 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectExamPracticeVo"/>
from exam_practice
<where>
<![CDATA[((enable_control_time = '1' and end_time > now() and start_time < now())
or enable_control_time = '0')]]>
<![CDATA[((enable_control_time = '1' and end_time > NOW() and start_time < NOW())
or enable_control_time = '0') ]]>
<if test="id != null "> and id = #{id}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="name != null and name != '' "> and name = #{name}</if>

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/FileUploadUtils.java
View File

@ -18,7 +18,7 @@ public class FileUploadUtils {
/**
* 默认大小 50M
*/
public static final long DEFAULT_MAX_SIZE = 52428800;
public static final long DEFAULT_MAX_SIZE = 524288000;
/**
* 默认上传的地址

25
ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java
View File

@ -1,13 +1,7 @@
package com.ruoyi.train.course.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.base.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ExcelUtil;
import com.ruoyi.framework.jwt.JwtUtil;
import com.ruoyi.framework.web.base.BaseController;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.train.course.domain.TrainCourse;
import com.ruoyi.train.course.domain.TrainCourseCategory;
import com.ruoyi.train.course.domain.TrainCourseSection;
@ -42,7 +36,6 @@ public class ApiTrainCourseController extends BaseController {
* 查询课程列表
*/
@GetMapping("/trainCourse/list")
@ResponseBody
public AjaxResult list(TrainCourse trainCourse) {
List<TrainCourse> list = trainCourseService.selectTrainCoursePage( trainCourse );
AjaxResult success = success( "查询成功" );
@ -56,16 +49,17 @@ public class ApiTrainCourseController extends BaseController {
@GetMapping("/trainCourse/{id}")
public AjaxResult get(@PathVariable("id") Integer id) {
TrainCourse trainCourse = trainCourseService.selectById( id );
TrainCourseCategory courseCategory = trainCourseCategoryService.selectCategoryById( (long) trainCourse.getTrainCourseCategoryId() );
// TrainCourseCategory courseCategory = trainCourseCategoryService.selectById( trainCourse.getTrainCourseCategoryId() );
JSONObject jsonObject = JSONObject.fromObject( trainCourse );
jsonObject.put( "courseCategory", courseCategory );
// JSONObject courseCategoryJSON = JSONObject.fromObject( courseCategory );
// jsonObject.put( "courseCategory", courseCategory );
AjaxResult success = success( "查询成功" );
success.put( "data", jsonObject );
return success;
}
/**
* 查询课程章节详情
* 查询课程章节列表详情
*/
@GetMapping("/trainCourse/{id}/section")
public AjaxResult trainCourseSection(@PathVariable("id") Integer id) {
@ -73,6 +67,17 @@ public class ApiTrainCourseController extends BaseController {
trainCourseSection.setTrainCourseId( id );
List<TrainCourseSection> trainCourseSections = trainCourseSectionService.selectTrainCourseSectionList( trainCourseSection );
AjaxResult success = success( "查询成功" );
success.put( "data", trainCourseSections );
return success;
}
/**
* 查询课程章节列表详情
*/
@GetMapping("/trainCourse/section/{id}")
public AjaxResult trainCourseSectionInfo(@PathVariable("id") Integer id) {
TrainCourseSection trainCourseSections = trainCourseSectionService.selectById( id );
AjaxResult success = success( "查询成功" );
success.put( "data", trainCourseSections );
return success;

3
ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseCategoryController.java
View File

@ -71,9 +71,6 @@ public class TrainCourseCategoryController extends BaseController {
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap) {
TrainCourseCategory category = trainCourseCategoryService.selectCategoryById( id );
if (StringUtils.isNotNull( category ) && 100L == id) {
category.setParentName( "无" );
}
mmap.put( "category", category );
return prefix + "/edit";
}

75
ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseSectionController.java
View File

@ -2,17 +2,15 @@ package com.ruoyi.train.course.controller;
import java.util.List;
import com.ruoyi.train.course.domain.TrainCourse;
import com.ruoyi.train.course.domain.TrainCourseSection;
import com.ruoyi.train.course.service.ITrainCourseSectionService;
import com.ruoyi.train.course.service.ITrainCourseService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.base.BaseController;
@ -22,7 +20,7 @@ import com.ruoyi.common.utils.ExcelUtil;
/**
* 课程章节 信息操作处理
*
*
* @author zhujj
* @date 2018-12-23
*/
@ -30,19 +28,21 @@ import com.ruoyi.common.utils.ExcelUtil;
@RequestMapping("/train/trainCourseSection")
public class TrainCourseSectionController extends BaseController
{
private String prefix = "train/course/trainCourseSection";
private String prefix = "train/course/trainCourseSection";
@Autowired
private ITrainCourseSectionService trainCourseSectionService;
@Autowired
private ITrainCourseService trainCourseService;
@RequiresPermissions("train:trainCourseSection:view")
@GetMapping()
public String trainCourseSection(String trainCourseId, ModelMap mmap)
{
mmap.put("courseId", trainCourseId);
return prefix + "/trainCourseSection";
mmap.put("trainCourseId", trainCourseId);
return prefix + "/trainCourseSection";
}
/**
* 查询课程章节列表
*/
@ -51,33 +51,35 @@ public class TrainCourseSectionController extends BaseController
@ResponseBody
public TableDataInfo list(TrainCourseSection trainCourseSection)
{
List<TrainCourseSection> list = trainCourseSectionService.selectTrainCourseSectionPage(trainCourseSection);
List<TrainCourseSection> list = trainCourseSectionService.selectTrainCourseSectionPage(trainCourseSection);
return getDataTable(list);
}
/**
* 导出课程章节列表
*/
@RequiresPermissions("train:trainCourseSection:export")
@PostMapping("/export")
@ResponseBody
public AjaxResult export(TrainCourseSection trainCourseSection)
{
List<TrainCourseSection> list = trainCourseSectionService.selectTrainCourseSectionList(trainCourseSection);
ExcelUtil<TrainCourseSection> util = new ExcelUtil<TrainCourseSection>(TrainCourseSection.class);
return util.exportExcel(list, "trainCourseSection");
}
@PostMapping("/export")
@ResponseBody
public AjaxResult export(TrainCourseSection trainCourseSection)
{
List<TrainCourseSection> list = trainCourseSectionService.selectTrainCourseSectionList(trainCourseSection);
ExcelUtil<TrainCourseSection> util = new ExcelUtil<TrainCourseSection>(TrainCourseSection.class);
return util.exportExcel(list, "trainCourseSection");
}
/**
* 新增课程章节
*/
@GetMapping("/add")
public String add()
@GetMapping("/add/{id}")
public String add(@PathVariable("id") Integer id, ModelMap mmap)
{
return prefix + "/add";
TrainCourse trainCourse = trainCourseService.selectById( id );
mmap.put( "trainCourse", trainCourse );
return prefix + "/add";
}
/**
* 新增保存课程章节
*/
@ -86,7 +88,7 @@ public class TrainCourseSectionController extends BaseController
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(TrainCourseSection trainCourseSection)
{
{
return toAjax(trainCourseSectionService.insertSelective(trainCourseSection));
}
@ -97,10 +99,13 @@ public class TrainCourseSectionController extends BaseController
public String edit(@PathVariable("id") Integer id, ModelMap mmap)
{
TrainCourseSection trainCourseSection = trainCourseSectionService.selectById(id);
TrainCourse trainCourse = trainCourseService.selectById( trainCourseSection.getTrainCourseId() );
mmap.put( "trainCourse", trainCourse );
mmap.put("trainCourseSection", trainCourseSection);
return prefix + "/edit";
return prefix + "/edit";
}
/**
* 修改保存课程章节
*/
@ -109,10 +114,10 @@ public class TrainCourseSectionController extends BaseController
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(TrainCourseSection trainCourseSection)
{
{
return toAjax(trainCourseSectionService.updateById(trainCourseSection));
}
/**
* 删除课程章节
*/
@ -121,8 +126,8 @@ public class TrainCourseSectionController extends BaseController
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
{
return toAjax(trainCourseSectionService.deleteByIds(ids));
}
}

3
ruoyi-train/src/main/java/com/ruoyi/train/course/domain/TrainCourse.java
View File

@ -1,4 +1,5 @@
package com.ruoyi.train.course.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.base.BaseEntity;
@ -58,6 +59,7 @@ public class TrainCourse {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 更新者
@ -66,6 +68,7 @@ public class TrainCourse {
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 备注

5
ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html
View File

@ -9,7 +9,8 @@
<div class="form-group">
<label class="col-sm-3 control-label">课程ID：</label>
<div class="col-sm-8">
<input id="trainCourseId" name="trainCourseId" class="form-control" type="text">
<input id="trainCourseId" name="trainCourseId" th:value="${trainCourse.id}" class="form-control" type="hidden">
<input th:value="${trainCourse.name}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -23,7 +24,7 @@
<div class="col-sm-8">
<input id="courseware" name="courseware" class="form-control" type="hidden">
<div class="layui-upload">
<button type="button" class="layui-btn layui-btn-normal" id="testList">选择多文件</button>
<button type="button" class="layui-btn layui-btn-normal" id="testList">选择文件</button>
<div class="layui-upload-list">
<table class="layui-table">
<thead>

4
ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html
View File

@ -7,10 +7,12 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-trainCourseSection-edit" th:object="${trainCourseSection}">
<input id="id" name="id" th:field="*{id}" type="hidden">
<input id="trainCourseId" name="trainCourseId" th:value="${trainCourse.id}" class="form-control" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">课程ID：</label>
<div class="col-sm-8">
<input id="trainCourseId" name="trainCourseId" th:field="*{trainCourseId}" class="form-control" type="text">
<input th:value="${trainCourse.name}" class="form-control" type="text">
</div>
</div>
<div class="form-group">

7
ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html
View File

@ -6,6 +6,7 @@
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<input type="hidden" id="trainCourseId" name="trainCourseId" th:value="${trainCourseId}"/>
<div class="select-list">
<ul>
<li>
@ -21,7 +22,7 @@
</div>
<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="train:trainCourseSection:add">
<a class="btn btn-success" onclick="toAdd()" shiro:hasPermission="train:trainCourseSection:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="train:trainCourseSection:edit">
@ -100,6 +101,10 @@
};
$.table.init(options);
});
function toAdd() {
var url =prefix + "/add/"+$("#trainCourseId").val();
$.operate.jumpModeltoUrl("课程章节添加",url,1000,600);
}
</script>
</body>
</html>