zouxuan %!s(int64=5) %!d(string=hai) anos
pai
achega
7127aa5cf7

+ 9 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Teacher.java

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
+import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -52,6 +53,10 @@ public class Teacher extends SysUser {
 	@ApiModelProperty(value = "专业技能(支持多个,用逗号分隔),对应科目表编号", required = false)
 	private String subjectId;
 
+	/** 专业技能(支持多个,用|分隔),对应科目表编号 */
+	@ApiModelProperty(value = "专业技能(支持多个,用逗号分隔),对应科目表名称", required = false)
+	private String subjectName;
+
 	/** 入职时间 */
 	@ApiModelProperty(value = "入职时间", required = false)
 	private java.util.Date entryDate;
@@ -68,6 +73,10 @@ public class Teacher extends SysUser {
 	@ApiModelProperty(value = "流动范围(多个用逗号分开)", required = false)
 	private String flowOrganRange;
 
+	/** 流动范围(多个用|分开) */
+	@ApiModelProperty(value = "流动范围(多个用逗号分开)", required = false)
+	private List<String> flowOrganRangeName;
+
 	@ApiModelProperty(value = "老师介绍", required = false)
 	private String introduction;
 	

+ 4 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -112,7 +112,9 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 				teachers.add(musicGroup.getDirectorUserId());
 				teachers.removeAll(Collections.singleton(null));
 				//获取乐团群用户总数
-				e.setCount(musicGroupDao.countMusicGroupUserNum(e.getId()) + teachers.size());
+				Integer count = musicGroupDao.countMusicGroupUserNum(e.getId());
+				int num = count == null?0:count;
+				e.setCount(teachers.size() + num);
 				e.setId("mg" + e.getId());
 			});
 		}else {
@@ -144,7 +146,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		if(teachers != null && teachers.size() > 0){
 			teachers.forEach(e->{
 				if(StringUtils.isNotEmpty(e.getSubjectId())){
-					e.setSubjectId(JSON.toJSONString(subjectDao.findBySubIds(e.getSubjectId())));
+					e.setSubjectId(StringUtils.join(subjectDao.findBySubIds(e.getSubjectId()),","));
 				}
 			});
 		}

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

@@ -31,7 +31,6 @@
         <result column="sign_in_status_" property="signInStatus"/>
         <result column="sign_out_status_" property="signOutStatus"/>
         <result column="seal_class_id_" property="sealClassId"/>
-        <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.entity.StudentCourseScheduleRecordDto" id="studentCourseScheduleRecord">
@@ -276,7 +275,8 @@
             CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
             cs.status_,
 	        su.username_ teacher_name_,
-	        cgsm.status_ attendance_status_
+	        cgsm.status_ attendance_status_,
+	        cs.teach_mode_
         FROM
             course_schedule cs
             LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
@@ -298,16 +298,16 @@
             CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
             cs.status_,
 	        s.name_ school_name_,
-	        cg.teach_mode_,
-	        ta.sign_in_status_ sign_in_status_,
-	        ta.sign_out_status_ sign_out_status_
+	        ta.sign_in_status_,
+	        ta.sign_out_status_,
+	        cg.teach_mode_
         FROM
             course_schedule cs
             LEFT JOIN sys_user su ON cs.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.class_group_id_ AND ta.teacher_id_=#{teacherId}
+	        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}

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

@@ -239,10 +239,10 @@
 		LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
 		WHERE cg.music_group_id_ = #{musicGroupId} GROUP BY su.id_
 	</select>
-	<select id="queryTeacherGroups" resultMap="ImUserModel">
+	<select id="queryTeacherGroups" resultMap="com.ym.mec.biz.dal.dao.ClassGroupDao.imGroupModel">
 		SELECT mg.id_,mg.name_,mg.img_ FROM music_group mg
 		WHERE (team_teacher_id_ = #{userId} OR educational_teacher_id_ = #{userId} OR operator_user_id_ = #{userId} OR director_user_id_ = #{userId})
-		<if test="search != null">
+		<if test="search != null and search != ''">
 			AND mg.name_ LIKE CONCAT('%',#{search},'%')
 		</if>
 	</select>

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -171,8 +171,8 @@
 		INTERVAL #{recentMin} MINUTE) >= date(send_time_)]]>
 	</select>
 
-	<select id="queryCountOfUnread" resultType="int" parameterType="java.lang.Long">
+	<select id="queryCountOfUnread" resultType="int">
 		select count(*) from sys_message
-		where user_id_ = #{userId,jdbcType=BIGINT} and read_status_ = 0
+		where user_id_ = #{userId} and read_status_ = 0
 	</select>
 </mapper>