Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleRepliedDao.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch;
+import com.yonge.cooleshow.biz.dal.vo.CourseRepliedVo;
 import com.yonge.cooleshow.biz.dal.vo.MyRepliedVo;
 import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
@@ -51,4 +52,11 @@ public interface CourseScheduleRepliedDao extends BaseMapper<CourseScheduleRepli
 	 * @Date: 2022/4/13
 	 */
 	void insertReplied(@Param("param") CourseScheduleReplied replied);
+
+	/**
+	 * @Description: 查询评价详情
+	 * @Author: cy
+	 * @Date: 2022/4/19
+	 */
+    CourseRepliedVo selectReplied(CourseScheduleReplied replied);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseRepliedService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
+import com.yonge.cooleshow.biz.dal.vo.CourseRepliedVo;
 import com.yonge.cooleshow.biz.dal.vo.MyRepliedVo;
 
 /**
@@ -14,7 +15,7 @@ import com.yonge.cooleshow.biz.dal.vo.MyRepliedVo;
 public interface CourseRepliedService extends IService<CourseScheduleReplied> {
     void replied(CourseScheduleReplied replied, SysUser sysUser);
 
-    CourseScheduleReplied selectReplied(CourseScheduleReplied replied);
+    CourseRepliedVo selectReplied(CourseScheduleReplied replied);
 
     IPage<MyRepliedVo> myReplied(IPage<MyRepliedVo> page, MyCourseSearch search);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseRepliedServiceImpl.java

@@ -13,6 +13,7 @@ import com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.service.CourseRepliedService;
+import com.yonge.cooleshow.biz.dal.vo.CourseRepliedVo;
 import com.yonge.cooleshow.biz.dal.vo.MyRepliedVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -123,13 +124,14 @@ public class CourseRepliedServiceImpl extends ServiceImpl<CourseScheduleRepliedD
      * @Date: 2022/4/12
      */
     @Override
-    public CourseScheduleReplied selectReplied(CourseScheduleReplied replied) {
-        QueryWrapper<CourseScheduleReplied> wrapper = new QueryWrapper<>();
-        wrapper.eq("course_group_type_", CourseScheduleEnum.PRACTICE);
-        wrapper.eq("student_id_", replied.getStudentId());
-        wrapper.eq("course_schedule_id_", replied.getCourseScheduleId());
-        wrapper.eq("course_group_id_", replied.getCourseGroupId());
-        return repliedDao.selectOne(wrapper);
+    public CourseRepliedVo selectReplied(CourseScheduleReplied replied) {
+//        QueryWrapper<CourseScheduleReplied> wrapper = new QueryWrapper<>();
+//        wrapper.eq("course_group_type_", CourseScheduleEnum.PRACTICE);
+//        wrapper.eq("student_id_", replied.getStudentId());
+//        wrapper.eq("course_schedule_id_", replied.getCourseScheduleId());
+//        wrapper.eq("course_group_id_", replied.getCourseGroupId());
+        CourseRepliedVo repliedVo=repliedDao.selectReplied(replied);
+        return repliedVo;
     }
 
     /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseRepliedVo.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+/**
+ * @Author: cy
+ * @Date: 2022/4/19
+ */
+@ApiModel(value = "CourseRepliedVo")
+public class CourseRepliedVo extends CourseScheduleReplied {
+    @ApiModelProperty("用户名")
+    private String userName;
+
+    @ApiModelProperty("头像地址")
+    private String avatar;
+
+    @ApiModelProperty("上课日期")
+    private String classDate;
+
+    @ApiModelProperty("上课时间")
+    private String startTime;
+
+    @ApiModelProperty("下课时间")
+    private String endTime;
+
+    @ApiModelProperty("课程状态 NOT_START未开始 ING进行中 COMPLETE已完成 CANCEL已取消")
+    private String status;
+
+    @ApiModelProperty("声部id")
+    private Integer subjectId;
+
+    @ApiModelProperty("声部名称")
+    private String subjectName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(String classDate) {
+        this.classDate = classDate;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleRepliedMapper.xml

@@ -133,4 +133,28 @@
             AND DATE_FORMAT(s.class_date_,'%Y-%m') = #{param.classDate}
         </if>
     </select>
+    <select id="selectReplied" resultType="com.yonge.cooleshow.biz.dal.vo.CourseRepliedVo"
+            parameterType="com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied">
+        SELECT
+            <include refid="baseColumns"/>,
+            u.username_ AS userName,
+            u.avatar_ AS avatar,
+
+            s.class_date_ AS classDate,
+            s.start_time_ AS startTime,
+            s.end_time_ AS endTime,
+            s.status_ AS status,
+
+            g.subject_id_ AS subjectId,
+            sb.name_ AS subjectName
+        FROM course_schedule_replied t
+        LEFT JOIN sys_user u ON t.student_id_=u.id_
+        LEFT JOIN course_schedule s ON t.course_schedule_id_=s.id_
+        LEFT JOIN course_group g ON t.course_group_id_=g.id_
+        LEFT JOIN `subject` sb ON g.subject_id_=sb.id_
+        WHERE t.student_id_=#{studentId}
+        AND t.course_schedule_id_=#{courseScheduleId}
+        AND t.course_group_id_=#{courseGroupId}
+        AND t.course_group_type_=#{courseGroupType}
+    </select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/PracticeMapper.xml

@@ -37,6 +37,9 @@
 		<if test="null != param.subjectId">
 			AND s.id_ = #{param.subjectId}
 		</if>
+		<if test="null != param.status and '' != param.status">
+			AND cs.status_ = #{param.status}
+		</if>
 		<if test="param.startTime !=null">
 			<![CDATA[AND p.created_time_ >= #{param.startTime} ]]>
 		</if>
@@ -76,6 +79,9 @@
 		<if test="null != param.orderNo and '' != param.orderNo">
 			AND p.order_no_ = #{param.orderNo}
 		</if>
+		<if test="null != param.status and '' != param.status">
+			AND cs.status_ = #{param.status}
+		</if>
 		<if test="null != param.subjectId">
 			AND s.id_ = #{param.subjectId}
 		</if>

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/CourseRepliedController.java

@@ -8,6 +8,7 @@ import com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.service.CourseRepliedService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.vo.CourseRepliedVo;
 import com.yonge.cooleshow.biz.dal.vo.MyRepliedVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -46,7 +47,7 @@ public class CourseRepliedController extends BaseController {
 
     @ApiOperation(value = "首页-我的课程-课程详情-查询陪练课评价")
     @PostMapping(value = "/selectReplied")
-    public HttpResponseResult<CourseScheduleReplied> selectReplied(@Validated @RequestBody CourseScheduleReplied replied) {
+    public HttpResponseResult<CourseRepliedVo> selectReplied(@Validated @RequestBody CourseScheduleReplied replied) {
         replied.setCourseGroupType(CourseScheduleEnum.PRACTICE.getCode());
         return succeed(repliedService.selectReplied(replied));
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/CourseScheduleController.java

@@ -85,7 +85,22 @@ public class CourseScheduleController extends BaseController {
         return succeed(courseScheduleService.createPracticeCourseCalender(param));
     }
 
-    @ApiOperation("老师端-首页-我的课程-陪练课")
+    @ApiOperation(value = "陪练课查询",
+            notes = "老师端-首页-我的课程-陪练课\n" +
+            "search:{\"classMonth\":\"2022-03\",\"status\":\"COMPLETE\",\"subjectId\":1}\n" +
+            "\n" +
+            "老师端-首页-课后评价\n" +
+            "search:{\"classMonth\":\"2022-03\",\"replied\":0,\"studentName\":\"测试王\"}\n" +
+            "\n" +
+            "老师端-我的-我的主页\n" +
+            "search:{\"classMonth\":\"2022-03\"}\n" +
+            "\n" +
+            "老师端-课表\n" +
+            "search:{\"classDate\":\"2022-03-27\"}\n" +
+            "     search:{\"classMonth\":\"2022-03\"}\n" +
+            "\n" +
+            "老师端-课表-陪练课\n" +
+            "     search:{\"classDate\":\"2022-03-27\"}")
     @PostMapping("/queryTeacherPracticeCourse")
     public HttpResponseResult<PageInfo<MyCourseVo>> queryTeacherPracticeCourse(@RequestBody MyCourseSearch search) {
         SysUser user = sysUserFeignService.queryUserInfo();