Merge remote-tracking branch 'origin/children_day' into children_day

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
+import java.math.BigDecimal;
+
 public class ChildrenStatisticsDetailDto {
     private String username;
 
@@ -15,13 +17,11 @@ public class ChildrenStatisticsDetailDto {
 
     private String gradeLeave;
 
-    private boolean buyVip1v1Flag;
-
-    private boolean buyVip1v2Flag;
+    private boolean buyVipFlag = false;
 
-    private boolean buyTheoryCourseFlag;
+    private boolean buyTheoryCourseFlag = false;
 
-    private boolean totalAmount;
+    private BigDecimal totalAmount = BigDecimal.ZERO;
 
     public String getSubjectName() {
         return subjectName;
@@ -47,20 +47,12 @@ public class ChildrenStatisticsDetailDto {
         this.gradeLeave = gradeLeave;
     }
 
-    public boolean isBuyVip1v1Flag() {
-        return buyVip1v1Flag;
-    }
-
-    public void setBuyVip1v1Flag(boolean buyVip1v1Flag) {
-        this.buyVip1v1Flag = buyVip1v1Flag;
-    }
-
-    public boolean isBuyVip1v2Flag() {
-        return buyVip1v2Flag;
+    public boolean isBuyVipFlag() {
+        return buyVipFlag;
     }
 
-    public void setBuyVip1v2Flag(boolean buyVip1v2Flag) {
-        this.buyVip1v2Flag = buyVip1v2Flag;
+    public void setBuyVipFlag(boolean buyVipFlag) {
+        this.buyVipFlag = buyVipFlag;
     }
 
     public boolean isBuyTheoryCourseFlag() {
@@ -71,11 +63,11 @@ public class ChildrenStatisticsDetailDto {
         this.buyTheoryCourseFlag = buyTheoryCourseFlag;
     }
 
-    public boolean isTotalAmount() {
+    public BigDecimal getTotalAmount() {
         return totalAmount;
     }
 
-    public void setTotalAmount(boolean totalAmount) {
+    public void setTotalAmount(BigDecimal totalAmount) {
         this.totalAmount = totalAmount;
     }
 

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

@@ -168,8 +168,7 @@
         <result property="subjectName" column="subject_name_"/>
         <result property="gradeLeave" column="grade_level_"/>
         <result property="theoryLevel" column="theory_level_"/>
-        <result property="buyVip1v1Flag" column="buy_vip_1v1_flag_"/>
-        <result property="buyVip1v2Flag" column="buy_vip_1v2_flag_"/>
+        <result property="buyVipFlag" column="buy_vip_flag_"/>
         <result property="buyTheoryCourseFlag" column="buy_theory_course_flag_"/>
         <result property="totalAmount" column="total_amount_"/>
     </resultMap>
@@ -181,8 +180,7 @@
     </select>
     <select id="queryChildrenStatisticsDetail" resultMap="ChildrenStatisticsDetailDtoMap">
         SELECT su.username_,su.phone_,cdr.user_id_,cdr.is_reserve_,s.name_ subject_name_,cdd.grade_level_,cdd.theory_level_,
-        CASE WHEN cdd.vip_1v1_price_ > 0 THEN 1 ELSE 0 END buy_vip_1v1_flag_,
-        CASE WHEN cdd.vip_1v2_price_ > 0 THEN 1 ELSE 0 END buy_vip_1v2_flag_,
+        CASE WHEN cdd.vip_1v1_price_ > 0 OR cdd.vip_1v2_price_ > 0 THEN 1 ELSE 0 END buy_vip_flag_,
         CASE WHEN cdd.theory_course_price_ > 0 THEN 1 ELSE 0 END buy_theory_course_flag_,cdd.total_amount_
         FROM children_day_reserve cdr
         LEFT JOIN children_day_degree_info cdd ON cdr.id_ = cdd.reserve_id_

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -169,8 +169,10 @@ public class ExportController extends BaseController {
        }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员姓名", "学员编号", "手机号", "是否预约"}, new String[]{
-                    "username", "userId", "phone", "isReserve == true ?'是':'否'"}, rows);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员姓名", "学员编号", "手机号", "是否预约","报考器乐", "器乐报考等级", "乐理报考等级", "是否购买VIP",
+                    "是否购买乐理课", "支付金额"}, new String[]{
+                    "username", "userId", "phone", "isReserve == true ?'是':'否'","subjectName"
+                    ,"theoryLevel","gradeLeave","buyVipFlag","buyTheoryCourseFlag","totalAmount"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
@@ -221,7 +223,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "合作单位", "乐团名称", "在读人数",
                     "预约人数", "未预约人数", "器乐考级人数", "乐理考级人数", "VIP课购买人数", "VIP课成交金额", "乐理课购买人数", "乐理课成交金额"}, new String[]{
                     "organName", "cooperationOrganName", "musicGroupName", "normalNum",
-                    "reserveNum", "noReserveNum", "instrumentalMusicNum", "musicTheoryNum","buyVipNum","buyVipAmount","buyMusicTheoryNum","buyMusicTheoryAmount"}, rows);
+                    "reserveNum", "noReserveNum", "instrumentalMusicNum", "musicTheoryNum","buyVip1Num","buyVip1Amount","buyVip2Num","buyVip2Amount","buyMusicTheoryNum","buyMusicTheoryAmount"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");