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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/IndexBaseMonthData.java

@@ -73,7 +73,9 @@ public class IndexBaseMonthData extends BaseEntity {
 	public IndexBaseMonthData() {
 	}
 
-	public IndexBaseMonthData(Integer organId, String organName, BigDecimal percent) {
+	public IndexBaseMonthData(Integer organId, String organName,IndexDataType indexDataType, BigDecimal percent) {
+		this.dataType = indexDataType;
+		this.title = indexDataType.getMsg();
 		this.organId = organId;
 		this.organName = organName;
 		this.percent = percent;

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

@@ -300,7 +300,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 					VIP_AMOUNT.equals(typeDateMapEntry.getKey()) ||
 					PRACTICE_AMOUNT.equals(typeDateMapEntry.getKey()) ||
 					OTHER_AMOUNT.equals(typeDateMapEntry.getKey())){
-				indexBaseData.setOrganIndexMonthData(this.getOrganIndexMonthData(value));
+				indexBaseData.setOrganIndexMonthData(this.getOrganIndexMonthData(value,typeDateMapEntry.getKey()));
 				indexBaseData.setPercent(value.stream().map(IndexBaseMonthData::getPercent).reduce(BigDecimal.ZERO, BigDecimal::add));
 			}
 			if(IndexDataType.VIP_GROUP_COURSE.equals(typeDateMapEntry.getKey()) || VIP_GROUP_ONLINE_COURSE.equals(typeDateMapEntry.getKey()) ||
@@ -326,7 +326,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		return result;
 	}
 
-	public List<IndexBaseMonthData> getOrganIndexMonthData(List<IndexBaseMonthData> organIndexMonthData) {
+	public List<IndexBaseMonthData> getOrganIndexMonthData(List<IndexBaseMonthData> organIndexMonthData,IndexDataType indexDataType) {
 		if (!CollectionUtils.isEmpty(organIndexMonthData)){
 			List<IndexBaseMonthData> collect = organIndexMonthData.stream().filter(e -> e.getOrganId() != null && e.getOrganId() != 0).collect(Collectors.toList());
 			if(!CollectionUtils.isEmpty(collect)){
@@ -334,7 +334,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				Set<Integer> organIds = listMap.keySet();
 				Map<Integer, String> organMap = organizationService.getMap("organization", "id_", "name_",
 						organIds, TenantContextHolder.getTenantId(), Integer.class, String.class);
-				Function<Integer,IndexBaseMonthData> fun = (organId) -> new IndexBaseMonthData(organId,organMap.get(organId),
+				Function<Integer,IndexBaseMonthData> fun = (organId) -> new IndexBaseMonthData(organId,organMap.get(organId),indexDataType,
 						listMap.get(organId).stream().map(e->e.getPercent()).reduce(BigDecimal.ZERO,BigDecimal::add));
 				return organIds.stream().map(fun::apply).collect(Collectors.toList());
 			}

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

@@ -1868,131 +1868,6 @@ public class ExportController extends BaseController {
         }
     }
 
-/*    @ApiOperation(value = "财务管理导出")
-    @RequestMapping("export/routeOrderList")
-    @PreAuthorize("@pcs.hasPermissions('export/routeOrderList')")
-    public HttpResponseResult routeOrderList(StudentPaymentOrderQueryInfo queryInfo) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null || sysUser.getId() == null) {
-        	return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(sysUser.getId(),queryInfo.getOrganId(),sysUser.getIsSuperAdmin()));
-        if (StringUtils.isNotBlank(queryInfo.getSearch())) {
-            List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
-            List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
-            if (userIds.size() <= 0) {
-                userIds.add(0);
-            }
-            queryInfo.setUserIds(userIds);
-        }
-        queryInfo.setPage(1);
-        queryInfo.setRows(50000);
-        queryInfo.setIsExport(true);
-        queryInfo.setOrderType("3");
-        Map<String, Object> params = new HashMap<String, Object>();
-        MapUtil.populateMap(params, queryInfo);
-
-        int count = studentPaymentRouteOrderDao.queryCount(params);
-        if (count <= 0) {
-            return failed("没有可导出的数据");
-        }
-
-        if (count > 50000) {
-            return failed("数据集太大，不能导出.最大数据集不能超过50000");
-        }
-        queryInfo.setRoutingOrganId(null);
-
-        Date nowDate = new Date();
-        String no = idGeneratorService.generatorId("download") + "";
-        String fileName = "routeOrderList-" + no + "-" + DateUtil.getDate(nowDate) + ".xls";
-        ManagerDownload managerDownload = new ManagerDownload();
-        managerDownload.setType(ExportTypeEnum.ROUTE_ORDER);
-        managerDownload.setUserId(sysUser.getId());
-        managerDownload.setName(fileName);
-        managerDownload.setFileUrl("");
-        managerDownload.setCreateTime(nowDate);
-        managerDownload.setUpdateTime(nowDate);
-        managerDownloadDao.insert(managerDownload);
-        exportService.routeOrderList(params, managerDownload, sysUser.getTenantId() <= 0);
-        HttpResponseResult<Object> succeed = succeed();
-        succeed.setMsg(fileName + "导出申请已提交,请到【报表中心-下载列表查看】");
-        return succeed;
-    }
-
-    @ApiOperation(value = "学员小课记录导出")
-    @RequestMapping("export/studentVipPractice")
-    @PreAuthorize("@pcs.hasPermissions('export/studentVipPractice')")
-    public HttpResponseResult exportStudentVipPractice(String organId) throws IOException {
-        Boolean hasCourse = courseScheduleStudentPaymentDao.hasCourse(organId, TenantContextHolder.getTenantId());
-        if (hasCourse == null || !hasCourse) {
-            return failed("没有可导出的数据");
-        }
-        Integer tenantId = TenantContextHolder.getTenantId();
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Date nowDate = new Date();
-        String no = idGeneratorService.generatorId("download") + "";
-        String fileName = "studentVipPractice-" + no + "-" + DateUtil.getDate(nowDate) + ".xls";
-        ManagerDownload managerDownload = new ManagerDownload();
-        managerDownload.setType(ExportTypeEnum.STUDENT_VIP_PRACTICE);
-        managerDownload.setUserId(sysUser.getId());
-        managerDownload.setName(fileName);
-        managerDownload.setFileUrl("");
-        managerDownload.setCreateTime(nowDate);
-        managerDownload.setUpdateTime(nowDate);
-        managerDownloadDao.insert(managerDownload);
-        exportService.studentVipPractice(organId, managerDownload, tenantId);
-        HttpResponseResult<Object> succeed = succeed();
-        succeed.setMsg(fileName + "导出申请已提交,请到【报表中心-下载列表查看】");
-        return succeed;
-    }
-
-    @ApiOperation(value = "订单列表导出")
-    @RequestMapping("export/orderList")
-    @PreAuthorize("@pcs.hasPermissions('export/orderList')")
-    public HttpResponseResult orderList(StudentPaymentOrderQueryInfo queryInfo) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null || sysUser.getId() == null){
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(sysUser.getId(),queryInfo.getOrganId(),sysUser.getIsSuperAdmin()));
-        if (StringUtils.isNotBlank(queryInfo.getSearch())) {
-            List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
-            List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
-            if (userIds.size() <= 0) {
-                userIds.add(0);
-            }
-            queryInfo.setUserIds(userIds);
-        }
-        queryInfo.setPage(1);
-        queryInfo.setRows(50000);
-        queryInfo.setIsExport(true);
-        Map<String, Object> params = new HashMap<>();
-        MapUtil.populateMap(params, queryInfo);
-        int count = studentPaymentOrderDao.queryCount(params);
-        if (count <= 0) {
-            return failed("没有可导出的数据");
-        }
-
-        if (count > 50000) {
-            return failed("数据集太大，不能导出.最大数据集不能超过50000");
-        }
-        Date nowDate = new Date();
-        String no = idGeneratorService.generatorId("download") + "";
-        String fileName = "orderList-" + no + "-" + DateUtil.getDate(nowDate) + ".xls";
-        ManagerDownload managerDownload = new ManagerDownload();
-        managerDownload.setType(ExportTypeEnum.ORDER);
-        managerDownload.setUserId(sysUser.getId());
-        managerDownload.setName(fileName);
-        managerDownload.setFileUrl("");
-        managerDownload.setCreateTime(nowDate);
-        managerDownload.setUpdateTime(nowDate);
-        managerDownloadDao.insert(managerDownload);
-        exportService.orderList(params, managerDownload, sysUser.getTenantId() <= 0);
-        HttpResponseResult<Object> succeed = succeed();
-        succeed.setMsg(fileName + "导出申请已提交,请到【报表中心-下载列表查看】");
-        return succeed;
-    }*/
-
     @ApiOperation(value = "终课表列表导出")
     @GetMapping("export/superFindCourseSchedules")
     @PreAuthorize("@pcs.hasPermissions('export/superFindCourseSchedules')")