作业列表查询

mec-education/src/main/java/com/ym/mec/education/base/BaseResponse.java

@@ -37,4 +37,18 @@ public class BaseResponse<T> extends Response implements Serializable {
         baseResponse.setDataInfo(dataInfo);
         return baseResponse;
     }
+
+    public static BaseResponse failParams() {
+        BaseResponse baseResponse = new BaseResponse<>();
+        baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
+        baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
+        return baseResponse;
+    }
+
+    public static BaseResponse noDataExists() {
+        BaseResponse baseResponse = new BaseResponse<>();
+        baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
+        baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
+        return baseResponse;
+    }
 }

mec-education/src/main/java/com/ym/mec/education/controller/HomeWorkController.java

@@ -8,6 +8,8 @@ import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.StudentCourseHomework;
 import com.ym.mec.education.entity.SysUser;
+import com.ym.mec.education.enums.ReturnCodeEnum;
+import com.ym.mec.education.req.HomeWorkDetailReq;
 import com.ym.mec.education.req.HomeWorkReq;
 import com.ym.mec.education.req.MusicGroupReq;
 import com.ym.mec.education.resp.HomeWrokResp;
@@ -17,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,8 +46,6 @@ public class HomeWorkController {
     @Autowired
     private IStudentCourseHomeworkService studentCourseHomeworkService;
 
-    @Autowired
-    private ISysUserService sysUserService;
     /**
      * 服务降级处理
      *
@@ -57,6 +58,7 @@ public class HomeWorkController {
         return response;
     }
 
+
     /**
      *
      * @param req
@@ -67,4 +69,21 @@ public class HomeWorkController {
 
         return studentCourseHomeworkService.workList(req);
     }
+
+
+    /**
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping(value = "/workDetail")
+    public BaseResponse workDetail(@RequestBody HomeWorkDetailReq req) {
+        BaseResponse baseResponse = new BaseResponse();
+        if(req == null || req.getMusicGroupId() == null || req.getClassGroupId() == null || req.getWorkId() == null){
+            baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
+            baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
+            return baseResponse;
+        }
+        return studentCourseHomeworkService.getHomeWorkDetail(req);
+    }
 }

mec-education/src/main/java/com/ym/mec/education/mapper/StudentCourseHomeworkReplyMapper.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.StudentCourseHomeworkReply;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/req/HomeWorkDetailReq.java

@@ -0,0 +1,21 @@
+package com.ym.mec.education.req;
+
+import com.ym.mec.education.base.BaseQuery;
+import lombok.Data;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 20:59
+ */
+@Data
+public class HomeWorkDetailReq extends BaseQuery {
+
+
+    private Integer workId;
+    private String  classGroupId;
+
+    private String musicGroupId;
+
+    private String userId;
+}

mec-education/src/main/java/com/ym/mec/education/req/HomeWorkReq.java

@@ -12,4 +12,8 @@ import lombok.Data;
 public class HomeWorkReq extends BaseQuery {
 
     private String name;
+
+    private String  classGroupId;
+
+    private String musicGroupId;
 }

mec-education/src/main/java/com/ym/mec/education/resp/HomeWrokDetailResp.java

@@ -0,0 +1,45 @@
+package com.ym.mec.education.resp;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月26日 17:44
+ */
+
+@Data
+@ToString
+public class HomeWrokDetailResp implements Serializable {
+
+    private String name;
+
+    /**
+     * 图像
+     */
+    private String avatar;
+
+    private Integer userId;
+
+    private Integer classGroupId;
+
+    private String isReplied;
+
+    private String status;
+
+    private String remark;
+
+    private Integer score;
+
+    private String attachments;
+
+    private String groupName;
+
+    private String className;
+
+    private List<HomeworkReplyResp> HomeworkReplyList;
+}

mec-education/src/main/java/com/ym/mec/education/resp/HomeWrokResp.java

@@ -36,4 +36,5 @@ public class HomeWrokResp implements Serializable {
     private Integer score;
 
     private String attachments;
+
 }

mec-education/src/main/java/com/ym/mec/education/resp/HomeworkReplyResp.java

@@ -0,0 +1,43 @@
+package com.ym.mec.education.resp;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author : chengp
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月28日 14:11
+ */
+@Data
+@ToString
+public class HomeworkReplyResp implements Serializable {
+
+
+    private Long id;
+    /**
+     * 作业编号
+     */
+    private Long studentCourseHomeworkId;
+    /**
+     * 留言人编号
+     */
+    private Integer userId;
+    /**
+     * 留言内容
+     */
+    private String content;
+
+
+    private Date createTime;
+    /**
+     * 父级编号
+     */
+    private Long parentId;
+
+    private String name;
+    private String avatar;
+}

mec-education/src/main/java/com/ym/mec/education/service/IStudentCourseHomeworkReplyService.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.StudentCourseHomeworkReply;
-import com.baomidou.mybatisplus.service.IService;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/service/IStudentCourseHomeworkService.java

@@ -1,8 +1,10 @@
 package com.ym.mec.education.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.StudentCourseHomework;
+import com.ym.mec.education.req.HomeWorkDetailReq;
 import com.ym.mec.education.req.HomeWorkReq;
 
 /**
@@ -16,4 +18,6 @@ import com.ym.mec.education.req.HomeWorkReq;
 public interface IStudentCourseHomeworkService extends IService<StudentCourseHomework> {
 
     PageResponse workList(HomeWorkReq req);
+
+    BaseResponse getHomeWorkDetail(HomeWorkDetailReq req);
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentCourseHomeworkReplyServiceImpl.java

@@ -1,9 +1,9 @@
 package com.ym.mec.education.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.StudentCourseHomeworkReply;
 import com.ym.mec.education.mapper.StudentCourseHomeworkReplyMapper;
 import com.ym.mec.education.service.IStudentCourseHomeworkReplyService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -4,15 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
-import com.ym.mec.education.entity.StudentCourseHomework;
-import com.ym.mec.education.entity.SysUser;
+import com.ym.mec.education.entity.*;
 import com.ym.mec.education.enums.ReturnCodeEnum;
 import com.ym.mec.education.mapper.StudentCourseHomeworkMapper;
+import com.ym.mec.education.req.HomeWorkDetailReq;
 import com.ym.mec.education.req.HomeWorkReq;
+import com.ym.mec.education.resp.HomeWrokDetailResp;
 import com.ym.mec.education.resp.HomeWrokResp;
-import com.ym.mec.education.service.IStudentCourseHomeworkService;
-import com.ym.mec.education.service.ISysUserService;
+import com.ym.mec.education.resp.HomeworkReplyResp;
+import com.ym.mec.education.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,7 +40,14 @@ public class StudentCourseHomeworkServiceImpl extends ServiceImpl<StudentCourseH
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private IClassGroupService classGroupService;
+
+    @Autowired
+    private IMusicGroupService musicGroupService;
 
+    @Autowired
+    private IStudentCourseHomeworkReplyService studentCourseHomeworkReplyService;
 
     @Override
     public PageResponse workList(HomeWorkReq req) {
@@ -87,4 +96,50 @@ public class StudentCourseHomeworkServiceImpl extends ServiceImpl<StudentCourseH
         response.setTotal(Math.toIntExact(homeworkIPage.getTotal()));
         return response;
     }
+
+    /**
+     * 查询作业详情
+     * @param req
+     * @return
+     */
+    @Override
+    public BaseResponse getHomeWorkDetail(HomeWorkDetailReq req) {
+
+        HomeWrokDetailResp resp = new HomeWrokDetailResp();
+        MusicGroup musicGroup = musicGroupService.getById(req.getMusicGroupId());
+        if(musicGroup == null){
+            return  BaseResponse.noDataExists();
+        }
+        ClassGroup classGroup =  classGroupService.getById(req.getClassGroupId());
+        if(classGroup == null){
+            return  BaseResponse.noDataExists();
+        }
+        StudentCourseHomework homework = this.getById(req.getWorkId());
+        if(homework == null){
+            return  BaseResponse.noDataExists();
+        }
+        BeanUtils.copyProperties(homework,resp);
+        resp.setGroupName(musicGroup.getName());
+        resp.setClassName(classGroup.getName());
+
+        //回复留言
+        QueryWrapper<StudentCourseHomeworkReply> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("student_course_homework_id_",req.getWorkId());
+        List<StudentCourseHomeworkReply> replyList = studentCourseHomeworkReplyService.list(queryWrapper);
+        List<HomeworkReplyResp> replyResps = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(replyList)){
+            replyList.forEach(r ->{
+                HomeworkReplyResp replyResp = new HomeworkReplyResp();
+                BeanUtils.copyProperties(r,replyResp);
+                SysUser sysUser = sysUserService.getById(r.getUserId());
+                if(sysUser != null){
+                    replyResp.setName(sysUser.getRealName());
+                    replyResp.setAvatar(sysUser.getAvatar());
+                }
+                replyResps.add(replyResp);
+            });
+            resp.setHomeworkReplyList(replyResps);
+        }
+        return BaseResponse.success(resp);
+    }
 }