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

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

@@ -202,4 +202,11 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      * @return
      */
     List<ClassGroup> getReportCourseTimes(@Param("classGroupIds") List<Integer> classGroupIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 根据课程组id查询课程组详情
+     * @param id
+     * @return
+     */
+    PracticeCourseDto findByGroupId(@Param("id") Integer id);
 }

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

@@ -157,7 +157,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         courseScheduleReview.setEducationalTeacherId(practiceGroup.getEducationalTeacherId());
         courseScheduleReview.setStudentId(practiceGroup.getStudentId());
         courseScheduleReview.setCreateTime(date);
-        courseSchedule.setUpdateTime(date);
+        courseScheduleReview.setUpdateTime(date);
         long num = courseScheduleReviewDao.insert(courseScheduleReview);
         if (num <= 0) {
             throw new BizException("评论提交失败，请重试");

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

@@ -2093,10 +2093,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 Map<Long, String> subjectNames = MapUtil.convertMybatisMap(subjectDao.findBySubjecIds(StringUtils.join(subjectIds, ",")));
                 Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
 
-                List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
-                Map<Integer, String> idNameMap = educationalUsers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
+                Map<Integer, String> idNameMap=new HashMap<>();
+                if(!CollectionUtils.isEmpty(educationalTeacherIds)){
+                    List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
+                    idNameMap = educationalUsers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
+                }
 
-                dataList.forEach(e -> {
+
+                for (PracticeGroupDto e : dataList) {
                     e.setSubjectName(subjectNames.get(e.getSubjectId().intValue()));
                     e.setOrganName(organNames.get(e.getOrganId()));
                     ClassGroup classGroup = vipGroupClassGroupMap.get(e.getId().toString());
@@ -2108,7 +2112,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     Long aLong1 = currentClassTimeMap.get(e.getId() + "");
                     e.setCurrentClassTimes(aLong1 == null ? 0 : aLong1.intValue());
                     e.setEducationalTeacherName(idNameMap.get(e.getEducationalTeacherId()));
-                });
+                }
             }
         }
         if (count == 0) {

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

@@ -581,10 +581,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				Map<String,Long> totalClassTimeMap = MapUtil.convertIntegerMap(courseScheduleDao.countTotalCourseScheduleNum(vipGroupIds,"VIP"));
 				Map<String,Long> currentClassTimeMap = MapUtil.convertIntegerMap(courseScheduleDao.countCourseScheduleNum(vipGroupIds,"VIP"));
 
-				List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
-				Map<Integer, String> idNameMap = educationalUsers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
+				Map<Integer, String> idNameMap=new HashMap<>();
+				if(!CollectionUtils.isEmpty(educationalTeacherIds)){
+					List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
+					idNameMap = educationalUsers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
+				}
 
-				dataList.forEach(vipGroup -> {
+				for (VipGroup vipGroup : dataList) {
 					Integer overCourses = vipGroupOverCourseMaps.get(vipGroup.getId().toString());
 					ClassGroup classGroup = vipGroupClassGroupMap.get(vipGroup.getId().toString());
 					if(Objects.nonNull(classGroup)){
@@ -611,7 +614,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 							vipGroup.setMonthConsumeRate(monthConsumeRate * 100);
 						}
 					}
-				});
+				}
 			}
 		}
 		if (count == 0) {

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

@@ -364,4 +364,10 @@
         AND (del_flag_ =0 OR del_flag_ IS NULL)
         GROUP BY class_group_id_
     </select>
+
+    <select id="findByGroupId" resultMap="PracticeCourseDto">
+        SELECT pg.*,s.name_ subject_name_ FROM practice_group pg
+        LEFT JOIN subject s on pg.subject_id_ = s.id_
+        WHERE pg.id_ = #{id}
+    </select>
 </mapper>

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

@@ -66,6 +66,8 @@ public class ExportController extends BaseController {
     private CourseScheduleService scheduleService;
     @Autowired
     private SporadicChargeInfoService sporadicChargeInfoService;
+    @Autowired
+    private PracticeGroupDao practiceGroupDao;
 
     @ApiOperation(value = "导出老师课酬")
     @PostMapping("export/teacherSalary")
@@ -523,6 +525,16 @@ public class ExportController extends BaseController {
                 if(userSchool!= null){
                     row.setSchoolName(userSchool.getName());
                 }
+            }else if (row.getGroupType().equals(GroupType.PRACTICE)) {
+                row.setCourseFee(row.getActualAmount());
+                School userSchool = musicGroupDao.findUserSchool(row.getUserId());
+                if(userSchool!= null){
+                    row.setSchoolName(userSchool.getName());
+                }
+                PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(row.getMusicGroupId()));
+                if (practiceGroup != null) {
+                    row.setSubjectName(practiceGroup.getSubjectName());
+                }
             }
             String paymentChannel = "";
             if (row.getPaymentChannel() == null) {