作业改版

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/LessonExaminationDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.biz.dal.dto.LessonExaminationResultDto;
+import com.ym.mec.biz.dal.dto.LessonExaminationResultDto1;
 import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
 import com.ym.mec.biz.dal.entity.LessonExamination;
 import org.apache.ibatis.annotations.Param;
@@ -22,5 +23,9 @@ public interface LessonExaminationDao extends BaseMapper<LessonExamination> {
     List<LessonExaminationResultDto> queryPage(Map<String, Object> params);
 
     int findCount(Map<String, Object> params);
+
+    List<LessonExaminationResultDto1> queryPageByStudent(Map<String, Object> params);
+
+    int findCountByStudent(Map<String, Object> params);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/LessonExaminationResultDto2.java

@@ -0,0 +1,53 @@
+package com.ym.mec.biz.dal.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ * @author zx
+ * @since 2023-04-03 18:20:36
+ */
+@Data
+public class LessonExaminationResultDto2 {
+
+    @ApiModelProperty(value = "测验编号")
+    private Long id;
+
+    @ApiModelProperty(value = "分部")
+    private String organName;
+
+    @ApiModelProperty(value = "班级名称")
+    private String classGroupName;
+
+    @ApiModelProperty(value = "班级编号")
+    private Long classGroupId;
+
+    @ApiModelProperty(value = "乐团名称")
+    private String musicGroupName;
+
+    @ApiModelProperty(value = "老师姓名")
+    private String teacherName;
+
+    @ApiModelProperty(value = "老师编号")
+    private Integer teacherId;
+
+    @ApiModelProperty(value = "布置时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "截止日期")
+    private String expireDate;
+
+    @ApiModelProperty(value = "达标人数")
+    private Integer standardNum;
+
+    @ApiModelProperty(value = "训练人数")
+    private Integer trainingNum;
+
+    @ApiModelProperty(value = "预计人数")
+    private Integer expectNum;
+}
+

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/LessonExaminationSubmitDto.java

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.dal.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author zx
+ * @since 2023-04-03 18:20:36
+ */
+@Data
+public class LessonExaminationSubmitDto {
+    @ApiModelProperty(value = "测验编号")
+    private Long LessonExaminationId;
+
+    @ApiModelProperty(value = "学员编号")
+    private Integer userId;
+
+    @ApiModelProperty(value = "测评分数")
+    private Integer score;
+}
+

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentLessonExaminationDetailDto1.java

@@ -0,0 +1,24 @@
+package com.ym.mec.biz.dal.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author zx
+ * @since 2023-04-03 18:20:36
+ */
+@Data
+public class StudentLessonExaminationDetailDto1 {
+
+    @ApiModelProperty(value = "曲谱名称")
+    private String musicScoreName;
+
+    @ApiModelProperty(value = "练习最高分数")
+    private Integer trainingScore;
+
+    @ApiModelProperty(value = "合格分数")
+    private Integer score;
+}
+

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentLessonExaminationDto1.java

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * @author zx
+ * @since 2023-04-03 18:20:36
+ */
+@Data
+public class StudentLessonExaminationDto1 {
+
+    @ApiModelProperty(value = "学员姓名")
+    private String username;
+
+    @ApiModelProperty(value = "学员手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "测评分数")
+    private Integer score;
+
+    @ApiModelProperty(value = "学员编号")
+    private Integer userId;
+
+    @ApiModelProperty(value = "声部")
+    private String subjectName;
+
+    private List<StudentLessonExaminationDetailDto1> detailDtos;
+}
+

mec-biz/src/main/java/com/ym/mec/biz/dal/page/LessonExaminationQueryInfo2.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LessonExaminationQueryInfo2 extends QueryInfo {
+
+    @ApiModelProperty(value = "分部")
+    private String organId;
+
+    @ApiModelProperty(value = "布置时间(年月日)")
+    private String startTime;
+
+    @ApiModelProperty(value = "布置时间（年月日）")
+    private String endTime;
+
+    @ApiModelProperty(value = "测验是否截止")
+    private Boolean expireFlag;
+
+    @ApiModelProperty(value = "是否达标")
+    private Boolean standardFlag;
+
+    @ApiModelProperty(value = "乐团编号")
+    private String musicGroupId;
+}

mec-biz/src/main/java/com/ym/mec/biz/service/LessonExaminationService.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.biz.dal.dao.LessonExaminationDao;
 import com.ym.mec.biz.dal.dto.LessonExaminationResultDto;
 import com.ym.mec.biz.dal.dto.LessonExaminationResultDto1;
+import com.ym.mec.biz.dal.dto.LessonExaminationResultDto2;
 import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
 import com.ym.mec.biz.dal.entity.LessonExamination;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo1;
+import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo2;
 import com.ym.mec.common.page.PageInfo;
 
 import java.util.List;
@@ -27,5 +29,7 @@ public interface LessonExaminationService extends IService<LessonExamination> {
     PageInfo<LessonExaminationResultDto> queryPage(LessonExaminationQueryInfo queryInfo);
 
     PageInfo<LessonExaminationResultDto1> queryPageByStudent(LessonExaminationQueryInfo1 queryInfo);
+
+    PageInfo<LessonExaminationResultDto2> queryPageByWeb(LessonExaminationQueryInfo2 queryInfo);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/StudentLessonExaminationService.java

@@ -3,7 +3,9 @@ package com.ym.mec.biz.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.biz.dal.dao.StudentLessonExaminationDao;
 import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
+import com.ym.mec.biz.dal.dto.LessonExaminationSubmitDto;
 import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto;
+import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto1;
 import com.ym.mec.biz.dal.entity.StudentLessonExamination;
 import com.ym.mec.biz.dal.page.StudentLessonExaminationQueryInfo;
 import com.ym.mec.common.page.PageInfo;
@@ -23,5 +25,16 @@ public interface StudentLessonExaminationService extends IService<StudentLessonE
     void save(Long lessonExaminationId, String[] studentIds);
 
     PageInfo<StudentLessonExaminationDto> queryPage(StudentLessonExaminationQueryInfo queryInfo);
+
+    /**
+    * @description: 提交作业
+     * @param submitDto
+    * @return void
+    * @author zx
+    * @date 2023/4/4 19:25
+    */
+    void submit(LessonExaminationSubmitDto submitDto);
+
+    PageInfo<StudentLessonExaminationDto1> queryPageByWeb(Integer studentLessonExaminationId);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/LessonExaminationServiceImpl.java

@@ -3,14 +3,12 @@ package com.ym.mec.biz.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.dao.LessonExaminationDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dto.LessonExaminationDetailDto;
-import com.ym.mec.biz.dal.dto.LessonExaminationResultDto;
-import com.ym.mec.biz.dal.dto.LessonExaminationResultDto1;
-import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.LessonExamination;
 import com.ym.mec.biz.dal.entity.StudentLessonExamination;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo1;
+import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo2;
 import com.ym.mec.biz.service.LessonExaminationService;
 import com.ym.mec.biz.service.StudentLessonExaminationDetailService;
 import com.ym.mec.biz.service.StudentLessonExaminationService;
@@ -104,6 +102,25 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
 
     @Override
     public PageInfo<LessonExaminationResultDto1> queryPageByStudent(LessonExaminationQueryInfo1 queryInfo) {
+        PageInfo<LessonExaminationResultDto1> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+        List<LessonExaminationResultDto1> dataList = null;
+        int count = baseMapper.findCountByStudent(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = baseMapper.queryPageByStudent(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
+
+    @Override
+    public PageInfo<LessonExaminationResultDto2> queryPageByWeb(LessonExaminationQueryInfo2 queryInfo) {
         return null;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentLessonExaminationServiceImpl.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.dao.StudentLessonExaminationDao;
 import com.ym.mec.biz.dal.dao.StudentLessonExaminationDetailDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dto.LessonExaminationDetailDto;
-import com.ym.mec.biz.dal.dto.LessonExaminationResultDto;
-import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
-import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.StudentLessonExamination;
 import com.ym.mec.biz.dal.entity.StudentLessonExaminationDetail;
 import com.ym.mec.biz.dal.page.StudentLessonExaminationQueryInfo;
@@ -78,5 +75,16 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void submit(LessonExaminationSubmitDto submitDto) {
+
+    }
+
+    @Override
+    public PageInfo<StudentLessonExaminationDto1> queryPageByWeb(Integer studentLessonExaminationId) {
+        return null;
+    }
 }
 

mec-biz/src/main/resources/config/mybatis/LessonExaminationMapper.xml

@@ -71,4 +71,17 @@
         </where>
     </sql>
 
+    <select id="queryPageByStudent" resultType="com.ym.mec.biz.dal.dto.LessonExaminationResultDto1">
+        select le.expire_date_ expireDate,cg.name_ classGroupName,mg.name_ musicGroupName,le.expect_num_ expectNum,
+               le.training_num_ trainingNum,le.standard_num_ standardNum,sle.score_
+        from student_lesson_examination sle
+        left join lesson_examination le ON sle.lesson_examination_id_ = le.id_
+        left join class_group cg ON cg.id_ = le.class_group_id_
+        left join music_group mg ON mg.id_ = cg.music_group_id_
+        GROUP BY le.id_ ORDER BY le.id_ DESC
+    </select>
+    <select id="findCountByStudent" resultType="java.lang.Integer">
+
+    </select>
+
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/LessonExaminationController.java

@@ -1,9 +1,7 @@
 package com.ym.mec.student.controller;
 
 
-import com.ym.mec.biz.dal.dto.LessonExaminationResultDto;
 import com.ym.mec.biz.dal.dto.LessonExaminationResultDto1;
-import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo1;
 import com.ym.mec.biz.service.LessonExaminationService;
 import com.ym.mec.biz.service.SysUserService;

mec-student/src/main/java/com/ym/mec/student/controller/StudentLessonExaminationController.java

@@ -1,12 +1,12 @@
 package com.ym.mec.student.controller;
 
 
+import com.ym.mec.biz.dal.dto.LessonExaminationSubmitDto;
 import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto;
 import com.ym.mec.biz.dal.page.StudentLessonExaminationQueryInfo;
 import com.ym.mec.biz.service.StudentLessonExaminationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,17 +32,20 @@ public class StudentLessonExaminationController extends BaseController {
     @Resource
     private StudentLessonExaminationService studentLessonExaminationService;
 
-    @ApiOperation(value = "获取学员评测列表")
-    @PostMapping("queryPage")
-    public HttpResponseResult<PageInfo<StudentLessonExaminationDto>> queryPage(@RequestBody StudentLessonExaminationQueryInfo queryInfo) {
-        return succeed(studentLessonExaminationService.queryPage(queryInfo));
-    }
-
     @ApiOperation(value = "获取单个学员评测")
     @PostMapping("getOne")
     public HttpResponseResult<StudentLessonExaminationDto> getOne(@RequestBody StudentLessonExaminationQueryInfo queryInfo) {
         return succeed(studentLessonExaminationService.queryPage(queryInfo).getRows().get(0));
     }
 
+    @ApiOperation(value = "提交作业")
+    @PostMapping("submit")
+    public HttpResponseResult submit(@RequestBody LessonExaminationSubmitDto submitDto) {
+        studentLessonExaminationService.submit(submitDto);
+        return succeed();
+    }
+
+
+
 }
 

mec-web/src/main/java/com/ym/mec/web/controller/LessonExaminationController.java

@@ -0,0 +1,45 @@
+package com.ym.mec.web.controller;
+
+
+import com.ym.mec.biz.dal.dto.LessonExaminationResultDto1;
+import com.ym.mec.biz.dal.dto.LessonExaminationResultDto2;
+import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo1;
+import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo2;
+import com.ym.mec.biz.service.LessonExaminationService;
+import com.ym.mec.biz.service.SysUserService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 进度评测表(LessonExamination)表控制层
+ *
+ * @author zx
+ * @since 2023-04-03 18:20:19
+ */
+@Api(tags = "进度评测表")
+@RestController
+@RequestMapping("/lessonExamination")
+public class LessonExaminationController extends BaseController {
+
+    @Resource
+    private LessonExaminationService lessonExaminationService;
+    @Resource
+    private SysUserService sysUserService;
+
+    @ApiOperation(value = "获取作业列表")
+    @PostMapping("queryPage")
+    public HttpResponseResult<PageInfo<LessonExaminationResultDto2>> queryPage(@RequestBody LessonExaminationQueryInfo2 queryInfo) {
+        return succeed(lessonExaminationService.queryPageByWeb(queryInfo));
+    }
+
+}
+

mec-web/src/main/java/com/ym/mec/web/controller/StudentLessonExaminationController.java

@@ -0,0 +1,40 @@
+package com.ym.mec.web.controller;
+
+
+import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto1;
+import com.ym.mec.biz.service.StudentLessonExaminationService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 学生进度评测表(StudentLessonExamination)表控制层
+ *
+ * @author zx
+ * @since 2023-04-03 18:21:30
+ */
+@Api(tags = "学生进度评测表")
+@RestController
+@RequestMapping("/studentLessonExamination")
+public class StudentLessonExaminationController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private StudentLessonExaminationService studentLessonExaminationService;
+
+    @ApiOperation(value = "获取评测学员列表")
+    @PostMapping("queryPage")
+    public HttpResponseResult<PageInfo<StudentLessonExaminationDto1>> queryPage(Integer studentLessonExaminationId) {
+        return succeed(studentLessonExaminationService.queryPageByWeb(studentLessonExaminationId));
+    }
+
+}
+