Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercisesReply.java

@@ -15,6 +15,8 @@ public class ExtracurricularExercisesReply {
 	/**  */
 	private Long extracurricularExercisesId;
 	
+	private ExtracurricularExercises extracurricularExercises = new ExtracurricularExercises();
+	
 	/**  */
 	private Integer userId;
 	
@@ -41,6 +43,14 @@ public class ExtracurricularExercisesReply {
 	/** 是否已查看 */
 	private Integer isView;
 	
+	public ExtracurricularExercises getExtracurricularExercises() {
+		return extracurricularExercises;
+	}
+
+	public void setExtracurricularExercises(ExtracurricularExercises extracurricularExercises) {
+		this.extracurricularExercises = extracurricularExercises;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -9,6 +9,7 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" id="ExtracurricularExercisesReply">
 		<result column="id_" property="id" />
 		<result column="extracurricular_exercises_id_" property="extracurricularExercisesId" />
+		<result column="title_" property="extracurricularExercises.title" />
 		<result column="user_id_" property="userId" />
 		<result column="username_" property="user.username" />
 		<result column="attachments_" property="attachments" />
@@ -43,6 +44,9 @@
 			<if test="title != null">
 				title_ = #{title}
 			</if>
+			<if test="search != null">
+				title_ like concat('%',#{search},'%') or u.username_ like concat('%',#{search},'%')
+			</if>
 			<if test="submitStartTime != null">
 				AND eer.create_time_ &gt;= #{submitStartTime}
 			</if>
@@ -121,7 +125,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercisesReply" parameterType="map">
-		SELECT eer.*,u.username_ FROM extracurricular_exercises_reply eer left join extracurricular_exercises ee on eer.extracurricular_exercises_id_ = ee.id_
+		SELECT eer.*,u.username_,ee.title_ FROM extracurricular_exercises_reply eer left join extracurricular_exercises ee on eer.extracurricular_exercises_id_ = ee.id_
 		left join sys_user u on eer.user_id_ = u.id_
 		<include refid="queryPageCondition"/>
 		 ORDER BY eer.id_ <include refid="global.limit"/>
@@ -130,6 +134,7 @@
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(eer.id_) FROM extracurricular_exercises_reply eer left join extracurricular_exercises ee on eer.extracurricular_exercises_id_ = ee.id_
+		left join sys_user u on eer.user_id_ = u.id_
 		<include refid="queryPageCondition"/>
 	</select>