Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into dev

# Conflicts:
#	mec-application/src/main/java/com/ym/mec/vo/MusicSheetVo.java
#	mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreAccompaniment.java

mec-application/src/main/java/com/ym/mec/vo/MusicSheetVo.java

@@ -397,13 +397,13 @@ public class MusicSheetVo {
         @ApiModelProperty("谱面类型")
         private String scoreType;
 
-        @ApiModelProperty("是否是特殊打击乐")
-        private Boolean specialPercussionFlag;
-
-
 
         @ApiModelProperty("使用状态 试用： FREE 锁定： LOCK 解锁：UNLOCK")
         private String useStatus;
+
+        @ApiModelProperty("是否是特殊打击乐")
+        private Boolean specialPercussionFlag;
+
     }
 
     @Data

mec-application/src/main/java/com/ym/mec/web/controller/MusicSheetController.java

@@ -155,6 +155,7 @@ public class MusicSheetController {
             musicSheet.setUsedNum(0L);
             musicSheet.setPaymentType(StringUtils.isNotBlank(o.getRankIds()) && o.getRankIds().contains("1") ? "VIP" : "FREE");
             musicSheet.setAudioPlayTypes(o.getAudioPlayTypes());
+            musicSheet.setUseStatus(o.getUseStatus());
 
             return musicSheet;
         });

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -50,6 +51,6 @@ public class StudentLessonExaminationDto {
     private String memo;
 
     @ApiModelProperty("作业详情")
-    private StudentLessonExaminationDetailDto studentLessonExaminationDetail;
+    private List<StudentLessonExaminationDetailDto> studentLessonExaminationDetailList;
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreAccompaniment.java

@@ -147,9 +147,6 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("伴奏固定调PDF文件")
 	private String accJianPdfUrl;
 
-	@ApiModelProperty("使用状态 试用： FREE 锁定： LOCK 解锁：UNLOCK")
-	private String useStatus;
-
 	@ApiModelProperty("五线谱图片")
 	private String musicImg;
 
@@ -159,6 +156,9 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("固定调图片")
 	private String musicJianImg;
 
+	@ApiModelProperty("使用状态 试用： FREE 锁定： LOCK 解锁：UNLOCK")
+	private String useStatus;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -106,7 +106,7 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
             params.put("offset", pageInfo.getOffset());
             dataList = baseMapper.queryPage(params);
             if(queryInfo.getLessonExaminationId() != null){
-                Map<Integer, StudentLessonExaminationDetail> examinationIdMap = new HashMap<>();
+                Map<Integer, List<StudentLessonExaminationDetail>> examinationIdMap = new HashMap<>();
                 LessonExamination lessonExamination = lessonExaminationService.getById(queryInfo.getLessonExaminationId());
                 if(queryInfo.getLessonExaminationId() != null && lessonExamination !=null){
                     List<StudentLessonExaminationDetail> list = studentLessonExaminationDetailService.lambdaQuery().
@@ -119,32 +119,37 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
                             musicScoreMap = musicScores.stream().collect(Collectors.toMap(SysMusicScore::getId, e -> e));
                         }
                     }
-                    examinationIdMap = list.stream().collect(Collectors.groupingBy(StudentLessonExaminationDetail::getUserId,
-                            Collectors.collectingAndThen(Collectors.toList(), e -> e.get(0))));
+                    examinationIdMap = list.stream().collect(Collectors.groupingBy(StudentLessonExaminationDetail::getUserId, Collectors.toList()));
                     boolean expireFlag = false;
                     if (lessonExamination.getFileExpireDay() != null && lessonExamination.getFileExpireDay() >0) {
                         expireFlag = DateUtil.addDays(lessonExamination.getExpireDate(), lessonExamination.getFileExpireDay()).before(new Date());
                     }
                     for (StudentLessonExaminationDto dto : dataList) {
-                        StudentLessonExaminationDetail detail = examinationIdMap.get(dto.getUserId());
-                        if (detail != null ) {
-                            String fileJson1 = detail.getFileJson();
-                            detail.setFileJson(null);
-                            StudentLessonExaminationDetailDto detailDto = JSON.parseObject(JSON.toJSONString(detail), StudentLessonExaminationDetailDto.class);
-                            detailDto.setFileJson(JSON.parseArray(fileJson1, CourseHomeworkWrapper.FileJson.class));
-                            if(detail.getMusicScoreId() != null && "MUSIC_SCORE".equals(detail.getHomeworkType())){
-                                SysMusicScore musicScore = musicScoreMap.get(detail.getMusicScoreId().intValue());
-                                if (musicScore != null){
-                                    detailDto.setMusicScoreName(musicScore.getName());
+                        List<StudentLessonExaminationDetail> detailList = examinationIdMap.get(dto.getUserId());
+                        if (CollectionUtils.isNotEmpty(detailList)) {
+                            List<StudentLessonExaminationDetailDto> studentLessonExaminationDetailList = new ArrayList<>();
+                            for (StudentLessonExaminationDetail detail : detailList) {
+                                dto.setMemo(detail.getMemo());
+                                String fileJson1 = detail.getFileJson();
+                                detail.setFileJson(null);
+                                StudentLessonExaminationDetailDto detailDto = JSON.parseObject(JSON.toJSONString(detail), StudentLessonExaminationDetailDto.class);
+                                if (detail.getMusicScoreId() != null && "MUSIC_SCORE".equals(detail.getHomeworkType())) {
+                                    SysMusicScore musicScore = musicScoreMap.get(detail.getMusicScoreId().intValue());
+                                    if (musicScore != null) {
+                                        detailDto.setMusicScoreName(musicScore.getName());
+                                    }
                                 }
-                            }
-                            if (CollectionUtils.isNotEmpty(detailDto.getFileJson())) {
-                                for (CourseHomeworkWrapper.FileJson fileJson : detailDto.getFileJson()) {
-                                    fileJson.setExpireFlag(expireFlag);
+                                if (StringUtils.isNotEmpty(fileJson1)) {
+                                    detailDto.setFileJson(JSON.parseArray(fileJson1, CourseHomeworkWrapper.FileJson.class));
+                                    if (CollectionUtils.isNotEmpty(detailDto.getFileJson())) {
+                                        for (CourseHomeworkWrapper.FileJson fileJson : detailDto.getFileJson()) {
+                                            fileJson.setExpireFlag(expireFlag);
+                                        }
+                                    }
                                 }
+                                studentLessonExaminationDetailList.add(detailDto);
                             }
-                            dto.setStudentLessonExaminationDetail(detailDto);
-                            dto.setMemo(detailDto.getMemo());
+                            dto.setStudentLessonExaminationDetailList(studentLessonExaminationDetailList);
                         }
                     }
                 }
@@ -200,10 +205,6 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
                 //更新分数
                 detail.setActualAvgScore(actualScore.intValue() > detail.getAvgScore() ? detail.getAvgScore() : actualScore.intValue());
             }
-            //更新总分
-            if(flag){
-                baseMapper.updateTrainingScore(lessonExaminationId,userId);
-            }
         }
         //更新详情
         detail.setTrainingTime(now);
@@ -216,6 +217,9 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
             detail.setFileJson(JSON.toJSONString(submitDto.getFileJson()));
         }
         studentLessonExaminationDetailService.updateById(detail);
+
+        //更新总分
+        baseMapper.updateTrainingScore(lessonExaminationId,userId);
         //更新达标人数
         lessonExaminationDao.updateStandardNum(lessonExaminationId);
 

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

@@ -705,7 +705,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
 
         imUserFriendService.refreshGroupImUserFriend(studentRegistration.getMusicGroupId(), null);
         //缴费项目详情
-//        MusicGroupPaymentCalenderDetail paymentCalenderDetail = musicGroupPaymentCalenderDetailService.addCalenderDetail(studentPaymentOrder);
+        MusicGroupPaymentCalenderDetail paymentCalenderDetail = musicGroupPaymentCalenderDetailService.addCalenderDetail(studentPaymentOrder);
 
         //销售订单详情
         if (allDetails.size() > 0 && (detailTypeEnums.contains(MUSICAL) || detailTypeEnums.contains(ACCESSORIES) || detailTypeEnums.contains(TEACHING))) {

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

@@ -1245,7 +1245,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Override
     public List<IndexCloudStudySumDto> getCloudStudyStudentOverViewList(List<Integer> organIdsList) {
         List<IndexCloudStudySumDto> list = studentDao.getCloudStudyStudentOverViewList(organIdsList);
-        Set<Integer> organIds = list.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
+        if (CollectionUtils.isEmpty(list)) {
+            return list;
+        }
+        Set<Integer> organIds = list.stream().map(IndexCloudStudySumDto::getOrganId).collect(Collectors.toSet());
         Map<Integer,String> organMap = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
         //获取待激活学员数
         Map<Integer,Long> waitMap = MapUtil.convertIntegerMap(cloudTeacherOrderDao.getWaitActivateMap(organIdsList));

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

@@ -94,7 +94,6 @@ public class TenantConfigServiceImpl extends ServiceImpl<TenantConfigDao, Tenant
                 result.put(e.getMemberRankSettingId(), memberConfig.getDayDivide().compareTo(BigDecimal.ZERO) == 0 &&
                         memberConfig.getMonthDivide().compareTo(BigDecimal.ZERO) == 0 &&
                         memberConfig.getHalfYearDivide().compareTo(BigDecimal.ZERO) == 0 &&
-                        memberConfig.getQuarterDivide().compareTo(BigDecimal.ZERO) == 0 &&
                         memberConfig.getYearDivide().compareTo(BigDecimal.ZERO) == 0);
             });
         }

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

@@ -183,6 +183,7 @@
         <foreach collection="memberIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
+		and mrs.del_flag_ = 0
         group by mrs.id_
     </select>
 </mapper>

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

@@ -1245,7 +1245,7 @@
     </select>
     <select id="queryVipQuitOrder" resultType="com.ym.mec.biz.dal.entity.StudentPaymentOrder">
         SELECT spo.* FROM student_payment_order spo
-        left join class_group_student_mapper cgsm ON spo.class_group_id_ = cgsm.class_group_id_ and spo.music_group_id_ = cgsm.music_group_id_
+        left join class_group_student_mapper cgsm ON spo.class_group_id_ = cgsm.class_group_id_ and spo.music_group_id_ = cgsm.music_group_id_ AND spo.user_id_ = cgsm.user_id_
         WHERE cgsm.music_group_id_ = #{vipGroupId} AND cgsm.status_ != 'QUIT'
         AND spo.type_ IN ('LIVE_GROUP_BUY','SMALL_CLASS_TO_BUY')
         AND spo.status_ = 'SUCCESS'  AND spo.class_group_id_ = cgsm.class_group_id_ and spo.music_group_id_ = cgsm.music_group_id_

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

@@ -56,6 +56,9 @@
         <if test="param.usageStatus !=null">
             and scc.usage_status_ = #{param.usageStatus}
         </if>
+        <if test="param.search != null and param.search != ''">
+            and (su.username_ like concat('%',#{param.search},'%') or su.phone_ like concat('%',#{param.search},'%') or su.id_ = #{param.search})
+        </if>
     </select>
 
     <select id="queryIssueRecord" parameterType="map" resultType="com.ym.mec.biz.dal.vo.CouponIssueRecordVo">

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

@@ -25,7 +25,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="WaitSendMessage">
-		SELECT * FROM wait_send_message where tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT * FROM wait_send_message ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->