Merge branch 'zx_saas_2022-_0505' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -62,6 +62,17 @@ public class WebCourseHomeworkListDto {
     @ApiModelProperty(value = "已回复数",required = false)
     private Integer repliedNum = 0;
 
+    @ApiModelProperty(value = "伴奏编号",required = false)
+    private String musicScoreId;
+
+    public String getMusicScoreId() {
+        return musicScoreId;
+    }
+
+    public void setMusicScoreId(String musicScoreId) {
+        this.musicScoreId = musicScoreId;
+    }
+
     public String getClassDate() {
         return classDate;
     }

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

@@ -588,4 +588,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     List<ClassGroup> queryStudentClassGroupsAndTeacher(String musicGroupId);
 
     CourseScheduleStatistics getMusicGroupCourseScheduleStatistics(queryMusicGroupCourseScheduleQueryInfo queryInfo);
+
+    //修改班级基本信息
+    int updateClassGroup(ClassGroup classGroup);
 }

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

@@ -3412,6 +3412,26 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateClassGroup(ClassGroup classGroup) {
+        ClassGroup group = classGroupDao.get(classGroup.getId());
+        if(Objects.isNull(group)){
+            throw new BizException("班级信息不存在");
+        }
+        String groupName = classGroup.getName();
+        if(StringUtils.isEmpty(groupName)){
+            throw new BizException("请填写班级名称");
+        }
+        classGroupDao.update(classGroup);
+        ImGroup imGroup = imGroupService.get(classGroup.getId().longValue());
+        if(!Objects.isNull(imGroup)){
+            imGroup.setName(groupName);
+            imGroupService.update(imGroup);
+        }
+        return 1;
+    }
+
+    @Override
     public PageInfo<MusicGroupCourseScheduleDto> queryMusicGroupCourseScheduleDetail(queryMusicGroupCourseScheduleQueryInfo queryInfo) {
         PageInfo<MusicGroupCourseScheduleDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();

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

@@ -285,13 +285,15 @@
 		<result property="classDate" column="class_date_"/>
 		<result property="classStartDate" column="start_class_time_"/>
 		<result property="classEndDate" column="end_class_time_"/>
+		<result property="musicScoreId" column="music_score_id_"/>
 	</resultMap>
     <select id="queryHomePage" resultMap="WebCourseHomeworkListDtoMap">
 		SELECT ch.id_,cs.id_ course_schedule_id_,cs.name_ course_schedule_name_,
 		cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.organ_id_,o.name_ organ_name_,
 		mg.id_ group_id_,mg.name_ group_name_,ch.create_time_,cs.actual_teacher_id_,
-		su.real_name_ actual_teacher_name_,ch.completed_num_,ch.expect_num_,cs.group_type_
+		su.real_name_ actual_teacher_name_,ch.completed_num_,ch.expect_num_,cs.group_type_,sch.music_score_id_
 		FROM course_homework ch
+		LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
 		LEFT JOIN course_schedule cs ON cs.id_ = ch.course_schedule_id_
 		LEFT JOIN organization o ON o.id_ = cs.organ_id_
 		<if test="groupType == 'MUSIC'">
@@ -305,6 +307,7 @@
 		</if>
 		LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
 		<include refid="queryHomePageSql"/>
+		GROUP BY ch.id_
 		ORDER BY ch.create_time_ DESC,ch.id_ DESC
 		<include refid="global.limit"/>
 	</select>

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

@@ -22,6 +22,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="organ_name_" property="organName" />
 		<result column="tenant_id_" property="tenantId" />
+		<result column="music_score_id_" property="musicScoreId" />
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -108,11 +109,13 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
-		SELECT ee.*,u.real_name_ username_,o.name_ organ_name_
-		FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
-		left join teacher t on t.id_ = ee.teacher_id_
-		left join organization o on o.id_ = t.organ_id_
+		SELECT ee.*,u.real_name_ username_,o.name_ organ_name_,eer.music_score_id_
+		FROM extracurricular_exercises ee LEFT JOIN sys_user u ON ee.teacher_id_ = u.id_
+		LEFT JOIN teacher t ON t.id_ = ee.teacher_id_
+		LEFT JOIN organization o ON o.id_ = t.organ_id_
+		LEFT JOIN extracurricular_exercises_reply eer ON ee.id_ = eer.extracurricular_exercises_id_
 		<include refid="queryPageCondition"/>
+		GROUP BY ee.id_
 		ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	

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

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.CourseScheduleStatistics;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.ExportTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.page.ClassGroupQueryInfo;
@@ -17,7 +19,6 @@ import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.*;
@@ -30,9 +31,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 @RequestMapping("classGroup")
@@ -64,6 +62,14 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.create(classGroup));
     }
 
+    @ApiOperation(value = "班级基本信息修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/update')")
+    public HttpResponseResult update(ClassGroup classGroup) throws Exception {
+        classGroup.setUpdateTime(new Date());
+        return succeed(classGroupService.updateClassGroup(classGroup));
+    }
+
     @ApiOperation(value = "新增单技班班级")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('classGroup/add')")
@@ -107,15 +113,6 @@ public class ClassGroupController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "修改班级")
-    @PostMapping("/update")
-    @PreAuthorize("@pcs.hasPermissions('classGroup/update')")
-    public Object update(ClassGroup classGroup) {
-        classGroup.setUpdateTime(new Date());
-        classGroupService.update(classGroup);
-        return succeed();
-    }
-
     @ApiOperation(value = "合奏班相关班级获取")
     @GetMapping("/findClassGroupAboutMix")
     @PreAuthorize("@pcs.hasPermissions('classGroup/findClassGroupAboutMix')")

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

@@ -1,16 +1,11 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,8 +13,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "课外训练服务")
@@ -32,8 +25,6 @@ public class ExtracurricularExercisesController extends BaseController {
     @Autowired
     private ExtracurricularExercisesReplyService extracurricularExercisesReplyService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
     private OrganizationService organizationService;
 
     @ApiOperation(value = "获取课外训练列表")