通用优化

This commit is contained in:
zhujunjieit 2018-12-07 22:54:20 +08:00
parent 95073743b4
commit 0e4943de0e
26 changed files with 291 additions and 805 deletions

View File

@ -127,7 +127,7 @@ gen:
# 作者 # 作者
author: zhujj author: zhujj
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
packageName: com.ruoyi.test packageName: com.ruoyi.exam
# 自动去除表前缀默认是true # 自动去除表前缀默认是true
autoRemovePre: false autoRemovePre: false
# 表前缀(类名不会包含表前缀) # 表前缀(类名不会包含表前缀)

View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.exam; package com.ruoyi.exam.controller;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -23,7 +23,7 @@ import com.ruoyi.common.utils.ExcelUtil;
* 试题分类 信息操作处理 * 试题分类 信息操作处理
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
@Controller @Controller
@RequestMapping("/exam/examQuestionCategory") @RequestMapping("/exam/examQuestionCategory")
@ -49,8 +49,7 @@ public class ExamQuestionCategoryController extends BaseController
@ResponseBody @ResponseBody
public TableDataInfo list(ExamQuestionCategory examQuestionCategory) public TableDataInfo list(ExamQuestionCategory examQuestionCategory)
{ {
List<ExamQuestionCategory> list = examQuestionCategoryService.selectExamQuestionCategoryPage(examQuestionCategory);
List<ExamQuestionCategory> list = examQuestionCategoryService.selectExamQuestionCategoryList(examQuestionCategory);
return getDataTable(list); return getDataTable(list);
} }
@ -95,7 +94,7 @@ public class ExamQuestionCategoryController extends BaseController
@GetMapping("/edit/{id}") @GetMapping("/edit/{id}")
public String edit(@PathVariable("id") String id, ModelMap mmap) public String edit(@PathVariable("id") String id, ModelMap mmap)
{ {
ExamQuestionCategory examQuestionCategory = examQuestionCategoryService.selectExamQuestionCategoryById(id); ExamQuestionCategory examQuestionCategory = examQuestionCategoryService.selectById(id);
mmap.put("examQuestionCategory", examQuestionCategory); mmap.put("examQuestionCategory", examQuestionCategory);
return prefix + "/edit"; return prefix + "/edit";
} }
@ -109,7 +108,7 @@ public class ExamQuestionCategoryController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult editSave(ExamQuestionCategory examQuestionCategory) public AjaxResult editSave(ExamQuestionCategory examQuestionCategory)
{ {
return toAjax(examQuestionCategoryService.updateExamQuestionCategory(examQuestionCategory)); return toAjax(examQuestionCategoryService.updateById(examQuestionCategory));
} }
/** /**

View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.exam; package com.ruoyi.exam.controller;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -23,7 +23,7 @@ import com.ruoyi.common.utils.ExcelUtil;
* 问题点评 信息操作处理 * 问题点评 信息操作处理
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
@Controller @Controller
@RequestMapping("/exam/examQuestionComment") @RequestMapping("/exam/examQuestionComment")
@ -49,7 +49,7 @@ public class ExamQuestionCommentController extends BaseController
@ResponseBody @ResponseBody
public TableDataInfo list(ExamQuestionComment examQuestionComment) public TableDataInfo list(ExamQuestionComment examQuestionComment)
{ {
List<ExamQuestionComment> list = examQuestionCommentService.selectExamQuestionCommentList(examQuestionComment); List<ExamQuestionComment> list = examQuestionCommentService.selectExamQuestionCommentPage(examQuestionComment);
return getDataTable(list); return getDataTable(list);
} }
@ -85,7 +85,7 @@ public class ExamQuestionCommentController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult addSave(ExamQuestionComment examQuestionComment) public AjaxResult addSave(ExamQuestionComment examQuestionComment)
{ {
return toAjax(examQuestionCommentService.insertExamQuestionComment(examQuestionComment)); return toAjax(examQuestionCommentService.insert(examQuestionComment));
} }
/** /**
@ -94,7 +94,7 @@ public class ExamQuestionCommentController extends BaseController
@GetMapping("/edit/{id}") @GetMapping("/edit/{id}")
public String edit(@PathVariable("id") String id, ModelMap mmap) public String edit(@PathVariable("id") String id, ModelMap mmap)
{ {
ExamQuestionComment examQuestionComment = examQuestionCommentService.selectExamQuestionCommentById(id); ExamQuestionComment examQuestionComment = examQuestionCommentService.selectById(id);
mmap.put("examQuestionComment", examQuestionComment); mmap.put("examQuestionComment", examQuestionComment);
return prefix + "/edit"; return prefix + "/edit";
} }
@ -108,7 +108,7 @@ public class ExamQuestionCommentController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult editSave(ExamQuestionComment examQuestionComment) public AjaxResult editSave(ExamQuestionComment examQuestionComment)
{ {
return toAjax(examQuestionCommentService.updateExamQuestionComment(examQuestionComment)); return toAjax(examQuestionCommentService.updateById(examQuestionComment));
} }
/** /**
@ -120,7 +120,7 @@ public class ExamQuestionCommentController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult remove(String ids) public AjaxResult remove(String ids)
{ {
return toAjax(examQuestionCommentService.deleteExamQuestionCommentByIds(ids)); return toAjax(examQuestionCommentService.deleteByIds(ids));
} }
} }

View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.exam; package com.ruoyi.exam.controller;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -23,7 +23,7 @@ import com.ruoyi.common.utils.ExcelUtil;
* 问题 信息操作处理 * 问题 信息操作处理
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
@Controller @Controller
@RequestMapping("/exam/examQuestion") @RequestMapping("/exam/examQuestion")
@ -49,7 +49,7 @@ public class ExamQuestionController extends BaseController
@ResponseBody @ResponseBody
public TableDataInfo list(ExamQuestion examQuestion) public TableDataInfo list(ExamQuestion examQuestion)
{ {
List<ExamQuestion> list = examQuestionService.selectExamQuestionList(examQuestion); List<ExamQuestion> list = examQuestionService.selectExamQuestionPage(examQuestion);
return getDataTable(list); return getDataTable(list);
} }
@ -85,7 +85,7 @@ public class ExamQuestionController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult addSave(ExamQuestion examQuestion) public AjaxResult addSave(ExamQuestion examQuestion)
{ {
return toAjax(examQuestionService.insertExamQuestion(examQuestion)); return toAjax(examQuestionService.insert(examQuestion));
} }
/** /**
@ -94,7 +94,7 @@ public class ExamQuestionController extends BaseController
@GetMapping("/edit/{id}") @GetMapping("/edit/{id}")
public String edit(@PathVariable("id") String id, ModelMap mmap) public String edit(@PathVariable("id") String id, ModelMap mmap)
{ {
ExamQuestion examQuestion = examQuestionService.selectExamQuestionById(id); ExamQuestion examQuestion = examQuestionService.selectById(id);
mmap.put("examQuestion", examQuestion); mmap.put("examQuestion", examQuestion);
return prefix + "/edit"; return prefix + "/edit";
} }
@ -108,7 +108,7 @@ public class ExamQuestionController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult editSave(ExamQuestion examQuestion) public AjaxResult editSave(ExamQuestion examQuestion)
{ {
return toAjax(examQuestionService.updateExamQuestion(examQuestion)); return toAjax(examQuestionService.updateById(examQuestion));
} }
/** /**
@ -120,7 +120,7 @@ public class ExamQuestionController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult remove(String ids) public AjaxResult remove(String ids)
{ {
return toAjax(examQuestionService.deleteExamQuestionByIds(ids)); return toAjax(examQuestionService.deleteByIds(ids));
} }
} }

View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.exam; package com.ruoyi.exam.controller;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -23,7 +23,7 @@ import com.ruoyi.common.utils.ExcelUtil;
* 问题选项 信息操作处理 * 问题选项 信息操作处理
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
@Controller @Controller
@RequestMapping("/exam/examQuestionItem") @RequestMapping("/exam/examQuestionItem")
@ -49,7 +49,7 @@ public class ExamQuestionItemController extends BaseController
@ResponseBody @ResponseBody
public TableDataInfo list(ExamQuestionItem examQuestionItem) public TableDataInfo list(ExamQuestionItem examQuestionItem)
{ {
List<ExamQuestionItem> list = examQuestionItemService.selectExamQuestionItemList(examQuestionItem); List<ExamQuestionItem> list = examQuestionItemService.selectExamQuestionItemPage(examQuestionItem);
return getDataTable(list); return getDataTable(list);
} }
@ -85,7 +85,7 @@ public class ExamQuestionItemController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult addSave(ExamQuestionItem examQuestionItem) public AjaxResult addSave(ExamQuestionItem examQuestionItem)
{ {
return toAjax(examQuestionItemService.insertExamQuestionItem(examQuestionItem)); return toAjax(examQuestionItemService.insert(examQuestionItem));
} }
/** /**
@ -94,7 +94,7 @@ public class ExamQuestionItemController extends BaseController
@GetMapping("/edit/{id}") @GetMapping("/edit/{id}")
public String edit(@PathVariable("id") String id, ModelMap mmap) public String edit(@PathVariable("id") String id, ModelMap mmap)
{ {
ExamQuestionItem examQuestionItem = examQuestionItemService.selectExamQuestionItemById(id); ExamQuestionItem examQuestionItem = examQuestionItemService.selectById(id);
mmap.put("examQuestionItem", examQuestionItem); mmap.put("examQuestionItem", examQuestionItem);
return prefix + "/edit"; return prefix + "/edit";
} }
@ -108,7 +108,7 @@ public class ExamQuestionItemController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult editSave(ExamQuestionItem examQuestionItem) public AjaxResult editSave(ExamQuestionItem examQuestionItem)
{ {
return toAjax(examQuestionItemService.updateExamQuestionItem(examQuestionItem)); return toAjax(examQuestionItemService.updateById(examQuestionItem));
} }
/** /**
@ -120,7 +120,7 @@ public class ExamQuestionItemController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult remove(String ids) public AjaxResult remove(String ids)
{ {
return toAjax(examQuestionItemService.deleteExamQuestionItemByIds(ids)); return toAjax(examQuestionItemService.deleteByIds(ids));
} }
} }

View File

@ -2,7 +2,7 @@ package com.ruoyi.exam.domain;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.base.BaseEntity;
import javax.persistence.Id; import javax.persistence.Id;
import java.util.Date; import java.util.Date;
@ -10,7 +10,7 @@ import java.util.Date;
* 问题表 exam_question * 问题表 exam_question
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public class ExamQuestion public class ExamQuestion
{ {
@ -20,132 +20,167 @@ public class ExamQuestion
@Id @Id
private String id; private String id;
/** 问题标题 */ /** 问题标题 */
private String title; private String title;
/** 问题答案 */ /** 问题答案 */
private String answer; private String answer;
/** 问题类型 */ /** 问题类型 */
private String type; private String type;
/** 标签 */ /** 标签 */
private String label; private String label;
/** 类别 */ /** 类别 */
private String categoryId; private String categoryId;
/** 创建者 */ /** 创建者 */
private String createBy; private String createBy;
/** 创建时间 */ /** 创建时间 */
private Date createDate; private Date createDate;
/** 更新者 */ /** 更新者 */
private String updateBy; private String updateBy;
/** 更新时间 */ /** 更新时间 */
private Date updateDate; private Date updateDate;
/** 备注信息 */ /** 备注信息 */
private String remarks; private String remarks;
/** 删除标记 */ /** 删除标记 */
private String delFlag; private String delFlag;
/** 设置 */
public void setId(String id) public void setId(String id)
{ {
this.id = id; this.id = id;
} }
/** 获取 */
public String getId() public String getId()
{ {
return id; return id;
} }
/** 设置问题标题 */
public void setTitle(String title) public void setTitle(String title)
{ {
this.title = title; this.title = title;
} }
/** 获取问题标题 */
public String getTitle() public String getTitle()
{ {
return title; return title;
} }
/** 设置问题答案 */
public void setAnswer(String answer) public void setAnswer(String answer)
{ {
this.answer = answer; this.answer = answer;
} }
/** 获取问题答案 */
public String getAnswer() public String getAnswer()
{ {
return answer; return answer;
} }
/** 设置问题类型 */
public void setType(String type) public void setType(String type)
{ {
this.type = type; this.type = type;
} }
/** 获取问题类型 */
public String getType() public String getType()
{ {
return type; return type;
} }
/** 设置标签 */
public void setLabel(String label) public void setLabel(String label)
{ {
this.label = label; this.label = label;
} }
/** 获取标签 */
public String getLabel() public String getLabel()
{ {
return label; return label;
} }
/** 设置类别 */
public void setCategoryId(String categoryId) public void setCategoryId(String categoryId)
{ {
this.categoryId = categoryId; this.categoryId = categoryId;
} }
/** 获取类别 */
public String getCategoryId() public String getCategoryId()
{ {
return categoryId; return categoryId;
} }
/** 设置创建者 */
public void setCreateBy(String createBy) public void setCreateBy(String createBy)
{ {
this.createBy = createBy; this.createBy = createBy;
} }
/** 获取创建者 */
public String getCreateBy() public String getCreateBy()
{ {
return createBy; return createBy;
} }
/** 设置创建时间 */
public void setCreateDate(Date createDate) public void setCreateDate(Date createDate)
{ {
this.createDate = createDate; this.createDate = createDate;
} }
/** 获取创建时间 */
public Date getCreateDate() public Date getCreateDate()
{ {
return createDate; return createDate;
} }
/** 设置更新者 */
public void setUpdateBy(String updateBy) public void setUpdateBy(String updateBy)
{ {
this.updateBy = updateBy; this.updateBy = updateBy;
} }
/** 获取更新者 */
public String getUpdateBy() public String getUpdateBy()
{ {
return updateBy; return updateBy;
} }
/** 设置更新时间 */
public void setUpdateDate(Date updateDate) public void setUpdateDate(Date updateDate)
{ {
this.updateDate = updateDate; this.updateDate = updateDate;
} }
/** 获取更新时间 */
public Date getUpdateDate() public Date getUpdateDate()
{ {
return updateDate; return updateDate;
} }
/** 设置备注信息 */
public void setRemarks(String remarks) public void setRemarks(String remarks)
{ {
this.remarks = remarks; this.remarks = remarks;
} }
/** 获取备注信息 */
public String getRemarks() public String getRemarks()
{ {
return remarks; return remarks;
} }
/** 设置删除标记 */
public void setDelFlag(String delFlag) public void setDelFlag(String delFlag)
{ {
this.delFlag = delFlag; this.delFlag = delFlag;
} }
/** 获取删除标记 */
public String getDelFlag() public String getDelFlag()
{ {
return delFlag; return delFlag;

View File

@ -10,7 +10,7 @@ import java.util.Date;
* 试题分类表 exam_question_category * 试题分类表 exam_question_category
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public class ExamQuestionCategory public class ExamQuestionCategory
{ {
@ -20,110 +20,139 @@ public class ExamQuestionCategory
@Id @Id
private String id; private String id;
/** 分类 */ /** 分类 */
private String name; private String name;
/** */ /** */
private String parentId; private String parentId;
/** */ /** */
private String parentIds; private String parentIds;
/** 创建者 */ /** 创建者 */
private String createBy; private String createBy;
/** 创建时间 */ /** 创建时间 */
private Date createDate; private Date createDate;
/** 更新者 */ /** 更新者 */
private String updateBy; private String updateBy;
/** 更新时间 */ /** 更新时间 */
private Date updateDate; private Date updateDate;
/** 备注信息 */ /** 备注信息 */
private String remarks; private String remarks;
/** 删除标记 */ /** 删除标记 */
private String delFlag; private String delFlag;
/** 设置 */
public void setId(String id) public void setId(String id)
{ {
this.id = id; this.id = id;
} }
/** 获取 */
public String getId() public String getId()
{ {
return id; return id;
} }
/** 设置分类 */
public void setName(String name) public void setName(String name)
{ {
this.name = name; this.name = name;
} }
/** 获取分类 */
public String getName() public String getName()
{ {
return name; return name;
} }
/** 设置 */
public void setParentId(String parentId) public void setParentId(String parentId)
{ {
this.parentId = parentId; this.parentId = parentId;
} }
/** 获取 */
public String getParentId() public String getParentId()
{ {
return parentId; return parentId;
} }
/** 设置 */
public void setParentIds(String parentIds) public void setParentIds(String parentIds)
{ {
this.parentIds = parentIds; this.parentIds = parentIds;
} }
/** 获取 */
public String getParentIds() public String getParentIds()
{ {
return parentIds; return parentIds;
} }
/** 设置创建者 */
public void setCreateBy(String createBy) public void setCreateBy(String createBy)
{ {
this.createBy = createBy; this.createBy = createBy;
} }
/** 获取创建者 */
public String getCreateBy() public String getCreateBy()
{ {
return createBy; return createBy;
} }
/** 设置创建时间 */
public void setCreateDate(Date createDate) public void setCreateDate(Date createDate)
{ {
this.createDate = createDate; this.createDate = createDate;
} }
/** 获取创建时间 */
public Date getCreateDate() public Date getCreateDate()
{ {
return createDate; return createDate;
} }
/** 设置更新者 */
public void setUpdateBy(String updateBy) public void setUpdateBy(String updateBy)
{ {
this.updateBy = updateBy; this.updateBy = updateBy;
} }
/** 获取更新者 */
public String getUpdateBy() public String getUpdateBy()
{ {
return updateBy; return updateBy;
} }
/** 设置更新时间 */
public void setUpdateDate(Date updateDate) public void setUpdateDate(Date updateDate)
{ {
this.updateDate = updateDate; this.updateDate = updateDate;
} }
/** 获取更新时间 */
public Date getUpdateDate() public Date getUpdateDate()
{ {
return updateDate; return updateDate;
} }
/** 设置备注信息 */
public void setRemarks(String remarks) public void setRemarks(String remarks)
{ {
this.remarks = remarks; this.remarks = remarks;
} }
/** 获取备注信息 */
public String getRemarks() public String getRemarks()
{ {
return remarks; return remarks;
} }
/** 设置删除标记 */
public void setDelFlag(String delFlag) public void setDelFlag(String delFlag)
{ {
this.delFlag = delFlag; this.delFlag = delFlag;
} }
/** 获取删除标记 */
public String getDelFlag() public String getDelFlag()
{ {
return delFlag; return delFlag;

View File

@ -2,7 +2,7 @@ package com.ruoyi.exam.domain;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.base.BaseEntity;
import javax.persistence.Id; import javax.persistence.Id;
import java.util.Date; import java.util.Date;
@ -10,7 +10,7 @@ import java.util.Date;
* 问题点评表 exam_question_comment * 问题点评表 exam_question_comment
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public class ExamQuestionComment public class ExamQuestionComment
{ {
@ -20,121 +20,153 @@ public class ExamQuestionComment
@Id @Id
private String id; private String id;
/** 点评内容 */ /** 点评内容 */
private Integer content; private Integer content;
/** 问题 */ /** 问题 */
private String examQuestionId; private String examQuestionId;
/** 点赞数量 */ /** 点赞数量 */
private Integer praiseCount; private Integer praiseCount;
/** 类型0 学生点评 1 老师点评) */ /** 类型0 学生点评 1 老师点评) */
private String commentType; private String commentType;
/** 创建者 */ /** 创建者 */
private String createBy; private String createBy;
/** 创建时间 */ /** 创建时间 */
private Date createDate; private Date createDate;
/** 更新者 */ /** 更新者 */
private String updateBy; private String updateBy;
/** 更新时间 */ /** 更新时间 */
private Date updateDate; private Date updateDate;
/** 备注信息 */ /** 备注信息 */
private String remarks; private String remarks;
/** 删除标记 */ /** 删除标记 */
private String delFlag; private String delFlag;
/** 设置 */
public void setId(String id) public void setId(String id)
{ {
this.id = id; this.id = id;
} }
/** 获取 */
public String getId() public String getId()
{ {
return id; return id;
} }
/** 设置点评内容 */
public void setContent(Integer content) public void setContent(Integer content)
{ {
this.content = content; this.content = content;
} }
/** 获取点评内容 */
public Integer getContent() public Integer getContent()
{ {
return content; return content;
} }
/** 设置问题 */
public void setExamQuestionId(String examQuestionId) public void setExamQuestionId(String examQuestionId)
{ {
this.examQuestionId = examQuestionId; this.examQuestionId = examQuestionId;
} }
/** 获取问题 */
public String getExamQuestionId() public String getExamQuestionId()
{ {
return examQuestionId; return examQuestionId;
} }
/** 设置点赞数量 */
public void setPraiseCount(Integer praiseCount) public void setPraiseCount(Integer praiseCount)
{ {
this.praiseCount = praiseCount; this.praiseCount = praiseCount;
} }
/** 获取点赞数量 */
public Integer getPraiseCount() public Integer getPraiseCount()
{ {
return praiseCount; return praiseCount;
} }
/** 设置类型0 学生点评 1 老师点评) */
public void setCommentType(String commentType) public void setCommentType(String commentType)
{ {
this.commentType = commentType; this.commentType = commentType;
} }
/** 获取类型0 学生点评 1 老师点评) */
public String getCommentType() public String getCommentType()
{ {
return commentType; return commentType;
} }
/** 设置创建者 */
public void setCreateBy(String createBy) public void setCreateBy(String createBy)
{ {
this.createBy = createBy; this.createBy = createBy;
} }
/** 获取创建者 */
public String getCreateBy() public String getCreateBy()
{ {
return createBy; return createBy;
} }
/** 设置创建时间 */
public void setCreateDate(Date createDate) public void setCreateDate(Date createDate)
{ {
this.createDate = createDate; this.createDate = createDate;
} }
/** 获取创建时间 */
public Date getCreateDate() public Date getCreateDate()
{ {
return createDate; return createDate;
} }
/** 设置更新者 */
public void setUpdateBy(String updateBy) public void setUpdateBy(String updateBy)
{ {
this.updateBy = updateBy; this.updateBy = updateBy;
} }
/** 获取更新者 */
public String getUpdateBy() public String getUpdateBy()
{ {
return updateBy; return updateBy;
} }
/** 设置更新时间 */
public void setUpdateDate(Date updateDate) public void setUpdateDate(Date updateDate)
{ {
this.updateDate = updateDate; this.updateDate = updateDate;
} }
/** 获取更新时间 */
public Date getUpdateDate() public Date getUpdateDate()
{ {
return updateDate; return updateDate;
} }
/** 设置备注信息 */
public void setRemarks(String remarks) public void setRemarks(String remarks)
{ {
this.remarks = remarks; this.remarks = remarks;
} }
/** 获取备注信息 */
public String getRemarks() public String getRemarks()
{ {
return remarks; return remarks;
} }
/** 设置删除标记 */
public void setDelFlag(String delFlag) public void setDelFlag(String delFlag)
{ {
this.delFlag = delFlag; this.delFlag = delFlag;
} }
/** 获取删除标记 */
public String getDelFlag() public String getDelFlag()
{ {
return delFlag; return delFlag;

View File

@ -2,7 +2,7 @@ package com.ruoyi.exam.domain;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.base.BaseEntity;
import javax.persistence.Id; import javax.persistence.Id;
import java.util.Date; import java.util.Date;
@ -10,7 +10,7 @@ import java.util.Date;
* 问题选项表 exam_question_item * 问题选项表 exam_question_item
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public class ExamQuestionItem public class ExamQuestionItem
{ {
@ -20,110 +20,139 @@ public class ExamQuestionItem
@Id @Id
private String id; private String id;
/** 选项内容 */ /** 选项内容 */
private String content; private String content;
/** 选项 */ /** 选项 */
private String number; private String number;
/** 题目 */ /** 题目 */
private String examQuestionId; private String examQuestionId;
/** 创建者 */ /** 创建者 */
private String createBy; private String createBy;
/** 创建时间 */ /** 创建时间 */
private Date createDate; private Date createDate;
/** 更新者 */ /** 更新者 */
private String updateBy; private String updateBy;
/** 更新时间 */ /** 更新时间 */
private Date updateDate; private Date updateDate;
/** 备注信息 */ /** 备注信息 */
private String remarks; private String remarks;
/** 删除标记 */ /** 删除标记 */
private String delFlag; private String delFlag;
/** 设置 */
public void setId(String id) public void setId(String id)
{ {
this.id = id; this.id = id;
} }
/** 获取 */
public String getId() public String getId()
{ {
return id; return id;
} }
/** 设置选项内容 */
public void setContent(String content) public void setContent(String content)
{ {
this.content = content; this.content = content;
} }
/** 获取选项内容 */
public String getContent() public String getContent()
{ {
return content; return content;
} }
/** 设置选项 */
public void setNumber(String number) public void setNumber(String number)
{ {
this.number = number; this.number = number;
} }
/** 获取选项 */
public String getNumber() public String getNumber()
{ {
return number; return number;
} }
/** 设置题目 */
public void setExamQuestionId(String examQuestionId) public void setExamQuestionId(String examQuestionId)
{ {
this.examQuestionId = examQuestionId; this.examQuestionId = examQuestionId;
} }
/** 获取题目 */
public String getExamQuestionId() public String getExamQuestionId()
{ {
return examQuestionId; return examQuestionId;
} }
/** 设置创建者 */
public void setCreateBy(String createBy) public void setCreateBy(String createBy)
{ {
this.createBy = createBy; this.createBy = createBy;
} }
/** 获取创建者 */
public String getCreateBy() public String getCreateBy()
{ {
return createBy; return createBy;
} }
/** 设置创建时间 */
public void setCreateDate(Date createDate) public void setCreateDate(Date createDate)
{ {
this.createDate = createDate; this.createDate = createDate;
} }
/** 获取创建时间 */
public Date getCreateDate() public Date getCreateDate()
{ {
return createDate; return createDate;
} }
/** 设置更新者 */
public void setUpdateBy(String updateBy) public void setUpdateBy(String updateBy)
{ {
this.updateBy = updateBy; this.updateBy = updateBy;
} }
/** 获取更新者 */
public String getUpdateBy() public String getUpdateBy()
{ {
return updateBy; return updateBy;
} }
/** 设置更新时间 */
public void setUpdateDate(Date updateDate) public void setUpdateDate(Date updateDate)
{ {
this.updateDate = updateDate; this.updateDate = updateDate;
} }
/** 获取更新时间 */
public Date getUpdateDate() public Date getUpdateDate()
{ {
return updateDate; return updateDate;
} }
/** 设置备注信息 */
public void setRemarks(String remarks) public void setRemarks(String remarks)
{ {
this.remarks = remarks; this.remarks = remarks;
} }
/** 获取备注信息 */
public String getRemarks() public String getRemarks()
{ {
return remarks; return remarks;
} }
/** 设置删除标记 */
public void setDelFlag(String delFlag) public void setDelFlag(String delFlag)
{ {
this.delFlag = delFlag; this.delFlag = delFlag;
} }
/** 获取删除标记 */
public String getDelFlag() public String getDelFlag()
{ {
return delFlag; return delFlag;

View File

@ -8,17 +8,10 @@ import com.ruoyi.framework.web.base.MyMapper;
* 试题分类 数据层 * 试题分类 数据层
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public interface ExamQuestionCategoryMapper extends MyMapper<ExamQuestionCategory> public interface ExamQuestionCategoryMapper extends MyMapper<ExamQuestionCategory>
{ {
/**
* 查询试题分类信息
*
* @param id 试题分类ID
* @return 试题分类信息
*/
public ExamQuestionCategory selectExamQuestionCategoryById(String id);
/** /**
* 查询试题分类列表 * 查询试题分类列表
@ -28,36 +21,4 @@ public interface ExamQuestionCategoryMapper extends MyMapper<ExamQuestionCatego
*/ */
public List<ExamQuestionCategory> selectExamQuestionCategoryList(ExamQuestionCategory examQuestionCategory); public List<ExamQuestionCategory> selectExamQuestionCategoryList(ExamQuestionCategory examQuestionCategory);
/**
* 新增试题分类
*
* @param examQuestionCategory 试题分类信息
* @return 结果
*/
public int insertExamQuestionCategory(ExamQuestionCategory examQuestionCategory);
/**
* 修改试题分类
*
* @param examQuestionCategory 试题分类信息
* @return 结果
*/
public int updateExamQuestionCategory(ExamQuestionCategory examQuestionCategory);
/**
* 删除试题分类
*
* @param id 试题分类ID
* @return 结果
*/
public int deleteExamQuestionCategoryById(String id);
/**
* 批量删除试题分类
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteExamQuestionCategoryByIds(String[] ids);
} }

View File

@ -8,17 +8,10 @@ import com.ruoyi.framework.web.base.MyMapper;
* 问题点评 数据层 * 问题点评 数据层
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public interface ExamQuestionCommentMapper extends MyMapper<ExamQuestionComment> public interface ExamQuestionCommentMapper extends MyMapper<ExamQuestionComment>
{ {
/**
* 查询问题点评信息
*
* @param id 问题点评ID
* @return 问题点评信息
*/
public ExamQuestionComment selectExamQuestionCommentById(String id);
/** /**
* 查询问题点评列表 * 查询问题点评列表
@ -28,36 +21,4 @@ public interface ExamQuestionCommentMapper extends MyMapper<ExamQuestionComment
*/ */
public List<ExamQuestionComment> selectExamQuestionCommentList(ExamQuestionComment examQuestionComment); public List<ExamQuestionComment> selectExamQuestionCommentList(ExamQuestionComment examQuestionComment);
/**
* 新增问题点评
*
* @param examQuestionComment 问题点评信息
* @return 结果
*/
public int insertExamQuestionComment(ExamQuestionComment examQuestionComment);
/**
* 修改问题点评
*
* @param examQuestionComment 问题点评信息
* @return 结果
*/
public int updateExamQuestionComment(ExamQuestionComment examQuestionComment);
/**
* 删除问题点评
*
* @param id 问题点评ID
* @return 结果
*/
public int deleteExamQuestionCommentById(String id);
/**
* 批量删除问题点评
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteExamQuestionCommentByIds(String[] ids);
} }

View File

@ -8,17 +8,10 @@ import com.ruoyi.framework.web.base.MyMapper;
* 问题选项 数据层 * 问题选项 数据层
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public interface ExamQuestionItemMapper extends MyMapper<ExamQuestionItem> public interface ExamQuestionItemMapper extends MyMapper<ExamQuestionItem>
{ {
/**
* 查询问题选项信息
*
* @param id 问题选项ID
* @return 问题选项信息
*/
public ExamQuestionItem selectExamQuestionItemById(String id);
/** /**
* 查询问题选项列表 * 查询问题选项列表
@ -28,36 +21,4 @@ public interface ExamQuestionItemMapper extends MyMapper<ExamQuestionItem>
*/ */
public List<ExamQuestionItem> selectExamQuestionItemList(ExamQuestionItem examQuestionItem); public List<ExamQuestionItem> selectExamQuestionItemList(ExamQuestionItem examQuestionItem);
/**
* 新增问题选项
*
* @param examQuestionItem 问题选项信息
* @return 结果
*/
public int insertExamQuestionItem(ExamQuestionItem examQuestionItem);
/**
* 修改问题选项
*
* @param examQuestionItem 问题选项信息
* @return 结果
*/
public int updateExamQuestionItem(ExamQuestionItem examQuestionItem);
/**
* 删除问题选项
*
* @param id 问题选项ID
* @return 结果
*/
public int deleteExamQuestionItemById(String id);
/**
* 批量删除问题选项
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteExamQuestionItemByIds(String[] ids);
} }

View File

@ -8,17 +8,10 @@ import com.ruoyi.framework.web.base.MyMapper;
* 问题 数据层 * 问题 数据层
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public interface ExamQuestionMapper extends MyMapper<ExamQuestion> public interface ExamQuestionMapper extends MyMapper<ExamQuestion>
{ {
/**
* 查询问题信息
*
* @param id 问题ID
* @return 问题信息
*/
public ExamQuestion selectExamQuestionById(String id);
/** /**
* 查询问题列表 * 查询问题列表
@ -28,36 +21,4 @@ public interface ExamQuestionMapper extends MyMapper<ExamQuestion>
*/ */
public List<ExamQuestion> selectExamQuestionList(ExamQuestion examQuestion); public List<ExamQuestion> selectExamQuestionList(ExamQuestion examQuestion);
/**
* 新增问题
*
* @param examQuestion 问题信息
* @return 结果
*/
public int insertExamQuestion(ExamQuestion examQuestion);
/**
* 修改问题
*
* @param examQuestion 问题信息
* @return 结果
*/
public int updateExamQuestion(ExamQuestion examQuestion);
/**
* 删除问题
*
* @param id 问题ID
* @return 结果
*/
public int deleteExamQuestionById(String id);
/**
* 批量删除问题
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteExamQuestionByIds(String[] ids);
} }

View File

@ -7,18 +7,17 @@ import com.ruoyi.framework.web.base.AbstractBaseService;
* 试题分类 服务层 * 试题分类 服务层
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public interface IExamQuestionCategoryService extends AbstractBaseService<ExamQuestionCategory> public interface IExamQuestionCategoryService extends AbstractBaseService<ExamQuestionCategory>
{ {
/** /**
* 查询试题分类信息 * 查询试题分类分页列表
* *
* @param id 试题分类ID * @param examQuestionCategory 试题分类信息
* @return 试题分类信息 * @return 试题分类集合
*/ */
public ExamQuestionCategory selectExamQuestionCategoryById(String id); public List<ExamQuestionCategory> selectExamQuestionCategoryPage(ExamQuestionCategory examQuestionCategory);
/** /**
* 查询试题分类列表 * 查询试题分类列表
* *
@ -27,28 +26,5 @@ public interface IExamQuestionCategoryService extends AbstractBaseService<ExamQu
*/ */
public List<ExamQuestionCategory> selectExamQuestionCategoryList(ExamQuestionCategory examQuestionCategory); public List<ExamQuestionCategory> selectExamQuestionCategoryList(ExamQuestionCategory examQuestionCategory);
/**
* 新增试题分类
*
* @param examQuestionCategory 试题分类信息
* @return 结果
*/
public int insertExamQuestionCategory(ExamQuestionCategory examQuestionCategory);
/**
* 修改试题分类
*
* @param examQuestionCategory 试题分类信息
* @return 结果
*/
public int updateExamQuestionCategory(ExamQuestionCategory examQuestionCategory);
/**
* 删除试题分类信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteExamQuestionCategoryByIds(String ids);
} }

View File

@ -7,18 +7,17 @@ import com.ruoyi.framework.web.base.AbstractBaseService;
* 问题点评 服务层 * 问题点评 服务层
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public interface IExamQuestionCommentService extends AbstractBaseService<ExamQuestionComment> public interface IExamQuestionCommentService extends AbstractBaseService<ExamQuestionComment>
{ {
/** /**
* 查询问题点评信息 * 查询问题点评分页列表
* *
* @param id 问题点评ID * @param examQuestionComment 问题点评信息
* @return 问题点评信息 * @return 问题点评集合
*/ */
public ExamQuestionComment selectExamQuestionCommentById(String id); public List<ExamQuestionComment> selectExamQuestionCommentPage(ExamQuestionComment examQuestionComment);
/** /**
* 查询问题点评列表 * 查询问题点评列表
* *
@ -27,28 +26,5 @@ public interface IExamQuestionCommentService extends AbstractBaseService<ExamQue
*/ */
public List<ExamQuestionComment> selectExamQuestionCommentList(ExamQuestionComment examQuestionComment); public List<ExamQuestionComment> selectExamQuestionCommentList(ExamQuestionComment examQuestionComment);
/**
* 新增问题点评
*
* @param examQuestionComment 问题点评信息
* @return 结果
*/
public int insertExamQuestionComment(ExamQuestionComment examQuestionComment);
/**
* 修改问题点评
*
* @param examQuestionComment 问题点评信息
* @return 结果
*/
public int updateExamQuestionComment(ExamQuestionComment examQuestionComment);
/**
* 删除问题点评信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteExamQuestionCommentByIds(String ids);
} }

View File

@ -7,18 +7,17 @@ import com.ruoyi.framework.web.base.AbstractBaseService;
* 问题选项 服务层 * 问题选项 服务层
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public interface IExamQuestionItemService extends AbstractBaseService<ExamQuestionItem> public interface IExamQuestionItemService extends AbstractBaseService<ExamQuestionItem>
{ {
/** /**
* 查询问题选项信息 * 查询问题选项分页列表
* *
* @param id 问题选项ID * @param examQuestionItem 问题选项信息
* @return 问题选项信息 * @return 问题选项集合
*/ */
public ExamQuestionItem selectExamQuestionItemById(String id); public List<ExamQuestionItem> selectExamQuestionItemPage(ExamQuestionItem examQuestionItem);
/** /**
* 查询问题选项列表 * 查询问题选项列表
* *
@ -27,28 +26,5 @@ public interface IExamQuestionItemService extends AbstractBaseService<ExamQuesti
*/ */
public List<ExamQuestionItem> selectExamQuestionItemList(ExamQuestionItem examQuestionItem); public List<ExamQuestionItem> selectExamQuestionItemList(ExamQuestionItem examQuestionItem);
/**
* 新增问题选项
*
* @param examQuestionItem 问题选项信息
* @return 结果
*/
public int insertExamQuestionItem(ExamQuestionItem examQuestionItem);
/**
* 修改问题选项
*
* @param examQuestionItem 问题选项信息
* @return 结果
*/
public int updateExamQuestionItem(ExamQuestionItem examQuestionItem);
/**
* 删除问题选项信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteExamQuestionItemByIds(String ids);
} }

View File

@ -7,18 +7,17 @@ import com.ruoyi.framework.web.base.AbstractBaseService;
* 问题 服务层 * 问题 服务层
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
public interface IExamQuestionService extends AbstractBaseService<ExamQuestion> public interface IExamQuestionService extends AbstractBaseService<ExamQuestion>
{ {
/** /**
* 查询问题信息 * 查询问题分页列表
* *
* @param id 问题ID * @param examQuestion 问题信息
* @return 问题信息 * @return 问题集合
*/ */
public ExamQuestion selectExamQuestionById(String id); public List<ExamQuestion> selectExamQuestionPage(ExamQuestion examQuestion);
/** /**
* 查询问题列表 * 查询问题列表
* *
@ -27,28 +26,5 @@ public interface IExamQuestionService extends AbstractBaseService<ExamQuestion>
*/ */
public List<ExamQuestion> selectExamQuestionList(ExamQuestion examQuestion); public List<ExamQuestion> selectExamQuestionList(ExamQuestion examQuestion);
/**
* 新增问题
*
* @param examQuestion 问题信息
* @return 结果
*/
public int insertExamQuestion(ExamQuestion examQuestion);
/**
* 修改问题
*
* @param examQuestion 问题信息
* @return 结果
*/
public int updateExamQuestion(ExamQuestion examQuestion);
/**
* 删除问题信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteExamQuestionByIds(String ids);
} }

View File

@ -12,7 +12,7 @@ import com.ruoyi.framework.web.base.AbstractBaseServiceImpl;
* 试题分类 服务层实现 * 试题分类 服务层实现
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
@Service @Service
public class ExamQuestionCategoryServiceImpl extends AbstractBaseServiceImpl<ExamQuestionCategoryMapper,ExamQuestionCategory> implements IExamQuestionCategoryService public class ExamQuestionCategoryServiceImpl extends AbstractBaseServiceImpl<ExamQuestionCategoryMapper,ExamQuestionCategory> implements IExamQuestionCategoryService
@ -20,17 +20,6 @@ public class ExamQuestionCategoryServiceImpl extends AbstractBaseServiceImpl<Exa
@Autowired @Autowired
private ExamQuestionCategoryMapper examQuestionCategoryMapper; private ExamQuestionCategoryMapper examQuestionCategoryMapper;
/**
* 查询试题分类信息
*
* @param id 试题分类ID
* @return 试题分类信息
*/
@Override
public ExamQuestionCategory selectExamQuestionCategoryById(String id)
{
return examQuestionCategoryMapper.selectExamQuestionCategoryById(id);
}
/** /**
* 查询试题分类列表 * 查询试题分类列表
@ -40,45 +29,20 @@ public class ExamQuestionCategoryServiceImpl extends AbstractBaseServiceImpl<Exa
*/ */
@Override @Override
public List<ExamQuestionCategory> selectExamQuestionCategoryList(ExamQuestionCategory examQuestionCategory) public List<ExamQuestionCategory> selectExamQuestionCategoryList(ExamQuestionCategory examQuestionCategory)
{
return examQuestionCategoryMapper.selectExamQuestionCategoryList(examQuestionCategory);
}
/**
* 查询试题分类分页列表
*
* @param examQuestionCategory 试题分类信息
* @return 试题分类集合
*/
@Override
public List<ExamQuestionCategory> selectExamQuestionCategoryPage(ExamQuestionCategory examQuestionCategory)
{ {
startPage(); startPage();
return examQuestionCategoryMapper.selectExamQuestionCategoryList(examQuestionCategory); return examQuestionCategoryMapper.selectExamQuestionCategoryList(examQuestionCategory);
} }
/**
* 新增试题分类
*
* @param examQuestionCategory 试题分类信息
* @return 结果
*/
@Override
public int insertExamQuestionCategory(ExamQuestionCategory examQuestionCategory)
{
return examQuestionCategoryMapper.insertExamQuestionCategory(examQuestionCategory);
}
/**
* 修改试题分类
*
* @param examQuestionCategory 试题分类信息
* @return 结果
*/
@Override
public int updateExamQuestionCategory(ExamQuestionCategory examQuestionCategory)
{
return examQuestionCategoryMapper.updateExamQuestionCategory(examQuestionCategory);
}
/**
* 删除试题分类对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteExamQuestionCategoryByIds(String ids)
{
return examQuestionCategoryMapper.deleteExamQuestionCategoryByIds(Convert.toStrArray(ids));
}
} }

View File

@ -12,7 +12,7 @@ import com.ruoyi.framework.web.base.AbstractBaseServiceImpl;
* 问题点评 服务层实现 * 问题点评 服务层实现
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
@Service @Service
public class ExamQuestionCommentServiceImpl extends AbstractBaseServiceImpl<ExamQuestionCommentMapper,ExamQuestionComment> implements IExamQuestionCommentService public class ExamQuestionCommentServiceImpl extends AbstractBaseServiceImpl<ExamQuestionCommentMapper,ExamQuestionComment> implements IExamQuestionCommentService
@ -20,17 +20,6 @@ public class ExamQuestionCommentServiceImpl extends AbstractBaseServiceImpl<Exam
@Autowired @Autowired
private ExamQuestionCommentMapper examQuestionCommentMapper; private ExamQuestionCommentMapper examQuestionCommentMapper;
/**
* 查询问题点评信息
*
* @param id 问题点评ID
* @return 问题点评信息
*/
@Override
public ExamQuestionComment selectExamQuestionCommentById(String id)
{
return examQuestionCommentMapper.selectExamQuestionCommentById(id);
}
/** /**
* 查询问题点评列表 * 查询问题点评列表
@ -40,45 +29,20 @@ public class ExamQuestionCommentServiceImpl extends AbstractBaseServiceImpl<Exam
*/ */
@Override @Override
public List<ExamQuestionComment> selectExamQuestionCommentList(ExamQuestionComment examQuestionComment) public List<ExamQuestionComment> selectExamQuestionCommentList(ExamQuestionComment examQuestionComment)
{
return examQuestionCommentMapper.selectExamQuestionCommentList(examQuestionComment);
}
/**
* 查询问题点评分页列表
*
* @param examQuestionComment 问题点评信息
* @return 问题点评集合
*/
@Override
public List<ExamQuestionComment> selectExamQuestionCommentPage(ExamQuestionComment examQuestionComment)
{ {
startPage(); startPage();
return examQuestionCommentMapper.selectExamQuestionCommentList(examQuestionComment); return examQuestionCommentMapper.selectExamQuestionCommentList(examQuestionComment);
} }
/**
* 新增问题点评
*
* @param examQuestionComment 问题点评信息
* @return 结果
*/
@Override
public int insertExamQuestionComment(ExamQuestionComment examQuestionComment)
{
return examQuestionCommentMapper.insertExamQuestionComment(examQuestionComment);
}
/**
* 修改问题点评
*
* @param examQuestionComment 问题点评信息
* @return 结果
*/
@Override
public int updateExamQuestionComment(ExamQuestionComment examQuestionComment)
{
return examQuestionCommentMapper.updateExamQuestionComment(examQuestionComment);
}
/**
* 删除问题点评对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteExamQuestionCommentByIds(String ids)
{
return examQuestionCommentMapper.deleteExamQuestionCommentByIds(Convert.toStrArray(ids));
}
} }

View File

@ -12,7 +12,7 @@ import com.ruoyi.framework.web.base.AbstractBaseServiceImpl;
* 问题选项 服务层实现 * 问题选项 服务层实现
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
@Service @Service
public class ExamQuestionItemServiceImpl extends AbstractBaseServiceImpl<ExamQuestionItemMapper,ExamQuestionItem> implements IExamQuestionItemService public class ExamQuestionItemServiceImpl extends AbstractBaseServiceImpl<ExamQuestionItemMapper,ExamQuestionItem> implements IExamQuestionItemService
@ -20,17 +20,6 @@ public class ExamQuestionItemServiceImpl extends AbstractBaseServiceImpl<ExamQue
@Autowired @Autowired
private ExamQuestionItemMapper examQuestionItemMapper; private ExamQuestionItemMapper examQuestionItemMapper;
/**
* 查询问题选项信息
*
* @param id 问题选项ID
* @return 问题选项信息
*/
@Override
public ExamQuestionItem selectExamQuestionItemById(String id)
{
return examQuestionItemMapper.selectExamQuestionItemById(id);
}
/** /**
* 查询问题选项列表 * 查询问题选项列表
@ -40,45 +29,20 @@ public class ExamQuestionItemServiceImpl extends AbstractBaseServiceImpl<ExamQue
*/ */
@Override @Override
public List<ExamQuestionItem> selectExamQuestionItemList(ExamQuestionItem examQuestionItem) public List<ExamQuestionItem> selectExamQuestionItemList(ExamQuestionItem examQuestionItem)
{
return examQuestionItemMapper.selectExamQuestionItemList(examQuestionItem);
}
/**
* 查询问题选项分页列表
*
* @param examQuestionItem 问题选项信息
* @return 问题选项集合
*/
@Override
public List<ExamQuestionItem> selectExamQuestionItemPage(ExamQuestionItem examQuestionItem)
{ {
startPage(); startPage();
return examQuestionItemMapper.selectExamQuestionItemList(examQuestionItem); return examQuestionItemMapper.selectExamQuestionItemList(examQuestionItem);
} }
/**
* 新增问题选项
*
* @param examQuestionItem 问题选项信息
* @return 结果
*/
@Override
public int insertExamQuestionItem(ExamQuestionItem examQuestionItem)
{
return examQuestionItemMapper.insertExamQuestionItem(examQuestionItem);
}
/**
* 修改问题选项
*
* @param examQuestionItem 问题选项信息
* @return 结果
*/
@Override
public int updateExamQuestionItem(ExamQuestionItem examQuestionItem)
{
return examQuestionItemMapper.updateExamQuestionItem(examQuestionItem);
}
/**
* 删除问题选项对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteExamQuestionItemByIds(String ids)
{
return examQuestionItemMapper.deleteExamQuestionItemByIds(Convert.toStrArray(ids));
}
} }

View File

@ -12,7 +12,7 @@ import com.ruoyi.framework.web.base.AbstractBaseServiceImpl;
* 问题 服务层实现 * 问题 服务层实现
* *
* @author zhujj * @author zhujj
* @date 2018-12-06 * @date 2018-12-07
*/ */
@Service @Service
public class ExamQuestionServiceImpl extends AbstractBaseServiceImpl<ExamQuestionMapper,ExamQuestion> implements IExamQuestionService public class ExamQuestionServiceImpl extends AbstractBaseServiceImpl<ExamQuestionMapper,ExamQuestion> implements IExamQuestionService
@ -20,17 +20,6 @@ public class ExamQuestionServiceImpl extends AbstractBaseServiceImpl<ExamQuestio
@Autowired @Autowired
private ExamQuestionMapper examQuestionMapper; private ExamQuestionMapper examQuestionMapper;
/**
* 查询问题信息
*
* @param id 问题ID
* @return 问题信息
*/
@Override
public ExamQuestion selectExamQuestionById(String id)
{
return examQuestionMapper.selectExamQuestionById(id);
}
/** /**
* 查询问题列表 * 查询问题列表
@ -40,45 +29,20 @@ public class ExamQuestionServiceImpl extends AbstractBaseServiceImpl<ExamQuestio
*/ */
@Override @Override
public List<ExamQuestion> selectExamQuestionList(ExamQuestion examQuestion) public List<ExamQuestion> selectExamQuestionList(ExamQuestion examQuestion)
{
return examQuestionMapper.selectExamQuestionList(examQuestion);
}
/**
* 查询问题分页列表
*
* @param examQuestion 问题信息
* @return 问题集合
*/
@Override
public List<ExamQuestion> selectExamQuestionPage(ExamQuestion examQuestion)
{ {
startPage(); startPage();
return examQuestionMapper.selectExamQuestionList(examQuestion); return examQuestionMapper.selectExamQuestionList(examQuestion);
} }
/**
* 新增问题
*
* @param examQuestion 问题信息
* @return 结果
*/
@Override
public int insertExamQuestion(ExamQuestion examQuestion)
{
return examQuestionMapper.insertExamQuestion(examQuestion);
}
/**
* 修改问题
*
* @param examQuestion 问题信息
* @return 结果
*/
@Override
public int updateExamQuestion(ExamQuestion examQuestion)
{
return examQuestionMapper.updateExamQuestion(examQuestion);
}
/**
* 删除问题对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteExamQuestionByIds(String ids)
{
return examQuestionMapper.deleteExamQuestionByIds(Convert.toStrArray(ids));
}
} }

View File

@ -18,11 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectExamQuestionCategoryVo"> <sql id="selectExamQuestionCategoryVo">
select id, name, parent_id, parent_ids, create_by, create_date, update_by, update_date, remarks, del_flag from exam_question_category id, name, parent_id, parent_ids, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
</sql>
<select id="selectExamQuestionCategoryList" parameterType="ExamQuestionCategory" resultMap="ExamQuestionCategoryResult"> <select id="selectExamQuestionCategoryList" parameterType="ExamQuestionCategory" resultMap="ExamQuestionCategoryResult">
select
<include refid="selectExamQuestionCategoryVo"/> <include refid="selectExamQuestionCategoryVo"/>
from exam_question_category
<where> <where>
<if test="id != null and id != '' "> and id = #{id}</if> <if test="id != null and id != '' "> and id = #{id}</if>
<if test="name != null and name != '' "> and name = #{name}</if> <if test="name != null and name != '' "> and name = #{name}</if>
@ -37,64 +38,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectExamQuestionCategoryById" parameterType="String" resultMap="ExamQuestionCategoryResult">
<include refid="selectExamQuestionCategoryVo"/>
where id = #{id}
</select>
<insert id="insertExamQuestionCategory" parameterType="ExamQuestionCategory">
insert into exam_question_category
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != '' ">id,</if>
<if test="name != null and name != '' ">name,</if>
<if test="parentId != null and parentId != '' ">parent_id,</if>
<if test="parentIds != null and parentIds != '' ">parent_ids,</if>
<if test="createBy != null and createBy != '' ">create_by,</if>
<if test="createDate != null ">create_date,</if>
<if test="updateBy != null and updateBy != '' ">update_by,</if>
<if test="updateDate != null ">update_date,</if>
<if test="remarks != null and remarks != '' ">remarks,</if>
<if test="delFlag != null and delFlag != '' ">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != '' ">#{id},</if>
<if test="name != null and name != '' ">#{name},</if>
<if test="parentId != null and parentId != '' ">#{parentId},</if>
<if test="parentIds != null and parentIds != '' ">#{parentIds},</if>
<if test="createBy != null and createBy != '' ">#{createBy},</if>
<if test="createDate != null ">#{createDate},</if>
<if test="updateBy != null and updateBy != '' ">#{updateBy},</if>
<if test="updateDate != null ">#{updateDate},</if>
<if test="remarks != null and remarks != '' ">#{remarks},</if>
<if test="delFlag != null and delFlag != '' ">#{delFlag},</if>
</trim>
</insert>
<update id="updateExamQuestionCategory" parameterType="ExamQuestionCategory">
update exam_question_category
<trim prefix="SET" suffixOverrides=",">
<if test="name != null and name != '' ">name = #{name},</if>
<if test="parentId != null and parentId != '' ">parent_id = #{parentId},</if>
<if test="parentIds != null and parentIds != '' ">parent_ids = #{parentIds},</if>
<if test="createBy != null and createBy != '' ">create_by = #{createBy},</if>
<if test="createDate != null ">create_date = #{createDate},</if>
<if test="updateBy != null and updateBy != '' ">update_by = #{updateBy},</if>
<if test="updateDate != null ">update_date = #{updateDate},</if>
<if test="remarks != null and remarks != '' ">remarks = #{remarks},</if>
<if test="delFlag != null and delFlag != '' ">del_flag = #{delFlag},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteExamQuestionCategoryById" parameterType="String">
delete from exam_question_category where id = #{id}
</delete>
<delete id="deleteExamQuestionCategoryByIds" parameterType="String">
delete from exam_question_category where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper> </mapper>

View File

@ -19,11 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectExamQuestionCommentVo"> <sql id="selectExamQuestionCommentVo">
select id, content, exam_question_id, praise_count, comment_type, create_by, create_date, update_by, update_date, remarks, del_flag from exam_question_comment id, content, exam_question_id, praise_count, comment_type, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
</sql>
<select id="selectExamQuestionCommentList" parameterType="ExamQuestionComment" resultMap="ExamQuestionCommentResult"> <select id="selectExamQuestionCommentList" parameterType="ExamQuestionComment" resultMap="ExamQuestionCommentResult">
select
<include refid="selectExamQuestionCommentVo"/> <include refid="selectExamQuestionCommentVo"/>
from exam_question_comment
<where> <where>
<if test="id != null and id != '' "> and id = #{id}</if> <if test="id != null and id != '' "> and id = #{id}</if>
<if test="content != null "> and content = #{content}</if> <if test="content != null "> and content = #{content}</if>
@ -39,67 +40,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectExamQuestionCommentById" parameterType="String" resultMap="ExamQuestionCommentResult">
<include refid="selectExamQuestionCommentVo"/>
where id = #{id}
</select>
<insert id="insertExamQuestionComment" parameterType="ExamQuestionComment">
insert into exam_question_comment
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != '' ">id,</if>
<if test="content != null ">content,</if>
<if test="examQuestionId != null and examQuestionId != '' ">exam_question_id,</if>
<if test="praiseCount != null ">praise_count,</if>
<if test="commentType != null and commentType != '' ">comment_type,</if>
<if test="createBy != null and createBy != '' ">create_by,</if>
<if test="createDate != null ">create_date,</if>
<if test="updateBy != null and updateBy != '' ">update_by,</if>
<if test="updateDate != null ">update_date,</if>
<if test="remarks != null and remarks != '' ">remarks,</if>
<if test="delFlag != null and delFlag != '' ">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != '' ">#{id},</if>
<if test="content != null ">#{content},</if>
<if test="examQuestionId != null and examQuestionId != '' ">#{examQuestionId},</if>
<if test="praiseCount != null ">#{praiseCount},</if>
<if test="commentType != null and commentType != '' ">#{commentType},</if>
<if test="createBy != null and createBy != '' ">#{createBy},</if>
<if test="createDate != null ">#{createDate},</if>
<if test="updateBy != null and updateBy != '' ">#{updateBy},</if>
<if test="updateDate != null ">#{updateDate},</if>
<if test="remarks != null and remarks != '' ">#{remarks},</if>
<if test="delFlag != null and delFlag != '' ">#{delFlag},</if>
</trim>
</insert>
<update id="updateExamQuestionComment" parameterType="ExamQuestionComment">
update exam_question_comment
<trim prefix="SET" suffixOverrides=",">
<if test="content != null ">content = #{content},</if>
<if test="examQuestionId != null and examQuestionId != '' ">exam_question_id = #{examQuestionId},</if>
<if test="praiseCount != null ">praise_count = #{praiseCount},</if>
<if test="commentType != null and commentType != '' ">comment_type = #{commentType},</if>
<if test="createBy != null and createBy != '' ">create_by = #{createBy},</if>
<if test="createDate != null ">create_date = #{createDate},</if>
<if test="updateBy != null and updateBy != '' ">update_by = #{updateBy},</if>
<if test="updateDate != null ">update_date = #{updateDate},</if>
<if test="remarks != null and remarks != '' ">remarks = #{remarks},</if>
<if test="delFlag != null and delFlag != '' ">del_flag = #{delFlag},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteExamQuestionCommentById" parameterType="String">
delete from exam_question_comment where id = #{id}
</delete>
<delete id="deleteExamQuestionCommentByIds" parameterType="String">
delete from exam_question_comment where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper> </mapper>

View File

@ -18,11 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectExamQuestionItemVo"> <sql id="selectExamQuestionItemVo">
select id, content, number, exam_question_id, create_by, create_date, update_by, update_date, remarks, del_flag from exam_question_item id, content, number, exam_question_id, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
</sql>
<select id="selectExamQuestionItemList" parameterType="ExamQuestionItem" resultMap="ExamQuestionItemResult"> <select id="selectExamQuestionItemList" parameterType="ExamQuestionItem" resultMap="ExamQuestionItemResult">
select
<include refid="selectExamQuestionItemVo"/> <include refid="selectExamQuestionItemVo"/>
from exam_question_item
<where> <where>
<if test="id != null and id != '' "> and id = #{id}</if> <if test="id != null and id != '' "> and id = #{id}</if>
<if test="content != null and content != '' "> and content = #{content}</if> <if test="content != null and content != '' "> and content = #{content}</if>
@ -37,64 +38,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectExamQuestionItemById" parameterType="String" resultMap="ExamQuestionItemResult">
<include refid="selectExamQuestionItemVo"/>
where id = #{id}
</select>
<insert id="insertExamQuestionItem" parameterType="ExamQuestionItem">
insert into exam_question_item
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != '' ">id,</if>
<if test="content != null and content != '' ">content,</if>
<if test="number != null and number != '' ">number,</if>
<if test="examQuestionId != null and examQuestionId != '' ">exam_question_id,</if>
<if test="createBy != null and createBy != '' ">create_by,</if>
<if test="createDate != null ">create_date,</if>
<if test="updateBy != null and updateBy != '' ">update_by,</if>
<if test="updateDate != null ">update_date,</if>
<if test="remarks != null and remarks != '' ">remarks,</if>
<if test="delFlag != null and delFlag != '' ">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != '' ">#{id},</if>
<if test="content != null and content != '' ">#{content},</if>
<if test="number != null and number != '' ">#{number},</if>
<if test="examQuestionId != null and examQuestionId != '' ">#{examQuestionId},</if>
<if test="createBy != null and createBy != '' ">#{createBy},</if>
<if test="createDate != null ">#{createDate},</if>
<if test="updateBy != null and updateBy != '' ">#{updateBy},</if>
<if test="updateDate != null ">#{updateDate},</if>
<if test="remarks != null and remarks != '' ">#{remarks},</if>
<if test="delFlag != null and delFlag != '' ">#{delFlag},</if>
</trim>
</insert>
<update id="updateExamQuestionItem" parameterType="ExamQuestionItem">
update exam_question_item
<trim prefix="SET" suffixOverrides=",">
<if test="content != null and content != '' ">content = #{content},</if>
<if test="number != null and number != '' ">number = #{number},</if>
<if test="examQuestionId != null and examQuestionId != '' ">exam_question_id = #{examQuestionId},</if>
<if test="createBy != null and createBy != '' ">create_by = #{createBy},</if>
<if test="createDate != null ">create_date = #{createDate},</if>
<if test="updateBy != null and updateBy != '' ">update_by = #{updateBy},</if>
<if test="updateDate != null ">update_date = #{updateDate},</if>
<if test="remarks != null and remarks != '' ">remarks = #{remarks},</if>
<if test="delFlag != null and delFlag != '' ">del_flag = #{delFlag},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteExamQuestionItemById" parameterType="String">
delete from exam_question_item where id = #{id}
</delete>
<delete id="deleteExamQuestionItemByIds" parameterType="String">
delete from exam_question_item where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper> </mapper>

View File

@ -20,11 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectExamQuestionVo"> <sql id="selectExamQuestionVo">
select id, title, answer, type, label, category_id, create_by, create_date, update_by, update_date, remarks, del_flag from exam_question id, title, answer, type, label, category_id, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
</sql>
<select id="selectExamQuestionList" parameterType="ExamQuestion" resultMap="ExamQuestionResult"> <select id="selectExamQuestionList" parameterType="ExamQuestion" resultMap="ExamQuestionResult">
select
<include refid="selectExamQuestionVo"/> <include refid="selectExamQuestionVo"/>
from exam_question
<where> <where>
<if test="id != null and id != '' "> and id = #{id}</if> <if test="id != null and id != '' "> and id = #{id}</if>
<if test="title != null and title != '' "> and title = #{title}</if> <if test="title != null and title != '' "> and title = #{title}</if>
@ -41,70 +42,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectExamQuestionById" parameterType="String" resultMap="ExamQuestionResult">
<include refid="selectExamQuestionVo"/>
where id = #{id}
</select>
<insert id="insertExamQuestion" parameterType="ExamQuestion">
insert into exam_question
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != '' ">id,</if>
<if test="title != null and title != '' ">title,</if>
<if test="answer != null and answer != '' ">answer,</if>
<if test="type != null and type != '' ">type,</if>
<if test="label != null and label != '' ">label,</if>
<if test="categoryId != null and categoryId != '' ">category_id,</if>
<if test="createBy != null and createBy != '' ">create_by,</if>
<if test="createDate != null ">create_date,</if>
<if test="updateBy != null and updateBy != '' ">update_by,</if>
<if test="updateDate != null ">update_date,</if>
<if test="remarks != null and remarks != '' ">remarks,</if>
<if test="delFlag != null and delFlag != '' ">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != '' ">#{id},</if>
<if test="title != null and title != '' ">#{title},</if>
<if test="answer != null and answer != '' ">#{answer},</if>
<if test="type != null and type != '' ">#{type},</if>
<if test="label != null and label != '' ">#{label},</if>
<if test="categoryId != null and categoryId != '' ">#{categoryId},</if>
<if test="createBy != null and createBy != '' ">#{createBy},</if>
<if test="createDate != null ">#{createDate},</if>
<if test="updateBy != null and updateBy != '' ">#{updateBy},</if>
<if test="updateDate != null ">#{updateDate},</if>
<if test="remarks != null and remarks != '' ">#{remarks},</if>
<if test="delFlag != null and delFlag != '' ">#{delFlag},</if>
</trim>
</insert>
<update id="updateExamQuestion" parameterType="ExamQuestion">
update exam_question
<trim prefix="SET" suffixOverrides=",">
<if test="title != null and title != '' ">title = #{title},</if>
<if test="answer != null and answer != '' ">answer = #{answer},</if>
<if test="type != null and type != '' ">type = #{type},</if>
<if test="label != null and label != '' ">label = #{label},</if>
<if test="categoryId != null and categoryId != '' ">category_id = #{categoryId},</if>
<if test="createBy != null and createBy != '' ">create_by = #{createBy},</if>
<if test="createDate != null ">create_date = #{createDate},</if>
<if test="updateBy != null and updateBy != '' ">update_by = #{updateBy},</if>
<if test="updateDate != null ">update_date = #{updateDate},</if>
<if test="remarks != null and remarks != '' ">remarks = #{remarks},</if>
<if test="delFlag != null and delFlag != '' ">del_flag = #{delFlag},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteExamQuestionById" parameterType="String">
delete from exam_question where id = #{id}
</delete>
<delete id="deleteExamQuestionByIds" parameterType="String">
delete from exam_question where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper> </mapper>

View File

@ -23,7 +23,6 @@ public class ${className}
#foreach ($column in $columns) #foreach ($column in $columns)
/** $column.columnComment */ /** $column.columnComment */
@Id
private $column.attrType $column.attrname; private $column.attrType $column.attrname;
#end #end