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

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

@@ -27,7 +27,7 @@ public class VipGroupActivity {
 	private java.util.Date endTime;
 	
 	/**  */
-	private Integer organId;
+	private String organId;
 	
 	/**  */
 	private java.util.Date coursesStartTime;
@@ -130,11 +130,11 @@ public class VipGroupActivity {
 		return this.endTime;
 	}
 			
-	public void setOrganId(Integer organId){
+	public void setOrganId(String organId){
 		this.organId = organId;
 	}
 	
-	public Integer getOrganId(){
+	public String getOrganId(){
 		return this.organId;
 	}
 			

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

@@ -56,8 +56,8 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 					.map(TeacherHomeworkListDto::getCourseScheduleId)
 					.distinct()
 					.collect(Collectors.toList());
-			List<Map<Integer, Integer>> courseTimeByClassGroup = teacherAttendanceDao.findCourseTimeByCourseSchedules(courseScheduleIds);
-			Map<Integer, Integer> map = MapUtil.convertIntegerMap(courseTimeByClassGroup);
+//			List<Map<Integer, Integer>> courseTimeByClassGroup = teacherAttendanceDao.findCourseTimeByCourseSchedules(courseScheduleIds);
+//			Map<Integer, Integer> map = MapUtil.convertIntegerMap(courseTimeByClassGroup);
 //			dataList.forEach(teacherHomeworkListDto -> {
 //				teacherHomeworkListDto.setCurrentClassTimes(map.get(teacherHomeworkListDto.getCourseScheduleId().longValue()));
 //			});

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

@@ -118,6 +118,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	private SysConfigDao sysConfigDao;
 	
 	@Autowired
+	private ClassGroupService classGroupService;
+	
+	@Autowired
     private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
 
     @Override
@@ -264,6 +267,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new Exception("采购清单未确认");
         }
         //课酬是否确认
+        if(classGroupService.checkSetSalary(musicGroupId) == false){
+        	throw new Exception("课酬未确认");
+        }
 //        courseScheduleTeacherSalaryDao.queryCount();
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));

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

@@ -28,6 +28,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 
 	@Override
 	public void addVipGroupActivity(VipGroupActivityAddDto vipGroupActivityAddDto) {
+
 		if(Objects.isNull(vipGroupActivityAddDto.getOrganId())){
 			throw new BizException("请指定部门!");
 		}

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

@@ -50,7 +50,7 @@ public class TeacherAttendanceController extends BaseController {
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
-        return succeed(iteacherAttendanceService.findTeacherAbnormalSignInCourseScheduleRecord(user.getOrganId(),date,signInStatus));
+        return succeed(iteacherAttendanceService.findTeacherAbnormalSignInCourseScheduleRecord(Integer.parseInt(user.getOrganId()),date,signInStatus));
     }
 
     @PostMapping("/findTeacherAbnormalSignInDates")
@@ -60,7 +60,7 @@ public class TeacherAttendanceController extends BaseController {
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
-        return succeed(iteacherAttendanceService.findTeacherAbnormalSignInDates(user.getOrganId(),month));
+        return succeed(iteacherAttendanceService.findTeacherAbnormalSignInDates(Integer.parseInt(user.getOrganId()),month));
     }
 
     @PostMapping("/countTeacherAbnormalSignInClassTimes")
@@ -70,6 +70,6 @@ public class TeacherAttendanceController extends BaseController {
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
-        return iteacherAttendanceService.countTeacherAbnormalSignInClassTimes(user.getOrganId(),date);
+        return iteacherAttendanceService.countTeacherAbnormalSignInClassTimes(Integer.parseInt(user.getOrganId()),date);
     }
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherVipGroupController.java

@@ -40,7 +40,7 @@ public class TeacherVipGroupController extends BaseController {
 		vipGroupApplyDto.getVipGroupApplyBaseInfo().setUserId(user.getId());
 		vipGroupApplyDto.getVipGroupApplyBaseInfo().setTeacherId(Long.valueOf(user.getId()));
 		vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganIdList(user.getOrganId().toString());
-		vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(user.getOrganId());
+		vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(Integer.parseInt(user.getOrganId()));
 		vipGroupService.createVipGroup(vipGroupApplyDto,null);
 		return succeed();
 	}