Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -9,6 +9,7 @@
     <resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
         <result column="id_" property="id"/>
         <result column="username_" property="username"/>
+        <result column="real_name_" property="realName"/>
         <result column="password_" property="password"/>
         <result column="salt_" property="salt"/>
         <result column="phone_" property="phone"/>

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

@@ -31,13 +31,33 @@ public class TeacherPersonalAttendanceDto {
     private String name;
 
     /** 状态(正常签到，异常签到) */
-    @ApiModelProperty(value = "状态(1正常签到，0异常签到) ",required = false)
-    private YesOrNoEnum status;
+    @ApiModelProperty(value = "签到状态(1正常签到，0异常签到) ",required = false)
+    private YesOrNoEnum signInStatus;
+
+    /** 状态(正常签到，异常签到) */
+    @ApiModelProperty(value = "签退状态(1正常签到，0异常签到) ",required = false)
+    private YesOrNoEnum signOutStatus;
 
     /** 备注 */
     @ApiModelProperty(value = "备注",required = false)
     private String remark;
 
+    public YesOrNoEnum getSignInStatus() {
+        return signInStatus;
+    }
+
+    public void setSignInStatus(YesOrNoEnum signInStatus) {
+        this.signInStatus = signInStatus;
+    }
+
+    public YesOrNoEnum getSignOutStatus() {
+        return signOutStatus;
+    }
+
+    public void setSignOutStatus(YesOrNoEnum signOutStatus) {
+        this.signOutStatus = signOutStatus;
+    }
+
     public String getClassDate() {
         return classDate;
     }
@@ -70,14 +90,6 @@ public class TeacherPersonalAttendanceDto {
         this.name = name;
     }
 
-    public YesOrNoEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(YesOrNoEnum status) {
-        this.status = status;
-    }
-
     public String getRemark() {
         return remark;
     }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.ConditionDto;
+import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.dto.SubjectApplyDetailDto;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SubjectGoodsMapper;
@@ -94,4 +95,11 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @return
      */
     List<String> findBySubIds(String subIds);
+
+    /**
+     * 获取收费类型关联的默认声部数据
+     * @param chargeTypeId
+     * @return
+     */
+    SubFeeSettingDto setSubjectInfo(Integer chargeTypeId);
 }

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dao.SubjectGoodsMapperDao;
 import com.ym.mec.biz.dal.dto.ConditionDto;
+import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.dto.SubjectApplyDetailDto;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SubjectGoodsMapper;
@@ -180,4 +181,9 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     public List<String> findBySubIds(String subIds) {
         return subjectDao.findBySubIds(subIds);
     }
+
+    @Override
+    public SubFeeSettingDto setSubjectInfo(Integer chargeTypeId) {
+        return null;
+    }
 }

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

@@ -272,7 +272,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}else if(DateUtil.minutesBetween(classEndDateAdd60Minutes,date) > 0){
 				teacherAttendance.setSignOutStatus(YesOrNoEnum.NO);
 			}else {
-				throw new BizException("签退时间异常");
+				return;
 			}
 			teacherAttendance.setSignOutTime(date);
 			teacherAttendanceDao.update(teacherAttendance);

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

@@ -131,7 +131,8 @@
         <result column="class_date_" property="classDate"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="name_" property="name"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="sign_in_status_" property="signInStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="sign_out_status_" property="signOutStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="remark_" property="remark"/>
     </resultMap>
 
@@ -161,7 +162,7 @@
     <select id="getTeacherPersonalAttendances" parameterType="map" resultMap="teacherPersonalAttendance">
         SELECT
             cs.class_date_,cs.start_class_time_,cs.name_,cs.type_,
-            ta.sign_in_status_ status_,ta.remark_
+            ta.sign_in_status_,ta.sign_out_status_,ta.remark_
         FROM
             teacher_attendance ta
         LEFT JOIN course_schedule cs ON ta.course_schedule_id_=cs.id_

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

@@ -65,6 +65,14 @@ public class SubjectController extends BaseController {
         return succeed(subjectService.findDefaultSubByChargeTypeId(chargeTypeId));
     }
 
+    @ApiOperation(value = "新建乐团时，获取设置声部费用默认数据")
+    @GetMapping("/setSubjectInfo")
+    @PreAuthorize("@pcs.hasPermissions('subject/setSubjectInfo')")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "chargeTypeId", value = "收费类型编号", required = true, dataType = "Integer")})
+    public Object setSubjectInfo(Integer chargeTypeId){
+        return succeed(subjectService.setSubjectInfo(chargeTypeId));
+    }
+
     @ApiOperation(value = "修改、新增声部关联的商品列表")
     @PostMapping("/markGoods")
     @PreAuthorize("@pcs.hasPermissions('subject/markGoods')")