Merge branch 'children_day' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ChildrenStatisticsDto.java

@@ -38,8 +38,28 @@ public class ChildrenStatisticsDto {
 
     private BigDecimal buyMusicTheoryAmount = BigDecimal.ZERO;
 
+    private BigDecimal theoryPrice = BigDecimal.ZERO;
+
+    private BigDecimal gradePrice = BigDecimal.ZERO;
+
     private BigDecimal totalAmount = BigDecimal.ZERO;
 
+    public BigDecimal getTheoryPrice() {
+        return theoryPrice;
+    }
+
+    public void setTheoryPrice(BigDecimal theoryPrice) {
+        this.theoryPrice = theoryPrice;
+    }
+
+    public BigDecimal getGradePrice() {
+        return gradePrice;
+    }
+
+    public void setGradePrice(BigDecimal gradePrice) {
+        this.gradePrice = gradePrice;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

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

@@ -79,6 +79,8 @@
         <result property="buyVip1Num" column="buy_vip1_num_"/>
         <result property="buyVip2Amount" column="buy_vip2_amount_"/>
         <result property="buyVip2Num" column="buy_vip2_num_"/>
+        <result property="gradePrice" column="grade_price_"/>
+        <result property="theoryPrice" column="theory_price_"/>
         <result property="totalAmount" column="total_amount_"/>
         <result property="cooperationOrganName" column="cooperation_organ_name_"/>
         <result property="instrumentalMusicNum" column="instrumental_music_num_"/>
@@ -105,6 +107,8 @@
         SUM(cdd.vip_1v2_price_) 'buy_vip2_amount_',
         COUNT(CASE WHEN cdd.theory_course_price_ > 0 THEN 1 ELSE NULL END) 'buy_music_theory_num_',
         SUM(cdd.theory_course_price_) 'buy_music_theory_amount_',
+        SUM(cdd.grade_price_) 'grade_price_',
+        SUM(cdd.theory_price_) 'theory_price_',
         SUM(cdd.total_amount_) 'total_amount_'
         FROM children_day_reserve cdr
         LEFT JOIN children_day_degree_info cdd ON cdr.id_ = cdd.reserve_id_
@@ -136,6 +140,8 @@
         SUM(cdd.vip_1v2_price_) 'buy_vip2_amount_',
         SUM(CASE WHEN cdd.theory_course_price_ > 0 THEN 1 ELSE NULL END) 'buy_music_theory_num_',
         SUM(cdd.theory_course_price_) 'buy_music_theory_amount_',
+        SUM(cdd.grade_price_) 'grade_price_',
+        SUM(cdd.theory_price_) 'theory_price_',
         SUM(cdd.total_amount_) 'total_amount_'
         FROM children_day_reserve cdr
         LEFT JOIN children_day_degree_info cdd ON cdr.id_ = cdd.reserve_id_