Merge remote-tracking branch 'origin/master'

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

@@ -23,4 +23,28 @@ public class ArrearageStudentsQueryInfo extends QueryInfo {
     public void setOrganIds(String organIds) {
         this.organIds = organIds;
     }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
+    public Integer getEduTeacherId() {
+        return eduTeacherId;
+    }
+
+    public void setEduTeacherId(Integer eduTeacherId) {
+        this.eduTeacherId = eduTeacherId;
+    }
 }

mec-biz/src/main/resources/config/contracts/product.ftl

@@ -31,8 +31,9 @@
             font-size: 14px;
         }
         h1 {
-            font-size: 16px;
+            font-size: 18px;
             text-align: center;
+            margin-bottom: 8px;
         }
         h2 {
             font-size: 16px;

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

@@ -589,10 +589,10 @@
 		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= #{startTime}
 		AND (ta.sign_in_status_ != 1 OR ta.sign_out_status_ != 1 OR sa.status_ != 'NORMAL') AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
-		GROUP BY cs.id_) c
 		<if test="organIds != null and organIds != ''">
 			AND FIND_IN_SET(cs.organ_id_,#{organIds})
 		</if>
+		GROUP BY cs.id_) c
 	</select>
 	<select id="getNoAttendance" resultType="int">
 		SELECT COUNT(DISTINCT cs.id_) FROM course_schedule cs