Merge remote-tracking branch 'origin/master'

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

@@ -52,6 +52,8 @@ public class ExtracurricularExercises {
 	private int isSubmit;
 
 	private int status;
+	
+	private String organName;
 
 	public int getStatus() {
 		return status;
@@ -181,6 +183,14 @@ public class ExtracurricularExercises {
 		this.teacher = teacher;
 	}
 
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -43,6 +43,8 @@ public class ExtracurricularExercisesReply {
 	/** 是否已查看 */
 	private Integer isView;
 	
+	private String organName;
+	
 	public ExtracurricularExercises getExtracurricularExercises() {
 		return extracurricularExercises;
 	}
@@ -139,6 +141,14 @@ public class ExtracurricularExercisesReply {
 		this.user = user;
 	}
 
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ExtraExercilseQueryInfo.java

@@ -19,6 +19,8 @@ public class ExtraExercilseQueryInfo extends QueryInfo {
 	private Date createTime;
 
 	private String title;// 作业标题
+	
+	private Integer organId;
 
 	private Date assignStartTime;// 布置作业的开始时间
 
@@ -64,6 +66,14 @@ public class ExtraExercilseQueryInfo extends QueryInfo {
 		this.title = title;
 	}
 
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
 	public Date getAssignStartTime() {
 		return assignStartTime;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ExtraExercilseReplyQueryInfo.java

@@ -27,6 +27,8 @@ public class ExtraExercilseReplyQueryInfo extends QueryInfo {
 	/** 是否已查看 */
 	private Integer isView;
 	
+	private Integer organId;
+	
 	private Date submitStartTime;// 提交作业的开始时间
 
 	private Date submitEndTime;// 提交作业的结束时间
@@ -55,6 +57,14 @@ public class ExtraExercilseReplyQueryInfo extends QueryInfo {
 		this.studentId = studentId;
 	}
 
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
 	public Date getSubmitStartTime() {
 		return submitStartTime;
 	}

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

@@ -20,6 +20,7 @@
 		<result column="expect_num_" property="expectNum" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="organ_name_" property="organName" />
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -33,6 +34,9 @@
 			<if test="batchNo != null">
 				and batch_no_ = #{batchNo}
 			</if>
+			<if test="organId != null">
+				AND o.id_ = #{organId}
+			</if>
 			<if test="assignStartTime != null">
 				AND date(ee.create_time_) &gt;= #{assignStartTime}
 			</if>
@@ -108,14 +112,18 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
-		SELECT ee.*,u.username_ FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
+		SELECT ee.*,u.username_,o.name_ organ_name_ FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
+		left join teacher t on t.id_ = ee.teacher_id_
+		left join organization o on o.id_ = t.organ_id_
 		<include refid="queryPageCondition"/>
 		ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(ee.id_) FROM extracurricular_exercises ee
+		SELECT COUNT(ee.id_) FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
+		left join teacher t on t.id_ = ee.teacher_id_
+		left join organization o on o.id_ = t.organ_id_
 		<include refid="queryPageCondition"/>
 	</select>
 

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

@@ -19,6 +19,7 @@
 		<result column="status_" property="status" />
 		<result column="is_replied_" property="isReplied" />
 		<result column="is_view_" property="isView" />
+		<result column="organ_name_" property="organName" />
 	</resultMap>
 
 	<resultMap id="ExtraExerciseStudentsDto" type="com.ym.mec.biz.dal.dto.ExtraExerciseStudentsDto" extends="ExtracurricularExercisesReply">
@@ -38,6 +39,9 @@
 			<if test="teacherId != null">
 				AND teacher_id_ = #{teacherId}
 			</if>
+			<if test="organId != null">
+				AND o.id_ = #{organId}
+			</if>
 			<if test="studentId != null">
 				AND user_id_ = #{studentId}
 			</if>
@@ -134,8 +138,10 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercisesReply" parameterType="map">
-		SELECT eer.*,u.username_,ee.title_ FROM extracurricular_exercises_reply eer left join extracurricular_exercises ee on eer.extracurricular_exercises_id_ = ee.id_
+		SELECT eer.*,u.username_,ee.title_,o.name_ organ_name_ 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_
+		left join teacher t on t.id_ = ee.teacher_id_
+		left join organization o on o.id_ = t.organ_id_
 		<include refid="queryPageCondition"/>
 		 ORDER BY eer.id_ <include refid="global.limit"/>
 	</select>
@@ -144,6 +150,8 @@
 	<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_
+		left join teacher t on t.id_ = ee.teacher_id_
+		left join organization o on o.id_ = t.organ_id_
 		<include refid="queryPageCondition"/>
 	</select>