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

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

@@ -0,0 +1,128 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.enums.*;
+
+import java.util.Date;
+
+public class TeacherAttendanceDetailDto {
+    private String remark;
+
+    private String teacherName;
+
+    private TeachModeEnum teachMode;
+
+    private CourseSchedule.CourseScheduleType type;
+
+    private CourseStatusEnum status;
+
+    private int isSignIn = 3;
+
+    private int isSignOut = 3;
+
+    private SignInStatusEnum signInStatusEnum;
+
+    private SignOutStatusEnum signOutStatusEnum;
+
+    private YesOrNoEnum isCallNames;
+
+    private Date signInTime;
+
+    private Date signOutTime;
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public TeachModeEnum getTeachMode() {
+        return teachMode;
+    }
+
+    public void setTeachMode(TeachModeEnum teachMode) {
+        this.teachMode = teachMode;
+    }
+
+    public CourseSchedule.CourseScheduleType getType() {
+        return type;
+    }
+
+    public void setType(CourseSchedule.CourseScheduleType type) {
+        this.type = type;
+    }
+
+    public CourseStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(CourseStatusEnum status) {
+        this.status = status;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public int getIsSignIn() {
+        return isSignIn;
+    }
+
+    public void setIsSignIn(int isSignIn) {
+        this.isSignIn = isSignIn;
+    }
+
+    public int getIsSignOut() {
+        return isSignOut;
+    }
+
+    public void setIsSignOut(int isSignOut) {
+        this.isSignOut = isSignOut;
+    }
+
+    public SignInStatusEnum getSignInStatusEnum() {
+        return signInStatusEnum;
+    }
+
+    public void setSignInStatusEnum(SignInStatusEnum signInStatusEnum) {
+        this.signInStatusEnum = signInStatusEnum;
+    }
+
+    public SignOutStatusEnum getSignOutStatusEnum() {
+        return signOutStatusEnum;
+    }
+
+    public void setSignOutStatusEnum(SignOutStatusEnum signOutStatusEnum) {
+        this.signOutStatusEnum = signOutStatusEnum;
+    }
+
+    public YesOrNoEnum getIsCallNames() {
+        return isCallNames;
+    }
+
+    public void setIsCallNames(YesOrNoEnum isCallNames) {
+        this.isCallNames = isCallNames;
+    }
+
+    public Date getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(Date signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public Date getSignOutTime() {
+        return signOutTime;
+    }
+
+    public void setSignOutTime(Date signOutTime) {
+        this.signOutTime = signOutTime;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.TeacherAbnormalAttendanceInfoDto;
+import com.ym.mec.biz.dal.dto.TeacherAttendanceDetailDto;
 import com.ym.mec.biz.dal.dto.TeacherSignOutDto;
 import com.ym.mec.biz.dal.entity.TeacherAttendance;
 import com.ym.mec.biz.dal.enums.SignStatusEnum;
@@ -118,4 +119,11 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
 	 * @return
 	 */
 	TeacherAttendance findByTeacherAttendanceInfo(Long courseId, Integer teacherId);
+
+	/**
+	 * 获取教师签到详情
+	 * @param courseScheduleId
+	 * @return
+	 */
+	TeacherAttendanceDetailDto getTeacherPersonalAttendanceDetail(Integer courseScheduleId);
 }

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

@@ -3669,9 +3669,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             params.put("offset", pageInfo.getOffset());
             results = courseScheduleDao.endFindCourseSchedules(params);
             List<Long> courseScheduleIds = results.stream().map(CourseScheduleEndDto::getId).collect(Collectors.toList());
-            List<TeacherAttendance> teacherAttendances = teacherAttendanceDao.findTeacherIdByCourseSchedule(courseScheduleIds);
-            Map<Long, List<TeacherAttendance>> courseTeacherAttendanceMap = teacherAttendances.stream().collect(Collectors.groupingBy(TeacherAttendance::getCourseScheduleId));
-            Map<Integer, Long> studentNumCourseMap = MapUtil.convertIntegerMap(studentAttendanceDao.countStudentAttendancesByCourses(courseScheduleIds));
+//            List<TeacherAttendance> teacherAttendances = teacherAttendanceDao.findTeacherIdByCourseSchedule(courseScheduleIds);
+//            Map<Long, List<TeacherAttendance>> courseTeacherAttendanceMap = teacherAttendances.stream().collect(Collectors.groupingBy(TeacherAttendance::getCourseScheduleId));
+//            Map<Integer, Long> studentNumCourseMap = MapUtil.convertIntegerMap(studentAttendanceDao.countStudentAttendancesByCourses(courseScheduleIds));
             Map<Long, String> studentIdMap = MapUtil.convertIntegerMap(courseScheduleStudentPaymentDao.getStudentIdMap(courseScheduleIds));
             List<Integer> teacherIds=results.stream().filter(t->Objects.nonNull(t.getActualTeacherId())).map(CourseSchedule::getActualTeacherId).collect(Collectors.toList());
 
@@ -3689,8 +3689,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				result.setTeacherName(nameIdMap.get(result.getActualTeacherId()));
 				result.setSubjectName(classGroupSubjectNameMap.get(result.getId()));
 				result.setStudentId(studentIdMap.get(result.getId()));
-				List<TeacherAttendance> courseTeacherAttendances = courseTeacherAttendanceMap.get(result.getId());
-				if(!CollectionUtils.isEmpty(courseTeacherAttendances)){
+//				List<TeacherAttendance> courseTeacherAttendances = courseTeacherAttendanceMap.get(result.getId());
+				/*if(!CollectionUtils.isEmpty(courseTeacherAttendances)){
 					TeacherAttendance teacherAttendance=courseTeacherAttendances.get(0);
 					result.setIsSignIn(Objects.isNull(teacherAttendance.getSignInStatus())?3:teacherAttendance.getSignInStatus().getCode());
 					result.setIsSignOut(Objects.isNull(teacherAttendance.getSignOutStatus())?3:teacherAttendance.getSignOutStatus().getCode());
@@ -3699,13 +3699,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					result.setSignInTime(teacherAttendance.getSignInTime());
 					result.setSignOutTime(teacherAttendance.getSignOutTime());
 					result.setRemark(teacherAttendance.getRemark());
-				}
-				Long studentNum = studentNumCourseMap.get(result.getId());
+				}*/
+				/*Long studentNum = studentNumCourseMap.get(result.getId());
 				if (Objects.nonNull(studentNum)) {
 					result.setIsCallNames(studentNum > 0 ? YesOrNoEnum.YES : YesOrNoEnum.NO);
 				} else {
 					result.setIsCallNames(YesOrNoEnum.NO);
-				}
+				}*/
 				result.setSettlementTime(coursesSettlementTimeMap.get(result.getId()));
 			}
         }

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

@@ -58,8 +58,9 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 		if(StringUtils.isBlank(exercises.getStudentIdList())){
 			throw new BizException("请指定学生");
 		}
-		
-		Teacher teacher = teacherDao.getLocked(exercises.getTeacherId());
+
+		teacherDao.getLocked(exercises.getTeacherId());
+		Teacher teacher = teacherDao.get(exercises.getTeacherId());
 
 		ExtracurricularExercises repeatLastExercises = extracurricularExercisesDao.findRepeatLastExercises(exercises.getTeacherId(), exercises.getStudentIdList(), exercises.getContent());
 		if(Objects.nonNull(repeatLastExercises)&&DateUtil.secondsBetween(repeatLastExercises.getCreateTime(),new Date())<60){

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

@@ -14,6 +14,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
+import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -114,7 +115,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			e.setOpen(1);
 //			e.setPaymentStatus(PROCESSING);
 			e.setStartPaymentDate(date);
-			e.setDeadlinePaymentDate(date);
+			e.setDeadlinePaymentDate(DateUtil.addDays(date,2));
 		});
 		musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);
 		//修改学员缴费状态为未缴费

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

@@ -1,9 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
-import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDetailDao;
-import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
@@ -14,6 +11,7 @@ import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import com.ym.mec.biz.dal.page.MusicCalenderQueryInfo;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -48,6 +46,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	@Autowired
 	private MusicGroupDao musicGroupDao;
 	@Autowired
+	private SysConfigDao sysConfigDao;
+	@Autowired
 	private SysMessageService sysMessageService;
 
 	@Override
@@ -134,7 +134,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 						push.put(userId, userId + "");
 					}
 					MusicGroup musicGroup = musicGroupDao.get(musicGroupPaymentCalender.getMusicGroupId());
-					String memo = "4?http://mstuonline.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
+					String configValue = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+					String memo = "4?" + configValue + "/#/renew?musicGroupId=" + musicGroup.getId();
 					// 发送续费通知
 					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
 							null, 0, memo, "STUDENT", musicGroup.getName());
@@ -224,7 +225,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 						push.put(userId, userId + "");
 					}
 					MusicGroup musicGroup = musicGroupDao.get(mgpc.getMusicGroupId());
-					String memo = "4?http://mstuonline.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
+					String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+					String memo = "4?" + baseUrl + "/#/renew?musicGroupId=" + musicGroup.getId();
 					// 发送续费通知
 					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
 							null, 0, memo, "STUDENT", musicGroup.getName());

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

@@ -70,7 +70,8 @@ public class MusicGroupStudentFeeServiceImpl extends BaseServiceImpl<Long, Music
 			for (MusicGroupStudentFee sf : updateList) {
 				push.put(sf.getUserId(), sf.getUserId() + "");
 			}
-			String memo = "4?http://mstuonline.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
+			String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+			String memo = "4?" + baseUrl + "/#/renew?musicGroupId=" + musicGroup.getId();
 			// 发送续费通知
 			sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push, null, 0, memo,"STUDENT",musicGroup.getName());
 		}

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

@@ -6,10 +6,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.MessageTypeEnum;
-import com.ym.mec.biz.dal.enums.SignStatusEnum;
-import com.ym.mec.biz.dal.enums.TeachModeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
@@ -28,14 +25,20 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
+import static com.ym.mec.biz.dal.enums.SignInStatusEnum.*;
+
 @Service
 public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherAttendance>  implements TeacherAttendanceService {
 
 	@Autowired
 	private TeacherAttendanceDao teacherAttendanceDao;
 	@Autowired
+	private StudentAttendanceDao studentAttendanceDao;
+	@Autowired
 	private CourseScheduleDao courseScheduleDao;
 	@Autowired
+	private TeacherDao teacherDao;
+	@Autowired
 	private CourseHomeworkService courseHomeworkService;
 	@Autowired
 	private StudentCourseHomeworkDao studentCourseHomeworkDao;
@@ -537,4 +540,31 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	public TeacherAttendance findByTeacherAttendanceInfo(Long courseId, Integer teacherId) {
 		return teacherAttendanceDao.findByTeacherAttendanceInfo(teacherId.longValue(),courseId);
 	}
+
+	@Override
+	public TeacherAttendanceDetailDto getTeacherPersonalAttendanceDetail(Integer courseScheduleId) {
+		TeacherAttendance teacherAttendance = teacherAttendanceDao.getTeacherPersonalAttendance(courseScheduleId);
+		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
+		TeacherAttendanceDetailDto result = new TeacherAttendanceDetailDto();
+		result.setStatus(courseSchedule.getStatus());
+		result.setTeachMode(courseSchedule.getTeachMode());
+		result.setType(courseSchedule.getType());
+		result.setTeacherName(teacherDao.queryNameById(courseSchedule.getActualTeacherId()));
+		if(teacherAttendance != null){
+			result.setIsSignIn(Objects.isNull(teacherAttendance.getSignInStatus())?3:teacherAttendance.getSignInStatus().getCode());
+			result.setIsSignOut(Objects.isNull(teacherAttendance.getSignOutStatus())?3:teacherAttendance.getSignOutStatus().getCode());
+			result.setSignInStatusEnum(result.getIsSignIn() == 1?NORMAL:result.getIsSignIn() == 0?UNUSUAL:NO);
+			result.setSignOutStatusEnum(result.getIsSignOut() == 1?SignOutStatusEnum.NORMAL:result.getIsSignOut() == 0? SignOutStatusEnum.UNUSUAL: SignOutStatusEnum.NO);
+			result.setSignInTime(teacherAttendance.getSignInTime());
+			result.setSignOutTime(teacherAttendance.getSignOutTime());
+			result.setRemark(teacherAttendance.getRemark());
+			int studentNum = studentAttendanceDao.countByCourseSchedule(courseScheduleId.longValue());
+			if (Objects.nonNull(studentNum)) {
+				result.setIsCallNames(studentNum > 0 ? YesOrNoEnum.YES : YesOrNoEnum.NO);
+			} else {
+				result.setIsCallNames(YesOrNoEnum.NO);
+			}
+		}
+		return result;
+	}
 }

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

@@ -341,7 +341,7 @@
             </foreach>
     </select>
     <select id="getTeacherPersonalAttendance" resultMap="TeacherAttendance">
-        SELECT ta.sign_in_longitude_latitude_,ta.sign_out_longitude_latitude_,s.longitude_latitude_ FROM teacher_attendance ta
+        SELECT ta.*,s.longitude_latitude_ FROM teacher_attendance ta
         LEFT JOIN course_schedule cs ON ta.course_schedule_id_ = cs.id_
         LEFT JOIN school s ON cs.schoole_id_ = s.id_
         WHERE ta.course_schedule_id_ = #{courseScheduleId}

mec-im/src/main/java/com/ym/pojo/RoomResult.java

@@ -13,7 +13,8 @@ import java.util.List;
  */
 public class RoomResult {
     private @Getter @Setter String roomId;
-    private @Setter Date startTime;
+    private @Getter @Setter Date startTime;
+    private @Getter @Setter int surplusTime;
     private @Getter @Setter String imToken;
     private @Getter @Setter String authorization;
     private @Getter List<MemberResult> members = new ArrayList<>();

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -163,6 +163,9 @@ public class RoomServiceImpl implements RoomService {
 
         RoleEnum roleEnum;
         RoomResult roomResult = new RoomResult();
+        String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
+        String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+        roomResult.setSurplusTime(DateUtil.secondsBetween(new Date(),DateUtil.stringToDate(classDate + " " + endClassTime,DateUtil.EXPANDED_DATE_TIME_FORMAT)));
         RoomResult.MemberResult userResult = new RoomResult.MemberResult();
         List<RoomMember> memberList = roomMemberDao.findByRidAndUid(roomId, userId);
         if (memberList.isEmpty()) {

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

@@ -478,10 +478,9 @@ public class ExportController extends BaseController {
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "课程编号", "开始时间", "结束时间",
                     "班级名称", "班级声部", "课程名称", "课程类型", "教学模式",
-                    "教学点", "课程状态", "是否点名", "指导老师", "学员编号", "签到时间", "签退时间", "签到状态", "签退状态", "签到备注"}, new String[]{
+                    "教学点", "课程状态", "指导老师", "学员编号"}, new String[]{
                     "organName", "id", "startClassTime", "endClassTime", "classGroupName", "subjectName", "name",
-                    "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "isCallNames.msg", "teacherName", "studentId", "signInTime",
-                    "signOutTime", "signInStatusEnum.msg", "signOutStatusEnum.msg", "remark"}, rows);
+                    "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "teacherName", "studentId"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             ouputStream = response.getOutputStream();

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

@@ -35,6 +35,13 @@ public class TeacherAttendanceController extends BaseController {
         return succeed(teacherAttendanceService.getTeacherPersonalAttendance(courseScheduleId));
     }
 
+    @ApiOperation(value = "获取教师签到详情")
+    @GetMapping("/getTeacherPersonalAttendanceDetail")
+    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/getTeacherPersonalAttendanceDetail')")
+    public Object getTeacherPersonalAttendanceDetail(Integer courseScheduleId){
+        return succeed(teacherAttendanceService.getTeacherPersonalAttendanceDetail(courseScheduleId));
+    }
+
     @ApiOperation(value = "更新教师签到记录")
     @PostMapping("/updateTeacherAttendance")
     @PreAuthorize("@pcs.hasPermissions('teacherAttendance/updateTeacherAttendance')")