Joburgess 5 年之前
父節點
當前提交
9f218efd03
共有 20 個文件被更改,包括 283 次插入37 次删除
  1. 11 0
      mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleComplaintsDao.java
  2. 10 0
      mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentPaymentDao.java
  3. 10 1
      mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleTeacherSalaryDao.java
  4. 2 0
      mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDefaultVipGroupSalaryDao.java
  5. 16 3
      mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceDto.java
  6. 1 1
      mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java
  7. 1 1
      mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java
  8. 9 0
      mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleTeacherSalaryService.java
  9. 3 1
      mec-biz/src/main/java/com/ym/mec/biz/service/TeacherAttendanceService.java
  10. 1 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java
  11. 152 10
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java
  12. 24 7
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java
  13. 1 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java
  14. 3 1
      mec-biz/src/main/resources/config/mybatis/CourseHomeworkTemplateMapper.xml
  15. 7 0
      mec-biz/src/main/resources/config/mybatis/CourseScheduleComplaintsMapper.xml
  16. 9 8
      mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml
  17. 6 0
      mec-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml
  18. 11 0
      mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml
  19. 1 2
      mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherAttendanceController.java
  20. 5 0
      mec-web/src/main/java/com/ym/mec/web/controller/education/CourseHomeworkTemplateController.java

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleComplaintsDao.java

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseScheduleComplaints> {
 
     /**
@@ -14,5 +16,14 @@ public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseSchedul
      * @describe 根据用户和课程获取申诉详情
      */
     CourseScheduleComplaints findByUserAndCourse(@Param("userId") Long userId,@Param("courseScheduleId") Long courseScheduleId);
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/15
+     * @params [ids]
+     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseScheduleComplaints>
+     * @describe 根据课程编号批量获取投诉记录
+     */
+    List<CourseScheduleComplaints> findByCourseScheduleIds(@Param("ids") List<Long> ids);
 	
 }

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,5 +16,14 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
      * @describe 批量插入
      */
     int batchInsert(List<CourseScheduleStudentPayment> courseScheduleStudentPayments);
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/15
+     * @params [ids]
+     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment>
+     * @describe 根据课程编号批量获取学生缴费信息
+     */
+    List<CourseScheduleStudentPayment> findByCourseScheduleIds(@Param("ids") List<Long> ids);
 	
 }

+ 10 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleTeacherSalaryDao.java

@@ -27,5 +27,14 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
      */
     List<VipGroupSalaryDto> findVipGroupSalarys(Map<String,Object> params);
     int countVipGroupSalarys(Map<String,Object> params);
-	
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/15
+     * @params [days:天数]
+     * @return java.util.List<com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary>
+     * @describe 获取多少天之前的未结算教师课酬记录
+     */
+    List<CourseScheduleTeacherSalary> findSomeDayAgoTeacherCourseSalaryNoSettlement(Integer days);
+
 }

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDefaultVipGroupSalaryDao.java

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface TeacherDefaultVipGroupSalaryDao extends BaseDAO<Long, TeacherDefaultVipGroupSalary> {
 
     /**

+ 16 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -14,6 +15,9 @@ public class TeacherAttendanceDto {
     @ApiModelProperty(value = "课程计划ID",required = false)
     private Long courseScheduleId;
 
+    @ApiModelProperty(value = "课程名称")
+    private String courseScheduleName;
+
     @ApiModelProperty(value = "上课日期",required = false)
     private java.util.Date classDate;
 
@@ -30,7 +34,7 @@ public class TeacherAttendanceDto {
     private String className;
 
     @ApiModelProperty(value = "班级类型",required = false)
-    private String classType;
+    private ClassGroupTypeEnum classType;
 
     @ApiModelProperty(value = "乐团ID",required = false)
     private Long musicGroupId;
@@ -60,6 +64,14 @@ public class TeacherAttendanceDto {
     @ApiModelProperty(value = "老师可打卡范围,单位米")
     private Integer attendanceRange;
 
+    public String getCourseScheduleName() {
+        return courseScheduleName;
+    }
+
+    public void setCourseScheduleName(String courseScheduleName) {
+        this.courseScheduleName = courseScheduleName;
+    }
+
     public Integer getAttendanceRange() {
         return attendanceRange;
     }
@@ -164,11 +176,12 @@ public class TeacherAttendanceDto {
         this.className = className;
     }
 
-    public String getClassType() {
+
+    public ClassGroupTypeEnum getClassType() {
         return classType;
     }
 
-    public void setClassType(String classType) {
+    public void setClassType(ClassGroupTypeEnum classType) {
         this.classType = classType;
     }
 

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -49,7 +49,7 @@ public class CourseSchedule {
 	private Integer classGroupId;
 
 	/** 课程状态 */
-	@ApiModelProperty(value = "课程状态  NOT_START未开始,SIGN_IN已签到,SIGN_OUT已签退", required = false)
+	@ApiModelProperty(value = "课程状态", required = false)
 	private CourseStatusEnum status;
 
 	/** 补贴 */

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -82,7 +82,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
     /**
      * @Author: Joburgess
      * @Date: 2019/9/17
-     * 根据学生获取乐团在该月有课的日期
+     * 获取教师在该月有课的日期
      */
     List<Date> getCourseScheduleDateByTeacher(Date month);
 

+ 9 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleTeacherSalaryService.java

@@ -25,4 +25,13 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
                                              BigDecimal onlineTeacherSalary,
                                              BigDecimal offlineTeacherSalary);
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/15
+     * @params []
+     * @return void
+     * @describe 教师课酬结算
+     */
+    void teacherSalarySettlement();
+
 }

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

@@ -6,6 +6,8 @@ import com.ym.mec.biz.dal.page.TeacherAttendanceQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.Map;
+
 public interface TeacherAttendanceService extends BaseService<Long, TeacherAttendance> {
 
     /**
@@ -13,7 +15,7 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
      * @Date: 2019/9/10
      * 添加教师签到记录
      */
-    void addTeacherAttendanceRecord(TeacherSignOutDto teacherSignOutDto);
+    Map<String, Object> addTeacherAttendanceRecord(TeacherSignOutDto teacherSignOutDto);
 
     /**
      * 获取教师个人的签到记录

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

@@ -162,7 +162,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			queryInfo.setDate(new Date());
 		}
 
-		Map<String, Object> params = new HashMap<String, Object>();
+		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 
 		List dataList = null;

+ 152 - 10
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -1,26 +1,25 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
-import com.ym.mec.biz.dal.dao.TeacherDefaultVipGroupSalaryDao;
-import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.VipGroupSalarySettlementDto;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.TeachModeEnum;
-import com.ym.mec.biz.dal.enums.TeachTypeEnum;
-import com.ym.mec.biz.dal.enums.VipGroupActivityTypeEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.service.CourseScheduleTeacherSalaryService;
+import com.ym.mec.biz.service.SysUserCashAccountDetailService;
+import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -32,6 +31,17 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 	private TeacherDefaultVipGroupSalaryDao teacherDefaultVipGroupSalaryDao;
 	@Autowired
 	private VipGroupActivityDao vipGroupActivityDao;
+	@Autowired
+	private CourseScheduleComplaintsDao courseScheduleComplaintsDao;
+	@Autowired
+	private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
+	@Autowired
+	private SysUserCashAccountService sysUserCashAccountService;
+	@Autowired
+	private SysUserCashAccountDetailService sysUserCashAccountDetailService;
+
+	private static final Logger LOGGER = LoggerFactory
+			.getLogger(CourseScheduleTeacherSalaryServiceImpl.class);
 
 	@Override
 	public BaseDAO<Long, CourseScheduleTeacherSalary> getDAO() {
@@ -107,4 +117,136 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 		}
 		return courseScheduleTeacherSalaryDao.batchInsert(courseScheduleTeacherSalaries);
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void teacherSalarySettlement() {
+		//获取教师未结算课程记录
+		List<CourseScheduleTeacherSalary> someDayAgoTeacherCourseSalaryNoSettlement = courseScheduleTeacherSalaryDao.findSomeDayAgoTeacherCourseSalaryNoSettlement(7);
+		if(CollectionUtils.isEmpty(someDayAgoTeacherCourseSalaryNoSettlement)){
+			LOGGER.info("未获取到未结算课酬记录!");
+		}
+		Date now=new Date();
+		//获取未结算课程编号列表
+		List<Long> courseScheduleIds = someDayAgoTeacherCourseSalaryNoSettlement.stream().map(CourseScheduleTeacherSalary::getCourseScheduleId).collect(Collectors.toList());
+		//获取未结算课程投诉记录
+		List<CourseScheduleComplaints> courseScheduleComplaints = courseScheduleComplaintsDao.findByCourseScheduleIds(courseScheduleIds);
+		//获取未结算课程学生缴费信息
+		List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseScheduleIds(courseScheduleIds);
+
+		//根据课程将投诉信息分组
+		Map<Long, List<CourseScheduleComplaints>> complaintsGroupByCourse = courseScheduleComplaints.stream().collect(Collectors.groupingBy(CourseScheduleComplaints::getCourseScheduleId));
+		//根据课程将学生缴费信息分组
+		Map<Long, List<CourseScheduleStudentPayment>> studentPaymentGroupByCourse = courseScheduleStudentPayments.stream().collect(Collectors.groupingBy(CourseScheduleStudentPayment::getCourseScheduleId));
+
+		//需更新教师课程结算记录
+		List<CourseScheduleTeacherSalary> updateTeacherSalarys=new ArrayList<>();
+		//需更新学生课程缴费记录
+		List<CourseScheduleStudentPayment> updateStudentPayments=new ArrayList<>();
+
+		//用户账户自己变动信息列表
+		List<SysUserCashAccountDetail> userCashAccountDetails=new ArrayList<>();
+
+		//处理课酬信息
+		someDayAgoTeacherCourseSalaryNoSettlement.forEach(courseScheduleTeacherSalary -> {
+			//获取当前课程学生缴费记录
+			List<CourseScheduleStudentPayment> studentPaymentsWithCourse = studentPaymentGroupByCourse.get(courseScheduleTeacherSalary.getCourseScheduleId());
+			//当前课程缴费学生数量
+			BigDecimal courseStudentNum=new BigDecimal(studentPaymentsWithCourse.size());
+			//教师预计课酬
+			BigDecimal expectSalary=courseScheduleTeacherSalary.getExpectSalary();
+			//当前课程每个学生平均课酬
+			BigDecimal avgSalary=expectSalary.divide(courseStudentNum);
+			//教师当前课程责任总占比,当前课程应得课酬
+			BigDecimal teacherLiabilityAllratio,teacherCourseSalary;
+
+			//当前课程学生投诉记录
+			List<CourseScheduleComplaints> courseStudentComplaints=complaintsGroupByCourse.get(courseScheduleTeacherSalary.getCourseScheduleId());
+
+			//如果存在投诉记录,需要扣除相应费用
+			if(Objects.nonNull(courseStudentComplaints)){
+				//获取审批中的投诉
+				List<CourseScheduleComplaints> auditIng = courseStudentComplaints.stream().filter(courseScheduleComplaint -> courseScheduleComplaint.getStatus() == AuditStatusEnum.ING).collect(Collectors.toList());
+				if(!CollectionUtils.isEmpty(auditIng)){
+					//如果当前课程存在未处理的投诉,则不做结算处理
+					return;
+				}
+				//计算教师责任总占比
+				double teacherLiabilityRatioSum = courseStudentComplaints.stream().mapToDouble(CourseScheduleComplaints::getTeacherLiabilityRatio).sum();
+				teacherLiabilityAllratio=new BigDecimal(teacherLiabilityRatioSum);
+			}else{
+				//如果没有投诉,则教师和学生的责任占比为0
+				teacherLiabilityAllratio=new BigDecimal(0);
+			}
+
+			//教师应扣除费用
+			BigDecimal deductPrice=avgSalary.multiply(teacherLiabilityAllratio);
+			//教师实际课酬
+			BigDecimal actualSalary=expectSalary.subtract(deductPrice);
+
+			//更新教师结算信息
+			courseScheduleTeacherSalary.setActualSalary(actualSalary);
+			courseScheduleTeacherSalary.setSettlementTime(now);
+			courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
+			updateTeacherSalarys.add(courseScheduleTeacherSalary);
+
+			//生成教师账户资金变动记录
+			sysUserCashAccountService.updateBalance(courseScheduleTeacherSalary.getUserId(),actualSalary);
+			SysUserCashAccount teacherCashAccount = sysUserCashAccountService.get(courseScheduleTeacherSalary.getUserId().intValue());
+			SysUserCashAccountDetail teacherCashAccountDetail=new SysUserCashAccountDetail();
+			teacherCashAccountDetail.setUserId(courseScheduleTeacherSalary.getUserId());
+			teacherCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);
+			teacherCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+			teacherCashAccountDetail.setAmount(actualSalary);
+			teacherCashAccountDetail.setBalance(teacherCashAccount.getBalance());
+			teacherCashAccountDetail.setAttribute(courseScheduleTeacherSalary.getCourseScheduleId().toString());
+
+			userCashAccountDetails.add(teacherCashAccountDetail);
+
+
+			//根据学生进行投诉分组
+			Map<Integer, List<CourseScheduleComplaints>> complainsGroupByStudent = courseStudentComplaints.stream().collect(Collectors.groupingBy(CourseScheduleComplaints::getUserId));
+
+			//计算学生当前课程应缴费用
+			studentPaymentsWithCourse.forEach(studentPayment -> {
+				//当前课程学生应缴费用
+				BigDecimal studentExpectPrice=studentPayment.getExpectPrice();
+				//当前课程学生责任占比
+				BigDecimal studentLiabilityRatio;
+				List<CourseScheduleComplaints> currentCourseScheduleComplaints = complainsGroupByStudent.get(studentPayment.getUserId());
+				if(CollectionUtils.isEmpty(currentCourseScheduleComplaints)){
+					Double temp=currentCourseScheduleComplaints.get(0).getStudentLiabilityRatio();
+					studentLiabilityRatio=new BigDecimal(temp);
+				}else{
+					studentLiabilityRatio=new BigDecimal(0);
+				}
+
+				//当前课程学生应退费用
+				BigDecimal returnPrice=studentExpectPrice.multiply(studentLiabilityRatio);
+				//当前课程学生实际缴费
+				BigDecimal actualPrice=expectSalary.subtract(returnPrice);
+				//更新学生结算信息
+				studentPayment.setActualPrice(actualPrice);
+				studentPayment.setSettlementTime(now);
+				courseScheduleStudentPaymentDao.update(studentPayment);
+				updateStudentPayments.add(studentPayment);
+
+				//生成学生账户资金变动记录
+				sysUserCashAccountService.updateBalance(studentPayment.getUserId(),returnPrice);
+				SysUserCashAccount studentCashAccount = sysUserCashAccountService.get(studentPayment.getUserId().intValue());
+				SysUserCashAccountDetail studentAccountDetail=new SysUserCashAccountDetail();
+				studentAccountDetail.setUserId(studentPayment.getUserId());
+				studentAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);
+				studentAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+				studentAccountDetail.setAmount(returnPrice);
+				studentAccountDetail.setBalance(studentCashAccount.getBalance());
+				studentAccountDetail.setAttribute(courseScheduleTeacherSalary.getCourseScheduleId().toString());
+
+				userCashAccountDetails.add(studentAccountDetail);
+
+			});
+
+		});
+
+	}
 }

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

@@ -7,7 +7,6 @@ import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.biz.dal.dto.TeacherPersonalAttendanceDto;
 import com.ym.mec.biz.dal.dto.TeacherSignOutDto;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.ParamEnum;
 import com.ym.mec.biz.dal.enums.SignStatusEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
@@ -19,7 +18,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
-
+import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,7 +51,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public void addTeacherAttendanceRecord(TeacherSignOutDto teacherSignOutDto) {
+	public Map<String, Object> addTeacherAttendanceRecord(TeacherSignOutDto teacherSignOutDto) {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(Objects.isNull(user)){
 			throw new BizException("请登录");
@@ -62,6 +61,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			throw new BizException("请选择课程!");
 		}
 
+		Map<String,Object> result=new HashMap<>();
+
 		TeacherAttendance teacherAttendance=teacherAttendanceDao.findByTeacherAttendanceInfo(user.getId().longValue(),teacherSignOutDto.getTeacherAttendanceInfo().getCourseScheduleId());
 
 		if(Objects.isNull(teacherAttendance)){
@@ -80,26 +81,38 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());
 		Date date = new Date();
 		if(teacherAttendance.getStatus()!= SignStatusEnum.SIGN_OUT){
+
+			if (currentCourseDetail.getEndClassTime().before(date)){
+				throw new BizException("该课程已结束,不能进行签到!");
+			}
+
 			Long timeGap=(date.getTime()-currentCourseDetail.getStartClassTime().getTime())/1000/60;
 			if(timeGap<= ParamEnum.TEACHER_ATTENDANCE_TIME_GAP.getCode()){
 				teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
+				result.put("signInStatus",YesOrNoEnum.YES.getCode());
 			}else{
 				if(StringUtils.isEmpty(teacherAttendance.getRemark())){
 					throw new BizException("当前为异常签到,请填写原因!");
 				}
 				teacherAttendance.setSignInStatus(YesOrNoEnum.NO);
+				result.put("signInStatus",YesOrNoEnum.NO.getCode());
 			}
 			teacherAttendance.setSignInTime(date);
-			courseSchedule.setStatus(CourseStatusEnum.UNDERWAY);
 			teacherAttendanceDao.insert(teacherAttendance);
 		}else{
-			teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
+			if (currentCourseDetail.getEndClassTime().after(date)){
+				throw new BizException("该课程还未结束,不能进行签退!");
+			}
+			int i = DateUtil.hoursBetween(currentCourseDetail.getEndClassTime(), date);
+			if(i<=1){
+				teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
+			}else{
+				teacherAttendance.setSignOutStatus(YesOrNoEnum.NO);
+			}
 			teacherAttendance.setSignOutTime(date);
 			teacherAttendance.setCreateTime(date);
-			courseSchedule.setStatus(CourseStatusEnum.OVER);
 			teacherAttendanceDao.update(teacherAttendance);
 		}
-		courseScheduleDao.update(courseSchedule);
 		if(teacherAttendance.getStatus()==SignStatusEnum.SIGN_OUT){
 			//更新课次
 			ClassGroup classGroup=new ClassGroup();
@@ -117,6 +130,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					courseHomework.getId());
 			studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
 		}
+
+		result.put("currentTime",date);
+
+		return result;
 	}
 
 	@Override

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

@@ -581,7 +581,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		switch (studentApplyRefunds.getStatus()){
 			case PASS:
 				sysUserCashAccountService.updateBalance(oldStudentApplyRefunds.getUserId(),oldStudentApplyRefunds.getActualAmount());
-				SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentApplyRefunds.getId().intValue());
+				SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentApplyRefunds.getUserId().intValue());
 				SysUserCashAccountDetail sysUserCashAccountDetail=new SysUserCashAccountDetail();
 				sysUserCashAccountDetail.setUserId(studentApplyRefunds.getUserId());
 				sysUserCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/CourseHomeworkTemplateMapper.xml

@@ -75,6 +75,7 @@
 
     <sql id="queryCondition">
         <where>
+            cht.del_flag_ = 0
             <if test="subjectIDs != null">
                 and subject_id_ IN
                 <foreach collection="subjectIDs" item="subjectID" open="(" close=")" separator=",">
@@ -99,7 +100,8 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM course_homework_template
+		SELECT COUNT(*) FROM course_homework_template cht
+        <include refid="queryCondition"/>
 	</select>
 
     <select id="getSubjectIDs" resultType="java.lang.String">

+ 7 - 0
mec-biz/src/main/resources/config/mybatis/CourseScheduleComplaintsMapper.xml

@@ -94,4 +94,11 @@
     <select id="findByUserAndCourse" resultMap="CourseScheduleComplaints">
 		SELECT * FROM course_schedule_complaints WHERE user_id_=#{userId} AND course_schedule_id_=#{courseScheduleId}
     </select>
+
+    <select id="findByCourseScheduleIds" resultMap="CourseScheduleComplaints">
+		SELECT * FROM course_schedule_complaints WHERE course_schedule_id_ IN
+		<foreach collection="ids" item="id" open="(" close=")" separator=",">
+			#{id}
+		</foreach>
+	</select>
 </mapper>

+ 9 - 8
mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -68,7 +68,7 @@
         -->
         INSERT INTO course_schedule
         (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_)
-        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{name},#{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{teacherId},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{name},#{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
@@ -76,7 +76,7 @@
         (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_)
         VALUE
         <foreach collection="list" item="course" separator=",">
-            (#{course.id},#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.actualTeacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.name},#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+            (#{course.id},#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.teacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.name},#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
 
@@ -148,6 +148,7 @@
 
     <resultMap type="com.ym.mec.biz.dal.dto.TeacherAttendanceDto" id="TeacherAttendanceViewUtilEntity">
         <result property="courseScheduleId" column="id_"/>
+        <result property="courseScheduleName" column="course_schedule_name_"/>
         <result property="classDate" column="class_date_"/>
         <result property="startClassTime" column="start_class_time_"/>
         <result property="endClassTime" column="end_class_time_"/>
@@ -166,9 +167,10 @@
             resultMap="TeacherAttendanceViewUtilEntity">
         SELECT
             cs.id_ ,
+            cs.name_ course_schedule_name_,
             cs.class_date_,
             CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-            cs.end_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
             cs.status_ course_status_,
             cg.id_ class_id,
             cg.name_ class_name,
@@ -303,14 +305,14 @@
 	        cs.teach_mode_
         FROM
             course_schedule cs
-            LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
+            LEFT JOIN sys_user su ON cs.actual_teacher_id_=su.id_
             LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
             LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
             LEFT JOIN school s ON mg.school_id_=s.id_
 	        LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
         WHERE
             cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
-            AND cs.teacher_id_ = #{teacherId}
+            AND cs.actual_teacher_id_ = #{teacherId}
     </select>
 
     <select id="getCourseScheduleDateByMonth" resultType="java.util.Date">
@@ -433,10 +435,9 @@
         SELECT
         cs.class_date_
         FROM
-        class_group_student_mapper cgsm
-        LEFT JOIN course_schedule cs ON cgsm.class_group_id_ = cs.class_group_id_
+        course_schedule cs
         WHERE
-        cs.teacher_id_ = #{teacherId}
+        cs.actual_teacher_id_ = #{teacherId}
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>

+ 6 - 0
mec-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -88,4 +88,10 @@ create_time_ = #{createTime},
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_schedule_student_payment
 	</select>
+    <select id="findByCourseScheduleIds" resultMap="CourseScheduleStudentPayment">
+		SELECT * FROM course_schedule_student_payment WHERE course_schedule_id_ IN
+		<foreach collection="ids" item="id" open="(" close=")" separator=",">
+			#{id}
+		</foreach>
+    </select>
 </mapper>

+ 11 - 0
mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -137,4 +137,15 @@ create_time_ = #{createTime},
 			LEFT JOIN course_schedule cs ON vgcgm.class_group_id_ = cs.class_group_id_
 		<include refid="vipGroupSalaryQueryCondition"/>
 	</select>
+    <select id="findSomeDayAgoTeacherCourseSalaryNoSettlement" resultMap="CourseScheduleTeacherSalary">
+		SELECT
+		cs.class_date_,
+		csts.*
+		FROM
+		course_schedule_teacher_salary csts
+		LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
+		WHERE
+		CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) &lt;= DATE_ADD( NOW( ), INTERVAL - 7 DAY )
+		AND csts.settlement_time_ IS NULL
+    </select>
 </mapper>

+ 1 - 2
mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherAttendanceController.java

@@ -26,8 +26,7 @@ public class TeacherAttendanceController extends BaseController {
     @ApiOperation(value = "新增教师签到")
     @PostMapping("/add")
     public Object add(@RequestBody TeacherSignOutDto teacherSignOutDto) {
-        teacherAttendanceService.addTeacherAttendanceRecord(teacherSignOutDto);
-        return succeed();
+        return succeed(teacherAttendanceService.addTeacherAttendanceRecord(teacherSignOutDto));
     }
 
     @ApiOperation(value = "分页查询教师签到列表")

+ 5 - 0
mec-web/src/main/java/com/ym/mec/web/controller/education/CourseHomeworkTemplateController.java

@@ -11,6 +11,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Objects;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/18
@@ -42,6 +44,9 @@ public class CourseHomeworkTemplateController extends BaseController {
     @ApiOperation(value = "修改作业模板")
     @PostMapping("/update")
     public Object update(CourseHomeworkTemplate courseHomeworkTemplate){
+        if(Objects.isNull(courseHomeworkTemplate.getId())){
+            return failed("请指定作业模板");
+        }
         courseHomeworkTemplateService.update(courseHomeworkTemplate);
         return succeed();
     }