diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/OnlineCoursesEvaluateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/OnlineCoursesEvaluateController.java index 2135c538f..3bfe6c29c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/OnlineCoursesEvaluateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/OnlineCoursesEvaluateController.java @@ -1,15 +1,14 @@ package com.ruoyi.front.controller; import java.util.List; + +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.utils.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.front.domain.OnlineCoursesEvaluate; @@ -123,4 +122,28 @@ public class OnlineCoursesEvaluateController extends BaseController { return toAjax(onlineCoursesEvaluateService.deleteOnlineCoursesEvaluateByIds(ids)); } + /** + * 评论批量审核 + */ + @GetMapping("/audit") + public String audit(@RequestParam String ids, ModelMap mmap) + { + mmap.put("ids", ids); + return prefix + "/audit"; + } + + /** + * 评论批量审核 + */ + @PostMapping("/audit") + @ResponseBody + public AjaxResult audit(@RequestParam() String ids, @RequestParam String auditStatus,@RequestParam String remark) + { + // 未审核通过,则备注不能为空 + if (StringUtils.isEmpty(remark) && auditStatus.equals(Constants.NO_PASS_AUDIT)) { + return error("备注不能为空"); + } + return toAjax(onlineCoursesEvaluateService.audit(ids, auditStatus,remark)); + } + } diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/domain/OnlineCoursesEvaluate.java b/ruoyi-front/src/main/java/com/ruoyi/front/domain/OnlineCoursesEvaluate.java index 352aa3d3c..0218e60c0 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/domain/OnlineCoursesEvaluate.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/domain/OnlineCoursesEvaluate.java @@ -134,6 +134,7 @@ public class OnlineCoursesEvaluate extends BaseEntity .append("auditStatus", getAuditStatus()) .append("checkBy", getCheckBy()) .append("checkTime", getCheckTime()) + .append("remark", getRemark()) .toString(); } } diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/mapper/OnlineCoursesEvaluateMapper.java b/ruoyi-front/src/main/java/com/ruoyi/front/mapper/OnlineCoursesEvaluateMapper.java index d412c2975..d1b81a21d 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/mapper/OnlineCoursesEvaluateMapper.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/mapper/OnlineCoursesEvaluateMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.front.mapper; import java.util.List; import com.ruoyi.front.domain.OnlineCoursesEvaluate; +import org.apache.ibatis.annotations.Param; /** * 线上课程评价Mapper接口 @@ -58,4 +59,12 @@ public interface OnlineCoursesEvaluateMapper * @return 结果 */ public int deleteOnlineCoursesEvaluateByIds(String[] ids); + + /** + * 审核评论 + * @param ids + * @param auditStatus + * @return + */ + public int auditOnlineCoursesEvaluateByIds(@Param("ids") String[] ids, @Param("auditStatus")String auditStatus, @Param("checkBy")String checkBy,@Param("remark")String remark); } diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/service/IOnlineCoursesEvaluateService.java b/ruoyi-front/src/main/java/com/ruoyi/front/service/IOnlineCoursesEvaluateService.java index d93f487a6..d8bedaa16 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/service/IOnlineCoursesEvaluateService.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/service/IOnlineCoursesEvaluateService.java @@ -2,6 +2,7 @@ package com.ruoyi.front.service; import java.util.List; import com.ruoyi.front.domain.OnlineCoursesEvaluate; +import org.apache.ibatis.annotations.Param; /** * 线上课程评价Service接口 @@ -58,4 +59,11 @@ public interface IOnlineCoursesEvaluateService * @return 结果 */ public int deleteOnlineCoursesEvaluateById(Long id); + /** + * 审核评论 + * @param ids + * @param auditStatus + * @return + */ + public int audit(String ids, String auditStatus, String remark); } diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/OnlineCoursesEvaluateServiceImpl.java b/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/OnlineCoursesEvaluateServiceImpl.java index 104e057d6..a08c2d4b3 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/OnlineCoursesEvaluateServiceImpl.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/OnlineCoursesEvaluateServiceImpl.java @@ -2,6 +2,8 @@ package com.ruoyi.front.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.framework.util.ShiroUtils; +import com.ruoyi.system.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.front.mapper.OnlineCoursesEvaluateMapper; @@ -94,4 +96,17 @@ public class OnlineCoursesEvaluateServiceImpl implements IOnlineCoursesEvaluateS { return onlineCoursesEvaluateMapper.deleteOnlineCoursesEvaluateById(id); } + + /** + * 评论批量审核 + * @param ids IDs + * @param auditStatus 审核状态 + * @return + */ + @Override + public int audit(String ids, String auditStatus, String remark) + { + SysUser user = ShiroUtils.getSysUser(); + return onlineCoursesEvaluateMapper.auditOnlineCoursesEvaluateByIds(Convert.toStrArray(ids), auditStatus, user.getUserId().toString(),remark); + } } diff --git a/ruoyi-front/src/main/resources/mapper/front/OnlineCoursesEvaluateMapper.xml b/ruoyi-front/src/main/resources/mapper/front/OnlineCoursesEvaluateMapper.xml index 297004956..bf7992e28 100644 --- a/ruoyi-front/src/main/resources/mapper/front/OnlineCoursesEvaluateMapper.xml +++ b/ruoyi-front/src/main/resources/mapper/front/OnlineCoursesEvaluateMapper.xml @@ -17,27 +17,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, online_courses_id, evaluate_content, anonymous_flag, del_flag, create_by, create_time, update_by, update_time, audit_status, check_by, check_time from online_courses_evaluate + select ce.id, ce.online_courses_id, ce.evaluate_content, ce.anonymous_flag, ce.create_by, ce.create_time, ce.update_by, ce.update_time, ce.audit_status, su.login_name check_by, ce.remark,ce.check_time from online_courses_evaluate ce left join sys_user su on ce.check_by=su.user_id @@ -89,14 +91,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from online_courses_evaluate where id = #{id} + update online_courses_evaluate set del_flag='1' where id = #{id} - delete from online_courses_evaluate where id in + update online_courses_evaluate set del_flag='1' where id in #{id} - + + update online_courses_evaluate + set check_by = #{checkBy}, + remark = #{remark}, + check_time = now(), + audit_status = #{auditStatus} + where id in + + #{id} + + \ No newline at end of file diff --git a/ruoyi-front/src/main/resources/templates/front/courses/courses.html b/ruoyi-front/src/main/resources/templates/front/courses/courses.html index 6e847041d..6bb63cb4f 100644 --- a/ruoyi-front/src/main/resources/templates/front/courses/courses.html +++ b/ruoyi-front/src/main/resources/templates/front/courses/courses.html @@ -101,8 +101,7 @@ }, { field: 'id', - title: 'ID', - visible: false + title: 'ID' }, { field: 'title', diff --git a/ruoyi-front/src/main/resources/templates/front/evaluate/audit.html b/ruoyi-front/src/main/resources/templates/front/evaluate/audit.html new file mode 100644 index 000000000..fde95e750 --- /dev/null +++ b/ruoyi-front/src/main/resources/templates/front/evaluate/audit.html @@ -0,0 +1,51 @@ + + + + + + + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-front/src/main/resources/templates/front/evaluate/evaluate.html b/ruoyi-front/src/main/resources/templates/front/evaluate/evaluate.html index f5c6d2e2d..1ed35b5a0 100644 --- a/ruoyi-front/src/main/resources/templates/front/evaluate/evaluate.html +++ b/ruoyi-front/src/main/resources/templates/front/evaluate/evaluate.html @@ -19,12 +19,26 @@
  • + + +
  • + +
  • @@ -45,18 +59,21 @@
    @@ -67,15 +84,17 @@