diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 214685cd2..30fa8184d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -127,7 +127,7 @@ gen: # 作者 author: zhujj # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.test + packageName: com.ruoyi.exam # 自动去除表前缀，默认是true autoRemovePre: false # 表前缀(类名不会包含表前缀) diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCategoryController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCategoryController.java index c3583384e..c220520ce 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCategoryController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCategoryController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.exam; +package com.ruoyi.exam.controller; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -21,26 +21,26 @@ import com.ruoyi.common.utils.ExcelUtil; /** * 试题分类 信息操作处理 - * + * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ @Controller @RequestMapping("/exam/examQuestionCategory") public class ExamQuestionCategoryController extends BaseController { - private String prefix = "exam/examQuestionCategory"; - + private String prefix = "exam/examQuestionCategory"; + @Autowired private IExamQuestionCategoryService examQuestionCategoryService; - + @RequiresPermissions("exam:examQuestionCategory:view") @GetMapping() public String examQuestionCategory() { - return prefix + "/examQuestionCategory"; + return prefix + "/examQuestionCategory"; } - + /** * 查询试题分类列表 */ @@ -49,34 +49,33 @@ public class ExamQuestionCategoryController extends BaseController @ResponseBody public TableDataInfo list(ExamQuestionCategory examQuestionCategory) { - - List list = examQuestionCategoryService.selectExamQuestionCategoryList(examQuestionCategory); + List list = examQuestionCategoryService.selectExamQuestionCategoryPage(examQuestionCategory); return getDataTable(list); } - - + + /** * 导出试题分类列表 */ @RequiresPermissions("exam:examQuestionCategory:export") - @PostMapping("/export") - @ResponseBody - public AjaxResult export(ExamQuestionCategory examQuestionCategory) - { - List list = examQuestionCategoryService.selectExamQuestionCategoryList(examQuestionCategory); - ExcelUtil util = new ExcelUtil(ExamQuestionCategory.class); - return util.exportExcel(list, "examQuestionCategory"); - } - + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ExamQuestionCategory examQuestionCategory) + { + List list = examQuestionCategoryService.selectExamQuestionCategoryList(examQuestionCategory); + ExcelUtil util = new ExcelUtil(ExamQuestionCategory.class); + return util.exportExcel(list, "examQuestionCategory"); + } + /** * 新增试题分类 */ @GetMapping("/add") public String add() { - return prefix + "/add"; + return prefix + "/add"; } - + /** * 新增保存试题分类 */ @@ -85,7 +84,7 @@ public class ExamQuestionCategoryController extends BaseController @PostMapping("/add") @ResponseBody public AjaxResult addSave(ExamQuestionCategory examQuestionCategory) - { + { return toAjax(examQuestionCategoryService.insert(examQuestionCategory)); } @@ -95,11 +94,11 @@ public class ExamQuestionCategoryController extends BaseController @GetMapping("/edit/{id}") public String edit(@PathVariable("id") String id, ModelMap mmap) { - ExamQuestionCategory examQuestionCategory = examQuestionCategoryService.selectExamQuestionCategoryById(id); + ExamQuestionCategory examQuestionCategory = examQuestionCategoryService.selectById(id); mmap.put("examQuestionCategory", examQuestionCategory); - return prefix + "/edit"; + return prefix + "/edit"; } - + /** * 修改保存试题分类 */ @@ -108,10 +107,10 @@ public class ExamQuestionCategoryController extends BaseController @PostMapping("/edit") @ResponseBody public AjaxResult editSave(ExamQuestionCategory examQuestionCategory) - { - return toAjax(examQuestionCategoryService.updateExamQuestionCategory(examQuestionCategory)); + { + return toAjax(examQuestionCategoryService.updateById(examQuestionCategory)); } - + /** * 删除试题分类 */ @@ -120,8 +119,8 @@ public class ExamQuestionCategoryController extends BaseController @PostMapping( "/remove") @ResponseBody public AjaxResult remove(String ids) - { + { return toAjax(examQuestionCategoryService.deleteByIds(ids)); } - + } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCommentController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCommentController.java index c4353a266..997698c54 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCommentController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCommentController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.exam; +package com.ruoyi.exam.controller; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -23,7 +23,7 @@ import com.ruoyi.common.utils.ExcelUtil; * 问题点评 信息操作处理 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ @Controller @RequestMapping("/exam/examQuestionComment") @@ -49,7 +49,7 @@ public class ExamQuestionCommentController extends BaseController @ResponseBody public TableDataInfo list(ExamQuestionComment examQuestionComment) { - List list = examQuestionCommentService.selectExamQuestionCommentList(examQuestionComment); + List list = examQuestionCommentService.selectExamQuestionCommentPage(examQuestionComment); return getDataTable(list); } @@ -85,7 +85,7 @@ public class ExamQuestionCommentController extends BaseController @ResponseBody 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}") public String edit(@PathVariable("id") String id, ModelMap mmap) { - ExamQuestionComment examQuestionComment = examQuestionCommentService.selectExamQuestionCommentById(id); + ExamQuestionComment examQuestionComment = examQuestionCommentService.selectById(id); mmap.put("examQuestionComment", examQuestionComment); return prefix + "/edit"; } @@ -108,7 +108,7 @@ public class ExamQuestionCommentController extends BaseController @ResponseBody 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 public AjaxResult remove(String ids) { - return toAjax(examQuestionCommentService.deleteExamQuestionCommentByIds(ids)); + return toAjax(examQuestionCommentService.deleteByIds(ids)); } } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java index 5b636fdfa..5c25dbc4f 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.exam; +package com.ruoyi.exam.controller; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -23,7 +23,7 @@ import com.ruoyi.common.utils.ExcelUtil; * 问题 信息操作处理 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ @Controller @RequestMapping("/exam/examQuestion") @@ -49,7 +49,7 @@ public class ExamQuestionController extends BaseController @ResponseBody public TableDataInfo list(ExamQuestion examQuestion) { - List list = examQuestionService.selectExamQuestionList(examQuestion); + List list = examQuestionService.selectExamQuestionPage(examQuestion); return getDataTable(list); } @@ -85,7 +85,7 @@ public class ExamQuestionController extends BaseController @ResponseBody 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}") public String edit(@PathVariable("id") String id, ModelMap mmap) { - ExamQuestion examQuestion = examQuestionService.selectExamQuestionById(id); + ExamQuestion examQuestion = examQuestionService.selectById(id); mmap.put("examQuestion", examQuestion); return prefix + "/edit"; } @@ -108,7 +108,7 @@ public class ExamQuestionController extends BaseController @ResponseBody 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 public AjaxResult remove(String ids) { - return toAjax(examQuestionService.deleteExamQuestionByIds(ids)); + return toAjax(examQuestionService.deleteByIds(ids)); } } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionItemController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionItemController.java index 0e7471996..1d0a20af5 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionItemController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionItemController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.exam; +package com.ruoyi.exam.controller; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -23,7 +23,7 @@ import com.ruoyi.common.utils.ExcelUtil; * 问题选项 信息操作处理 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ @Controller @RequestMapping("/exam/examQuestionItem") @@ -49,7 +49,7 @@ public class ExamQuestionItemController extends BaseController @ResponseBody public TableDataInfo list(ExamQuestionItem examQuestionItem) { - List list = examQuestionItemService.selectExamQuestionItemList(examQuestionItem); + List list = examQuestionItemService.selectExamQuestionItemPage(examQuestionItem); return getDataTable(list); } @@ -85,7 +85,7 @@ public class ExamQuestionItemController extends BaseController @ResponseBody 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}") public String edit(@PathVariable("id") String id, ModelMap mmap) { - ExamQuestionItem examQuestionItem = examQuestionItemService.selectExamQuestionItemById(id); + ExamQuestionItem examQuestionItem = examQuestionItemService.selectById(id); mmap.put("examQuestionItem", examQuestionItem); return prefix + "/edit"; } @@ -108,7 +108,7 @@ public class ExamQuestionItemController extends BaseController @ResponseBody 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 public AjaxResult remove(String ids) { - return toAjax(examQuestionItemService.deleteExamQuestionItemByIds(ids)); + return toAjax(examQuestionItemService.deleteByIds(ids)); } } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestion.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestion.java index 7036d68d5..a41a6a7ba 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestion.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestion.java @@ -2,7 +2,7 @@ package com.ruoyi.exam.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; - +import com.ruoyi.common.base.BaseEntity; import javax.persistence.Id; import java.util.Date; @@ -10,142 +10,177 @@ import java.util.Date; * 问题表 exam_question * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public class ExamQuestion { private static final long serialVersionUID = 1L; /** */ - @Id + @Id private String id; /** 问题标题 */ + private String title; /** 问题答案 */ + private String answer; /** 问题类型 */ + private String type; /** 标签 */ + private String label; /** 类别 */ + private String categoryId; /** 创建者 */ + private String createBy; /** 创建时间 */ + private Date createDate; /** 更新者 */ + private String updateBy; /** 更新时间 */ + private Date updateDate; /** 备注信息 */ + private String remarks; /** 删除标记 */ + private String delFlag; + /** 设置 */ public void setId(String id) { this.id = id; } + /** 获取 */ public String getId() { return id; } + /** 设置问题标题 */ public void setTitle(String title) { this.title = title; } + /** 获取问题标题 */ public String getTitle() { return title; } + /** 设置问题答案 */ public void setAnswer(String answer) { this.answer = answer; } + /** 获取问题答案 */ public String getAnswer() { return answer; } + /** 设置问题类型 */ public void setType(String type) { this.type = type; } + /** 获取问题类型 */ public String getType() { return type; } + /** 设置标签 */ public void setLabel(String label) { this.label = label; } + /** 获取标签 */ public String getLabel() { return label; } + /** 设置类别 */ public void setCategoryId(String categoryId) { this.categoryId = categoryId; } + /** 获取类别 */ public String getCategoryId() { return categoryId; } + /** 设置创建者 */ public void setCreateBy(String createBy) { this.createBy = createBy; } + /** 获取创建者 */ public String getCreateBy() { return createBy; } + /** 设置创建时间 */ public void setCreateDate(Date createDate) { this.createDate = createDate; } + /** 获取创建时间 */ public Date getCreateDate() { return createDate; } + /** 设置更新者 */ public void setUpdateBy(String updateBy) { this.updateBy = updateBy; } + /** 获取更新者 */ public String getUpdateBy() { return updateBy; } + /** 设置更新时间 */ public void setUpdateDate(Date updateDate) { this.updateDate = updateDate; } + /** 获取更新时间 */ public Date getUpdateDate() { return updateDate; } + /** 设置备注信息 */ public void setRemarks(String remarks) { this.remarks = remarks; } + /** 获取备注信息 */ public String getRemarks() { return remarks; } + /** 设置删除标记 */ public void setDelFlag(String delFlag) { this.delFlag = delFlag; } + /** 获取删除标记 */ public String getDelFlag() { return delFlag; diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionCategory.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionCategory.java index 478c096a4..047766c3f 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionCategory.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionCategory.java @@ -10,120 +10,149 @@ import java.util.Date; * 试题分类表 exam_question_category * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public class ExamQuestionCategory { private static final long serialVersionUID = 1L; /** */ - @Id +@Id private String id; /** 分类 */ + private String name; /** */ + private String parentId; /** */ + private String parentIds; /** 创建者 */ + private String createBy; /** 创建时间 */ + private Date createDate; /** 更新者 */ + private String updateBy; /** 更新时间 */ + private Date updateDate; /** 备注信息 */ + private String remarks; /** 删除标记 */ + private String delFlag; + /** 设置 */ public void setId(String id) { this.id = id; } + /** 获取 */ public String getId() { return id; } + /** 设置分类 */ public void setName(String name) { this.name = name; } + /** 获取分类 */ public String getName() { return name; } + /** 设置 */ public void setParentId(String parentId) { this.parentId = parentId; } + /** 获取 */ public String getParentId() { return parentId; } + /** 设置 */ public void setParentIds(String parentIds) { this.parentIds = parentIds; } + /** 获取 */ public String getParentIds() { return parentIds; } + /** 设置创建者 */ public void setCreateBy(String createBy) { this.createBy = createBy; } + /** 获取创建者 */ public String getCreateBy() { return createBy; } + /** 设置创建时间 */ public void setCreateDate(Date createDate) { this.createDate = createDate; } + /** 获取创建时间 */ public Date getCreateDate() { return createDate; } + /** 设置更新者 */ public void setUpdateBy(String updateBy) { this.updateBy = updateBy; } + /** 获取更新者 */ public String getUpdateBy() { return updateBy; } + /** 设置更新时间 */ public void setUpdateDate(Date updateDate) { this.updateDate = updateDate; } + /** 获取更新时间 */ public Date getUpdateDate() { return updateDate; } + /** 设置备注信息 */ public void setRemarks(String remarks) { this.remarks = remarks; } + /** 获取备注信息 */ public String getRemarks() { return remarks; } + /** 设置删除标记 */ public void setDelFlag(String delFlag) { this.delFlag = delFlag; } + /** 获取删除标记 */ public String getDelFlag() { return delFlag; diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionComment.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionComment.java index 948fa8c43..350f8889f 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionComment.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionComment.java @@ -2,7 +2,7 @@ package com.ruoyi.exam.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; - +import com.ruoyi.common.base.BaseEntity; import javax.persistence.Id; import java.util.Date; @@ -10,7 +10,7 @@ import java.util.Date; * 问题点评表 exam_question_comment * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public class ExamQuestionComment { @@ -20,121 +20,153 @@ public class ExamQuestionComment @Id private String id; /** 点评内容 */ + private Integer content; /** 问题 */ + private String examQuestionId; /** 点赞数量 */ + private Integer praiseCount; /** 类型（0 学生点评 1 老师点评） */ + private String commentType; /** 创建者 */ + private String createBy; /** 创建时间 */ + private Date createDate; /** 更新者 */ + private String updateBy; /** 更新时间 */ + private Date updateDate; /** 备注信息 */ + private String remarks; /** 删除标记 */ + private String delFlag; + /** 设置 */ public void setId(String id) { this.id = id; } + /** 获取 */ public String getId() { return id; } + /** 设置点评内容 */ public void setContent(Integer content) { this.content = content; } + /** 获取点评内容 */ public Integer getContent() { return content; } + /** 设置问题 */ public void setExamQuestionId(String examQuestionId) { this.examQuestionId = examQuestionId; } + /** 获取问题 */ public String getExamQuestionId() { return examQuestionId; } + /** 设置点赞数量 */ public void setPraiseCount(Integer praiseCount) { this.praiseCount = praiseCount; } + /** 获取点赞数量 */ public Integer getPraiseCount() { return praiseCount; } + /** 设置类型（0 学生点评 1 老师点评） */ public void setCommentType(String commentType) { this.commentType = commentType; } + /** 获取类型（0 学生点评 1 老师点评） */ public String getCommentType() { return commentType; } + /** 设置创建者 */ public void setCreateBy(String createBy) { this.createBy = createBy; } + /** 获取创建者 */ public String getCreateBy() { return createBy; } + /** 设置创建时间 */ public void setCreateDate(Date createDate) { this.createDate = createDate; } + /** 获取创建时间 */ public Date getCreateDate() { return createDate; } + /** 设置更新者 */ public void setUpdateBy(String updateBy) { this.updateBy = updateBy; } + /** 获取更新者 */ public String getUpdateBy() { return updateBy; } + /** 设置更新时间 */ public void setUpdateDate(Date updateDate) { this.updateDate = updateDate; } + /** 获取更新时间 */ public Date getUpdateDate() { return updateDate; } + /** 设置备注信息 */ public void setRemarks(String remarks) { this.remarks = remarks; } + /** 获取备注信息 */ public String getRemarks() { return remarks; } + /** 设置删除标记 */ public void setDelFlag(String delFlag) { this.delFlag = delFlag; } + /** 获取删除标记 */ public String getDelFlag() { return delFlag; diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionItem.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionItem.java index cd4c9a96b..c4949fe10 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionItem.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionItem.java @@ -2,7 +2,7 @@ package com.ruoyi.exam.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; - +import com.ruoyi.common.base.BaseEntity; import javax.persistence.Id; import java.util.Date; @@ -10,7 +10,7 @@ import java.util.Date; * 问题选项表 exam_question_item * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public class ExamQuestionItem { @@ -20,110 +20,139 @@ public class ExamQuestionItem @Id private String id; /** 选项内容 */ + private String content; /** 选项 */ + private String number; /** 题目 */ + private String examQuestionId; /** 创建者 */ + private String createBy; /** 创建时间 */ + private Date createDate; /** 更新者 */ + private String updateBy; /** 更新时间 */ + private Date updateDate; /** 备注信息 */ + private String remarks; /** 删除标记 */ + private String delFlag; + /** 设置 */ public void setId(String id) { this.id = id; } + /** 获取 */ public String getId() { return id; } + /** 设置选项内容 */ public void setContent(String content) { this.content = content; } + /** 获取选项内容 */ public String getContent() { return content; } + /** 设置选项 */ public void setNumber(String number) { this.number = number; } + /** 获取选项 */ public String getNumber() { return number; } + /** 设置题目 */ public void setExamQuestionId(String examQuestionId) { this.examQuestionId = examQuestionId; } + /** 获取题目 */ public String getExamQuestionId() { return examQuestionId; } + /** 设置创建者 */ public void setCreateBy(String createBy) { this.createBy = createBy; } + /** 获取创建者 */ public String getCreateBy() { return createBy; } + /** 设置创建时间 */ public void setCreateDate(Date createDate) { this.createDate = createDate; } + /** 获取创建时间 */ public Date getCreateDate() { return createDate; } + /** 设置更新者 */ public void setUpdateBy(String updateBy) { this.updateBy = updateBy; } + /** 获取更新者 */ public String getUpdateBy() { return updateBy; } + /** 设置更新时间 */ public void setUpdateDate(Date updateDate) { this.updateDate = updateDate; } + /** 获取更新时间 */ public Date getUpdateDate() { return updateDate; } + /** 设置备注信息 */ public void setRemarks(String remarks) { this.remarks = remarks; } + /** 获取备注信息 */ public String getRemarks() { return remarks; } + /** 设置删除标记 */ public void setDelFlag(String delFlag) { this.delFlag = delFlag; } + /** 获取删除标记 */ public String getDelFlag() { return delFlag; diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionCategoryMapper.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionCategoryMapper.java index 21532b716..847cfecf8 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionCategoryMapper.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionCategoryMapper.java @@ -8,18 +8,11 @@ import com.ruoyi.framework.web.base.MyMapper; * 试题分类 数据层 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public interface ExamQuestionCategoryMapper extends MyMapper { - /** - * 查询试题分类信息 - * - * @param id 试题分类ID - * @return 试题分类信息 - */ - public ExamQuestionCategory selectExamQuestionCategoryById(String id); - + /** * 查询试题分类列表 * @@ -28,36 +21,4 @@ public interface ExamQuestionCategoryMapper extends MyMapper 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); - } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionCommentMapper.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionCommentMapper.java index f6255f49f..9eb3874b1 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionCommentMapper.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionCommentMapper.java @@ -8,18 +8,11 @@ import com.ruoyi.framework.web.base.MyMapper; * 问题点评 数据层 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public interface ExamQuestionCommentMapper extends MyMapper { - /** - * 查询问题点评信息 - * - * @param id 问题点评ID - * @return 问题点评信息 - */ - public ExamQuestionComment selectExamQuestionCommentById(String id); - + /** * 查询问题点评列表 * @@ -28,36 +21,4 @@ public interface ExamQuestionCommentMapper extends MyMapper 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); - } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java index 1a81ef265..6825aa547 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java @@ -8,18 +8,11 @@ import com.ruoyi.framework.web.base.MyMapper; * 问题选项 数据层 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public interface ExamQuestionItemMapper extends MyMapper { - /** - * 查询问题选项信息 - * - * @param id 问题选项ID - * @return 问题选项信息 - */ - public ExamQuestionItem selectExamQuestionItemById(String id); - + /** * 查询问题选项列表 * @@ -28,36 +21,4 @@ public interface ExamQuestionItemMapper extends MyMapper */ public List 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); - } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionMapper.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionMapper.java index d0930c1ba..9c97f845f 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionMapper.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionMapper.java @@ -8,18 +8,11 @@ import com.ruoyi.framework.web.base.MyMapper; * 问题 数据层 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public interface ExamQuestionMapper extends MyMapper { - /** - * 查询问题信息 - * - * @param id 问题ID - * @return 问题信息 - */ - public ExamQuestion selectExamQuestionById(String id); - + /** * 查询问题列表 * @@ -28,36 +21,4 @@ public interface ExamQuestionMapper extends MyMapper */ public List 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); - } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionCategoryService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionCategoryService.java index 35e3248ef..3848dfb61 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionCategoryService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionCategoryService.java @@ -7,48 +7,24 @@ import com.ruoyi.framework.web.base.AbstractBaseService; * 试题分类 服务层 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public interface IExamQuestionCategoryService extends AbstractBaseService { /** - * 查询试题分类信息 - * - * @param id 试题分类ID - * @return 试题分类信息 - */ - public ExamQuestionCategory selectExamQuestionCategoryById(String id); - - /** - * 查询试题分类列表 - * + * 查询试题分类分页列表 + * * @param examQuestionCategory 试题分类信息 * @return 试题分类集合 */ - public List selectExamQuestionCategoryList(ExamQuestionCategory examQuestionCategory); - - /** - * 新增试题分类 - * + public List selectExamQuestionCategoryPage(ExamQuestionCategory examQuestionCategory); + /** + * 查询试题分类列表 + * * @param examQuestionCategory 试题分类信息 - * @return 结果 + * @return 试题分类集合 */ - public int insertExamQuestionCategory(ExamQuestionCategory examQuestionCategory); - - /** - * 修改试题分类 - * - * @param examQuestionCategory 试题分类信息 - * @return 结果 - */ - public int updateExamQuestionCategory(ExamQuestionCategory examQuestionCategory); - - /** - * 删除试题分类信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteExamQuestionCategoryByIds(String ids); + public List selectExamQuestionCategoryList(ExamQuestionCategory examQuestionCategory); + } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionCommentService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionCommentService.java index 414062081..8ae50fc91 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionCommentService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionCommentService.java @@ -7,48 +7,24 @@ import com.ruoyi.framework.web.base.AbstractBaseService; * 问题点评 服务层 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public interface IExamQuestionCommentService extends AbstractBaseService { /** - * 查询问题点评信息 - * - * @param id 问题点评ID - * @return 问题点评信息 - */ - public ExamQuestionComment selectExamQuestionCommentById(String id); - - /** - * 查询问题点评列表 - * + * 查询问题点评分页列表 + * * @param examQuestionComment 问题点评信息 * @return 问题点评集合 */ - public List selectExamQuestionCommentList(ExamQuestionComment examQuestionComment); - - /** - * 新增问题点评 - * + public List selectExamQuestionCommentPage(ExamQuestionComment examQuestionComment); + /** + * 查询问题点评列表 + * * @param examQuestionComment 问题点评信息 - * @return 结果 + * @return 问题点评集合 */ - public int insertExamQuestionComment(ExamQuestionComment examQuestionComment); - - /** - * 修改问题点评 - * - * @param examQuestionComment 问题点评信息 - * @return 结果 - */ - public int updateExamQuestionComment(ExamQuestionComment examQuestionComment); - - /** - * 删除问题点评信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteExamQuestionCommentByIds(String ids); + public List selectExamQuestionCommentList(ExamQuestionComment examQuestionComment); + } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java index ac81ae1b6..23a345931 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java @@ -7,48 +7,24 @@ import com.ruoyi.framework.web.base.AbstractBaseService; * 问题选项 服务层 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public interface IExamQuestionItemService extends AbstractBaseService { /** - * 查询问题选项信息 - * - * @param id 问题选项ID - * @return 问题选项信息 - */ - public ExamQuestionItem selectExamQuestionItemById(String id); - - /** - * 查询问题选项列表 - * + * 查询问题选项分页列表 + * * @param examQuestionItem 问题选项信息 * @return 问题选项集合 */ - public List selectExamQuestionItemList(ExamQuestionItem examQuestionItem); - - /** - * 新增问题选项 - * + public List selectExamQuestionItemPage(ExamQuestionItem examQuestionItem); + /** + * 查询问题选项列表 + * * @param examQuestionItem 问题选项信息 - * @return 结果 + * @return 问题选项集合 */ - public int insertExamQuestionItem(ExamQuestionItem examQuestionItem); - - /** - * 修改问题选项 - * - * @param examQuestionItem 问题选项信息 - * @return 结果 - */ - public int updateExamQuestionItem(ExamQuestionItem examQuestionItem); - - /** - * 删除问题选项信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteExamQuestionItemByIds(String ids); + public List selectExamQuestionItemList(ExamQuestionItem examQuestionItem); + } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java index 7de728b69..691d45cb2 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java @@ -7,48 +7,24 @@ import com.ruoyi.framework.web.base.AbstractBaseService; * 问题 服务层 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ public interface IExamQuestionService extends AbstractBaseService { /** - * 查询问题信息 - * - * @param id 问题ID - * @return 问题信息 - */ - public ExamQuestion selectExamQuestionById(String id); - - /** - * 查询问题列表 - * + * 查询问题分页列表 + * * @param examQuestion 问题信息 * @return 问题集合 */ - public List selectExamQuestionList(ExamQuestion examQuestion); - - /** - * 新增问题 - * + public List selectExamQuestionPage(ExamQuestion examQuestion); + /** + * 查询问题列表 + * * @param examQuestion 问题信息 - * @return 结果 + * @return 问题集合 */ - public int insertExamQuestion(ExamQuestion examQuestion); - - /** - * 修改问题 - * - * @param examQuestion 问题信息 - * @return 结果 - */ - public int updateExamQuestion(ExamQuestion examQuestion); - - /** - * 删除问题信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteExamQuestionByIds(String ids); + public List selectExamQuestionList(ExamQuestion examQuestion); + } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionCategoryServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionCategoryServiceImpl.java index d1811d7fd..aa0fd115d 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionCategoryServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionCategoryServiceImpl.java @@ -12,7 +12,7 @@ import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; * 试题分类 服务层实现 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ @Service public class ExamQuestionCategoryServiceImpl extends AbstractBaseServiceImpl implements IExamQuestionCategoryService @@ -20,17 +20,6 @@ public class ExamQuestionCategoryServiceImpl extends AbstractBaseServiceImpl selectExamQuestionCategoryList(ExamQuestionCategory examQuestionCategory) { - startPage(); - return examQuestionCategoryMapper.selectExamQuestionCategoryList(examQuestionCategory); + return examQuestionCategoryMapper.selectExamQuestionCategoryList(examQuestionCategory); } - /** - * 新增试题分类 - * + * 查询试题分类分页列表 + * * @param examQuestionCategory 试题分类信息 - * @return 结果 + * @return 试题分类集合 */ - @Override - public int insertExamQuestionCategory(ExamQuestionCategory examQuestionCategory) - { - return examQuestionCategoryMapper.insertExamQuestionCategory(examQuestionCategory); - } - - /** - * 修改试题分类 - * - * @param examQuestionCategory 试题分类信息 - * @return 结果 - */ - @Override - public int updateExamQuestionCategory(ExamQuestionCategory examQuestionCategory) - { - return examQuestionCategoryMapper.updateExamQuestionCategory(examQuestionCategory); - } + @Override + public List selectExamQuestionCategoryPage(ExamQuestionCategory examQuestionCategory) + { + startPage(); + return examQuestionCategoryMapper.selectExamQuestionCategoryList(examQuestionCategory); + } - /** - * 删除试题分类对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteExamQuestionCategoryByIds(String ids) - { - return examQuestionCategoryMapper.deleteExamQuestionCategoryByIds(Convert.toStrArray(ids)); - } - } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionCommentServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionCommentServiceImpl.java index d784bb00c..cd5921fe5 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionCommentServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionCommentServiceImpl.java @@ -12,7 +12,7 @@ import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; * 问题点评 服务层实现 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ @Service public class ExamQuestionCommentServiceImpl extends AbstractBaseServiceImpl implements IExamQuestionCommentService @@ -20,17 +20,6 @@ public class ExamQuestionCommentServiceImpl extends AbstractBaseServiceImpl selectExamQuestionCommentList(ExamQuestionComment examQuestionComment) { - startPage(); - return examQuestionCommentMapper.selectExamQuestionCommentList(examQuestionComment); + return examQuestionCommentMapper.selectExamQuestionCommentList(examQuestionComment); } - /** - * 新增问题点评 - * + * 查询问题点评分页列表 + * * @param examQuestionComment 问题点评信息 - * @return 结果 + * @return 问题点评集合 */ - @Override - public int insertExamQuestionComment(ExamQuestionComment examQuestionComment) - { - return examQuestionCommentMapper.insertExamQuestionComment(examQuestionComment); - } - - /** - * 修改问题点评 - * - * @param examQuestionComment 问题点评信息 - * @return 结果 - */ - @Override - public int updateExamQuestionComment(ExamQuestionComment examQuestionComment) - { - return examQuestionCommentMapper.updateExamQuestionComment(examQuestionComment); - } + @Override + public List selectExamQuestionCommentPage(ExamQuestionComment examQuestionComment) + { + startPage(); + return examQuestionCommentMapper.selectExamQuestionCommentList(examQuestionComment); + } - /** - * 删除问题点评对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteExamQuestionCommentByIds(String ids) - { - return examQuestionCommentMapper.deleteExamQuestionCommentByIds(Convert.toStrArray(ids)); - } - } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java index 9028b312f..f0b445fd5 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java @@ -12,7 +12,7 @@ import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; * 问题选项 服务层实现 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ @Service public class ExamQuestionItemServiceImpl extends AbstractBaseServiceImpl implements IExamQuestionItemService @@ -20,17 +20,6 @@ public class ExamQuestionItemServiceImpl extends AbstractBaseServiceImpl selectExamQuestionItemList(ExamQuestionItem examQuestionItem) { - startPage(); - return examQuestionItemMapper.selectExamQuestionItemList(examQuestionItem); + return examQuestionItemMapper.selectExamQuestionItemList(examQuestionItem); } - /** - * 新增问题选项 - * + * 查询问题选项分页列表 + * * @param examQuestionItem 问题选项信息 - * @return 结果 + * @return 问题选项集合 */ - @Override - public int insertExamQuestionItem(ExamQuestionItem examQuestionItem) - { - return examQuestionItemMapper.insertExamQuestionItem(examQuestionItem); - } - - /** - * 修改问题选项 - * - * @param examQuestionItem 问题选项信息 - * @return 结果 - */ - @Override - public int updateExamQuestionItem(ExamQuestionItem examQuestionItem) - { - return examQuestionItemMapper.updateExamQuestionItem(examQuestionItem); - } + @Override + public List selectExamQuestionItemPage(ExamQuestionItem examQuestionItem) + { + startPage(); + return examQuestionItemMapper.selectExamQuestionItemList(examQuestionItem); + } - /** - * 删除问题选项对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteExamQuestionItemByIds(String ids) - { - return examQuestionItemMapper.deleteExamQuestionItemByIds(Convert.toStrArray(ids)); - } - } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionServiceImpl.java index dd56a17b3..625fe6635 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionServiceImpl.java @@ -12,7 +12,7 @@ import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; * 问题 服务层实现 * * @author zhujj - * @date 2018-12-06 + * @date 2018-12-07 */ @Service public class ExamQuestionServiceImpl extends AbstractBaseServiceImpl implements IExamQuestionService @@ -20,17 +20,6 @@ public class ExamQuestionServiceImpl extends AbstractBaseServiceImpl selectExamQuestionList(ExamQuestion examQuestion) { - startPage(); - return examQuestionMapper.selectExamQuestionList(examQuestion); + return examQuestionMapper.selectExamQuestionList(examQuestion); } - /** - * 新增问题 - * + * 查询问题分页列表 + * * @param examQuestion 问题信息 - * @return 结果 + * @return 问题集合 */ - @Override - public int insertExamQuestion(ExamQuestion examQuestion) - { - return examQuestionMapper.insertExamQuestion(examQuestion); - } - - /** - * 修改问题 - * - * @param examQuestion 问题信息 - * @return 结果 - */ - @Override - public int updateExamQuestion(ExamQuestion examQuestion) - { - return examQuestionMapper.updateExamQuestion(examQuestion); - } + @Override + public List selectExamQuestionPage(ExamQuestion examQuestion) + { + startPage(); + return examQuestionMapper.selectExamQuestionList(examQuestion); + } - /** - * 删除问题对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteExamQuestionByIds(String ids) - { - return examQuestionMapper.deleteExamQuestionByIds(Convert.toStrArray(ids)); - } - } diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionCategoryMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionCategoryMapper.xml index a735b4c7d..bec5c252d 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionCategoryMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionCategoryMapper.xml @@ -18,11 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - - - - - insert into exam_question_category - - id, - name, - parent_id, - parent_ids, - create_by, - create_date, - update_by, - update_date, - remarks, - del_flag, - - - #{id}, - #{name}, - #{parentId}, - #{parentIds}, - #{createBy}, - #{createDate}, - #{updateBy}, - #{updateDate}, - #{remarks}, - #{delFlag}, - - - - - update exam_question_category - - name = #{name}, - parent_id = #{parentId}, - parent_ids = #{parentIds}, - create_by = #{createBy}, - create_date = #{createDate}, - update_by = #{updateBy}, - update_date = #{updateDate}, - remarks = #{remarks}, - del_flag = #{delFlag}, - - where id = #{id} - - - delete from exam_question_category where id = #{id} - - - - delete from exam_question_category where id in - - #{id} - - \ No newline at end of file diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionCommentMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionCommentMapper.xml index 199777174..deadc12ef 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionCommentMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionCommentMapper.xml @@ -19,11 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - - - - - insert into exam_question_comment - - id, - content, - exam_question_id, - praise_count, - comment_type, - create_by, - create_date, - update_by, - update_date, - remarks, - del_flag, - - - #{id}, - #{content}, - #{examQuestionId}, - #{praiseCount}, - #{commentType}, - #{createBy}, - #{createDate}, - #{updateBy}, - #{updateDate}, - #{remarks}, - #{delFlag}, - - - - - update exam_question_comment - - content = #{content}, - exam_question_id = #{examQuestionId}, - praise_count = #{praiseCount}, - comment_type = #{commentType}, - create_by = #{createBy}, - create_date = #{createDate}, - update_by = #{updateBy}, - update_date = #{updateDate}, - remarks = #{remarks}, - del_flag = #{delFlag}, - - where id = #{id} - - - delete from exam_question_comment where id = #{id} - - - - delete from exam_question_comment where id in - - #{id} - - \ No newline at end of file diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml index c0ec90260..be39626ea 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml @@ -18,11 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - - - - - insert into exam_question_item - - id, - content, - number, - exam_question_id, - create_by, - create_date, - update_by, - update_date, - remarks, - del_flag, - - - #{id}, - #{content}, - #{number}, - #{examQuestionId}, - #{createBy}, - #{createDate}, - #{updateBy}, - #{updateDate}, - #{remarks}, - #{delFlag}, - - - - - update exam_question_item - - content = #{content}, - number = #{number}, - exam_question_id = #{examQuestionId}, - create_by = #{createBy}, - create_date = #{createDate}, - update_by = #{updateBy}, - update_date = #{updateDate}, - remarks = #{remarks}, - del_flag = #{delFlag}, - - where id = #{id} - - - delete from exam_question_item where id = #{id} - - - - delete from exam_question_item where id in - - #{id} - - \ No newline at end of file diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml index d97730234..a1567b5e4 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml @@ -20,11 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - - - - - insert into exam_question - - id, - title, - answer, - type, - label, - category_id, - create_by, - create_date, - update_by, - update_date, - remarks, - del_flag, - - - #{id}, - #{title}, - #{answer}, - #{type}, - #{label}, - #{categoryId}, - #{createBy}, - #{createDate}, - #{updateBy}, - #{updateDate}, - #{remarks}, - #{delFlag}, - - - - - update exam_question - - title = #{title}, - answer = #{answer}, - type = #{type}, - label = #{label}, - category_id = #{categoryId}, - create_by = #{createBy}, - create_date = #{createDate}, - update_by = #{updateBy}, - update_date = #{updateDate}, - remarks = #{remarks}, - del_flag = #{delFlag}, - - where id = #{id} - - - delete from exam_question where id = #{id} - - - - delete from exam_question where id in - - #{id} - - \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm index 7f6bacac6..e2ccb709e 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -23,7 +23,6 @@ public class ${className} #foreach ($column in $columns) /** $column.columnComment */ - @Id private $column.attrType $column.attrname; #end