Browse Source

学生课程列表接口修改

周箭河 5 years ago
parent
commit
159f8d0072

+ 4 - 2
mec-biz/src/main/resources/config/mybatis/CourseScheduleReviewMapper.xml

@@ -148,7 +148,7 @@
                 AND pg.buy_months_ IS NULL
             </if>
             <if test="studentReview !=null">
-                AND pg.student_review_ =#{studentReview}
+                AND csc.score_ =#{studentReview}
             </if>
             <if test='hasReview !=null and hasReview=="1"'>
                 AND csr.id_ > 0
@@ -183,12 +183,13 @@
     <select id="getPracticeGroupReviewList" resultMap="CourseReviewDto">
         SELECT cs.id_,cs.class_date_, pg.subject_id_,pg.organ_id_,pg.name_ coursre_name_,su.real_name_
         teacher_name_,edsu.real_name_
-        edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csr.student_review_,csr.hand_homework_,csr.course_review_
+        edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csc.score_ student_review_,csr.hand_homework_,csr.course_review_
         FROM course_schedule cs
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
         LEFT JOIN sys_user edsu ON pg.educational_teacher_id_ = edsu.id_
         LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
+        LEFT JOIN course_schedule_complaints csc on csr.course_schedule_id_ = cs.id_
         <include refid="practiceGroupReviewsQueryCondition"/>
         <include refid="global.limit"/>
     </select>
@@ -197,6 +198,7 @@
         SELECT count(*) FROM course_schedule cs
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
         LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
+        LEFT JOIN course_schedule_complaints csc on csr.course_schedule_id_ = cs.id_
         <include refid="practiceGroupReviewsQueryCondition"/>
     </select>
 

+ 18 - 18
mec-web/src/main/java/com/ym/mec/web/controller/CourseReviewController.java

@@ -37,25 +37,25 @@ public class CourseReviewController extends BaseController {
 
     @ApiOperation(value = "网管课课程评论管理")
     @GetMapping("getPracticeGroup")
-    @PreAuthorize("@pcs.hasPermissions('courseReview/getPracticeGroup')")
+    //@PreAuthorize("@pcs.hasPermissions('courseReview/getPracticeGroup')")
     public Object getPracticeGroup(CourseReviewQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-                queryInfo.setOrganId(employee.getOrganIdList());
-            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
-                return failed("用户所在分部异常");
-            } else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
-                    return failed("非法请求");
-                }
-            }
-        }
+//        SysUser sysUser = sysUserFeignService.queryUserInfo();
+//        if (sysUser == null) {
+//            return failed("用户信息获取失败");
+//        }
+//        if (!sysUser.getIsSuperAdmin()) {
+//            Employee employee = employeeDao.get(sysUser.getId());
+//            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+//                queryInfo.setOrganId(employee.getOrganIdList());
+//            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+//                return failed("用户所在分部异常");
+//            } else {
+//                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+//                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+//                    return failed("非法请求");
+//                }
+//            }
+//        }
         return succeed(courseReviewService.findPracticeGroupReviews(queryInfo));
     }