Ver código fonte

是否云教练作业查询

zouxuan 3 anos atrás
pai
commit
150bdedf9f

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseHomeWorkTemplateQueryInfo.java

@@ -26,6 +26,17 @@ public class CourseHomeWorkTemplateQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "课程组类型")
     private String groupType = "MUSIC";
 
+    @ApiModelProperty(value = "是否云教练作业")
+    private Boolean cloudHomeworkFlag;
+
+    public Boolean getCloudHomeworkFlag() {
+        return cloudHomeworkFlag;
+    }
+
+    public void setCloudHomeworkFlag(Boolean cloudHomeworkFlag) {
+        this.cloudHomeworkFlag = cloudHomeworkFlag;
+    }
+
     public String getOrganId() {
         return organId;
     }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.page;
 
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
@@ -30,6 +31,17 @@ public class ExtraExercilseQueryInfo extends QueryInfo {
 
 	private Date assignEndTime;// 布置作业的结束时间
 
+	@ApiModelProperty(value = "是否云教练作业")
+	private Boolean cloudHomeworkFlag;
+
+	public Boolean getCloudHomeworkFlag() {
+		return cloudHomeworkFlag;
+	}
+
+	public void setCloudHomeworkFlag(Boolean cloudHomeworkFlag) {
+		this.cloudHomeworkFlag = cloudHomeworkFlag;
+	}
+
 	public String getStartTime() {
 		return startTime;
 	}

+ 8 - 1
mec-biz/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -323,6 +323,12 @@
 			<if test="classEndDate != null and classEndDate != ''">
 				AND cs.class_date_ &lt;= #{classEndDate}
 			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == true">
+				AND sch.music_score_id_ IS NOT NULL AND sch.music_score_id_ != ''
+			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == false">
+				AND (sch.music_score_id_ IS NULL OR sch.music_score_id_ = '')
+			</if>
 			<if test="search != null and search != ''">
 				AND (cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%')
 				OR mg.name_ LIKE CONCAT('%',#{search},'%')
@@ -331,8 +337,9 @@
 		</where>
 	</sql>
 	<select id="findHomeCount" resultType="java.lang.Integer">
-		SELECT COUNT(ch.id_)
+		SELECT COUNT(DISTINCT ch.id_)
 		FROM course_homework ch
+		LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
 		LEFT JOIN course_schedule cs ON cs.id_ = ch.course_schedule_id_
 		LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
 		LEFT JOIN organization o ON o.id_ = cs.organ_id_

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

@@ -46,6 +46,12 @@
 			<if test="assignEndTime != null">
 				AND date(ee.create_time_) &lt;= #{assignEndTime}
 			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == true">
+				AND eer.music_score_id_ IS NOT NULL AND eer.music_score_id_ != ''
+			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == false">
+				AND (eer.music_score_id_ IS NULL OR eer.music_score_id_ = '')
+			</if>
 		</where>
 	</sql>
 	
@@ -123,9 +129,10 @@
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(ee.id_) FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
+		SELECT COUNT(DISTINCT 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_
+		LEFT JOIN extracurricular_exercises_reply eer ON ee.id_ = eer.extracurricular_exercises_id_
 		<include refid="queryPageCondition"/>
 	</select>