Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ChargeTypeOrganizationFeeDao.java

@@ -12,5 +12,5 @@ public interface ChargeTypeOrganizationFeeDao extends BaseDAO<Integer, ChargeTyp
      * @param organId
      * @return
      */
-    ChargeTypeOrganizationFee findByOrganId(@Param("chargeTypeId") Integer chargeTypeId, @Param("organId") String organId);
+    ChargeTypeOrganizationFee findByOrganId(@Param("chargeTypeId") Integer chargeTypeId, @Param("organId") Integer organId);
 }

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

@@ -3,11 +3,6 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.util.Date;
-
-import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-
 /**
  * @Author Joburgess
  * @Date 2019/9/16
@@ -32,29 +27,29 @@ public class TeacherPersonalAttendanceDto {
 
     /** 状态(正常签到，异常签到) */
     @ApiModelProperty(value = "签到状态(1正常签到，0异常签到) ",required = false)
-    private YesOrNoEnum signInStatus;
+    private Integer signInStatus;
 
     /** 状态(正常签到，异常签到) */
     @ApiModelProperty(value = "签退状态(1正常签到，0异常签到) ",required = false)
-    private YesOrNoEnum signOutStatus;
+    private Integer signOutStatus;
 
     /** 备注 */
     @ApiModelProperty(value = "备注",required = false)
     private String remark;
 
-    public YesOrNoEnum getSignInStatus() {
+    public Integer getSignInStatus() {
         return signInStatus;
     }
 
-    public void setSignInStatus(YesOrNoEnum signInStatus) {
+    public void setSignInStatus(Integer signInStatus) {
         this.signInStatus = signInStatus;
     }
 
-    public YesOrNoEnum getSignOutStatus() {
+    public Integer getSignOutStatus() {
         return signOutStatus;
     }
 
-    public void setSignOutStatus(YesOrNoEnum signOutStatus) {
+    public void setSignOutStatus(Integer signOutStatus) {
         this.signOutStatus = signOutStatus;
     }
 

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

@@ -36,7 +36,7 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @param chargeTypeId
      * @return
      */
-    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,String organId,Integer number);
+    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,Integer organId,Integer number);
 
     /**
      * 通过乐团编号获取声部列表以及声部报名、缴费、计划人数

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

@@ -59,7 +59,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     }
 
     @Override
-    public List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,String organId,Integer number) {
+    public List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,Integer organId,Integer number) {
         List<Subject> subByChargeTypeId = subjectDao.findDefaultSubByChargeTypeId(chargeTypeId);
         ChargeTypeOrganizationFee byOrganId = chargeTypeOrganizationFeeDao.findByOrganId(chargeTypeId, organId);
         if(byOrganId != null){

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

@@ -75,7 +75,8 @@
 
     <select id="findByOrganId" resultMap="chargeTypeOrganizationFee">
 		SELECT * FROM charge_type_organization_fee ctof
-		WHERE ctof.charge_type_id_ = #{chargeTypeId} AND FIND_INT_SET(ctof.organ_id_,#{organId})
-		ORDER BY ctof.create_time_ DESC LIMIT 1
+		WHERE ctof.charge_type_id_ = #{chargeTypeId} AND ctof.organ_id_ = #{organId}
+		ORDER BY ctof.create_time_ DESC
+		LIMIT 1
 	</select>
 </mapper>

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

@@ -201,11 +201,12 @@
 	</resultMap>
 
     <select id="queryUserMusicGroups" resultMap="queryUserMusicGroupsMap">
-		SELECT sr.id_ register_id_,sr.name_ user_name_,sr.current_class_,sr.current_grade_
+		SELECT sr.id_ register_id_,su.username_ user_name_,sr.current_class_,sr.current_grade_
 		,mg.name_ music_group_name_,s.name_ subject_name_,s.id_ subject_id_,mg.id_ music_group_id_
 		FROM student_registration sr
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
+		LEFT JOIN sys_user su ON  su.id_ = sr.user_id_
 		WHERE sr.user_id_ = #{userId} AND sr.music_group_status_ != 'QUIT'
 		ORDER BY mg.create_time_ DESC
 	</select>

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

@@ -261,7 +261,7 @@
         <result column="remark_" property="remark"/>
     </resultMap>
     <select id="queryStudentDetailPage" resultMap="studentApplyDetail">
-        SELECT sr.id_, sr.user_id_,sr.name_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,
+        SELECT sr.id_, sr.user_id_,su.username_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,
         su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_
         actual_subject_name_,sr.parents_phone_,sr.payment_status_,sr.remark_
         FROM student_registration sr

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

@@ -133,8 +133,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="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="sign_in_status_" property="signInStatus"/>
+        <result column="sign_out_status_" property="signOutStatus"/>
         <result column="remark_" property="remark"/>
     </resultMap>
 

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

@@ -63,7 +63,7 @@ public class SubjectController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('subject/findDefaultSubByChargeTypeId')")
     @ApiImplicitParams({ @ApiImplicitParam(name = "chargeTypeId", value = "收费类型编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "organId", value = "分部编号", required = true, dataType = "Integer")})
-    public Object findDefaultSubByChargeTypeId(Integer chargeTypeId,String organId,Integer number){
+    public Object findDefaultSubByChargeTypeId(Integer chargeTypeId,Integer organId,Integer number){
         if(chargeTypeId == null || organId == null || number == null){
             throw new BizException("参数校验错误");
         }