Merge branch 'master' into review-zjh

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

@@ -97,7 +97,7 @@
     </select>
 
     <select id="getTotalAmount" parameterType="map" resultMap="DegreeRegistration">
-        SELECT SUM(money_) money_ ,SUM(theory_money_) theory_money_ FROM degree_registration
+        SELECT SUM(case when status_ = 2 then money_ else 0 end) money_ ,SUM(case when status_ = 2 then theory_money_ else 0 end) theory_money_ FROM degree_registration
         <include refid="queryPageSql"/>
     </select>
 

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

@@ -1591,14 +1591,14 @@ public class ExportController extends BaseController {
                 } else {
                     row.setGender("女");
                 }
-                if(row.getStatus().equals(2)){
-                    row.setStatusStr("缴费");
-                } else {
-                    row.setStatusStr("报名");
-                }
+				if (row.getStatus().equals(2)) {
+					row.setStatusStr("已缴费");
+				} else {
+					row.setStatusStr("未缴费");
+				}
             }
 
-            String[] header = {"姓名", "性别", "身份证号", "城市", "学校", "报考乐器", "报考级别", "乐理级别", "乐理级别证书", "家长联系电话", "考级费用", "乐理费用", "备注","报名状态","报名时间"};
+            String[] header = {"姓名", "性别", "身份证号", "城市", "学校", "报考乐器", "报考级别", "乐理级别", "乐理级别证书", "家长联系电话", "考级费用", "乐理费用", "备注","缴费状态","报名时间"};
             String[] body = {"name", "gender", "idcard", "city", "school", "subject", "level", "theoryLevel", "theoryCert", "mobile", "money", "theoryMoney", "memo","statusStr","createTime"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");