Merge branch 'saas_export' of http://git.dayaedu.com/yonge/mec into master_saas

 Conflicts:

	mec-biz/src/main/java/com/ym/mec/biz/service/ExportFunction.java

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -78,6 +78,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 	public IndexBaseDto getIndexBaseDto(IndexDataType indexDataType,List<IndexBaseMonthData> indexBaseMonthData) {
 		BigDecimal reduce = indexBaseMonthData.stream().map(e -> e.getPercent()).reduce(BigDecimal.ZERO, BigDecimal::add);
+		indexBaseMonthData.stream().forEach(e -> {
+			e.setDataType(indexDataType);
+			e.setTitle(indexDataType.getMsg());
+		});
 		return new IndexBaseDto(indexDataType,reduce,indexBaseMonthData);
 	}
 

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

@@ -1624,6 +1624,7 @@
 		</if>
 		GROUP BY spo.organ_id_,spo.type_
 		)c ON c.organ_id_ = o.id_
+		WHERE o.tenant_id_ = #{tenantId}
 		GROUP BY o.id_ ORDER BY percent_ DESC
 	</select>
 

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

@@ -1806,11 +1806,12 @@ public class ExportController extends BaseController {
             if(row.getType() == 2){
                 row.setSubject("乐理");
             }
+            row.setGender("1".equals(row.getGender()) ? "男" : "女");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
             String[] header = {"姓名", "性别", "编号", "证件号码", "城市", "学校", "报考乐器", "报考级别", "级别", "乐理级别证书", "家长联系电话", "考级费用","备注", "缴费状态", "订单编号", "商户订单号", "报名时间"};
-            String[] body = {"name", "gender == 1?'男':'女'","id", "idcard", "city", "school", "subject", "level","activityTag",
+            String[] body = {"name", "gender","id", "idcard", "city", "school", "subject", "level","activityTag",
                     "theoryCert", "mobile", "money", "memo", "status == 2?'已缴费':status == 3?'已退费':'未缴费'", "orderNo", "transNo", "createTime"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");