Merge branch 'Joburgess'

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

@@ -35,12 +35,12 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "班级编号，房间号",required = false)
     private String sealClassId;
 
-    /*@ApiModelProperty(value = "签到状态(1正常，0异常,3未签到)",required = false)
+    @ApiModelProperty(value = "签到状态(1正常，0异常,3未签到)",required = false)
     private Integer signInStatus;
 
-    @ApiModelProperty(value = "签退状态(11正常，0异常,3未签到)",required = false)
+    @ApiModelProperty(value = "签退状态(1正常，0异常,3未签到)",required = false)
     private Integer signOutStatus;
-*/
+
     @ApiModelProperty(value = "教师角色")
     private TeachTypeEnum teacherRole;
 
@@ -80,6 +80,22 @@ public class CourseScheduleDto extends CourseSchedule {
 
     private int isNew;
 
+    public Integer getSignInStatus() {
+        return signInStatus;
+    }
+
+    public void setSignInStatus(Integer signInStatus) {
+        this.signInStatus = signInStatus;
+    }
+
+    public Integer getSignOutStatus() {
+        return signOutStatus;
+    }
+
+    public void setSignOutStatus(Integer signOutStatus) {
+        this.signOutStatus = signOutStatus;
+    }
+
     public Integer getComplaintsStatus() {
         return complaintsStatus;
     }

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

@@ -21,6 +21,7 @@ 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;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
@@ -74,10 +75,11 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		return teacherAttendanceDao;
 	}
 
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
 	@Override
 	public Map<String, Object> addTeacherAttendanceRecord(TeacherSignOutDto teacherSignOutDto) {
 		SysUser user = sysUserFeignService.queryUserInfo();
+		teacherDao.getLocked(user.getId());
 		if(Objects.isNull(user)){
 			throw new BizException("请登录");
 		}

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

@@ -55,6 +55,8 @@
         <result column="school_name_" property="schoolName"/>
         <result column="sign_in_status_" property="signInStatusEnum" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="sign_out_status_" property="signOutStatusEnum" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="sign_in_status_" property="signInStatus"/>
+        <result column="sign_out_status_" property="signOutStatus"/>
         <result column="sign_in_time_" property="signInTime"/>
         <result column="sign_out_time_" property="signOutTime"/>
         <result column="is_complaints_" property="isComplaints"/>
@@ -623,8 +625,8 @@
         cg.expect_student_num_,
         cs.schoole_id_,
         s.name_ school_name_,
-        if(ta.sign_in_status_ IS NULL,0,1) sign_in_status_,
-        if(ta.sign_out_status_ IS NULL,0,1) sign_out_status_,
+        IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
+        IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
         cs.teach_mode_
         FROM
         course_schedule_teacher_salary csts