|
@@ -139,6 +139,8 @@ public class ExportController extends BaseController {
|
|
|
private EmployeeInfoService employeeInfoService;
|
|
|
@Autowired
|
|
|
private StudentService studentService;
|
|
|
+ @Autowired
|
|
|
+ private OrganizationService organizationService;
|
|
|
|
|
|
@ApiOperation(value = "21年暑期考级活动统计页面详情导出")
|
|
|
@PostMapping("export/statisticsDetail")
|
|
@@ -1291,7 +1293,17 @@ public class ExportController extends BaseController {
|
|
|
throw new BizException("没有可导出的记录");
|
|
|
}
|
|
|
List<MusicalListDetailDto> musicalListDetails = studentPaymentOrderDetailService.getMusicalListDetail(queryInfo.getMusicGroupId(), null);
|
|
|
+ //获取分部年级列表
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(queryInfo.getMusicGroupId());
|
|
|
+ Map<Integer, String> gradeList = organizationService.getGradeList(musicGroup.getOrganId());
|
|
|
for (StudentApplyDetailDto studentApplyDetailDto : studentApplyDetail) {
|
|
|
+ if(StringUtils.isNotEmpty(studentApplyDetailDto.getCurrentGrade())){
|
|
|
+ String grade = gradeList.get(Integer.parseInt(studentApplyDetailDto.getCurrentGrade()));
|
|
|
+ if(StringUtils.isNotEmpty(grade)){
|
|
|
+ studentApplyDetailDto.setCurrentGrade(grade);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
for (MusicalListDetailDto musicalListDetail : musicalListDetails) {
|
|
|
if (!musicalListDetail.getUserId().equals(studentApplyDetailDto.getStudentId())) continue;
|
|
|
studentApplyDetailDto.setKitGroupPurchaseTypeEnum(musicalListDetail.getKitGroupPurchaseTypeEnum());
|
|
@@ -1417,7 +1429,17 @@ public class ExportController extends BaseController {
|
|
|
PageInfo<MusicGroupStudentsDto> musicGroupStudentsDtoPageInfo = studentManageService.queryMusicGroupStudent(queryInfo);
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
try {
|
|
|
+ //获取分部年级列表
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(queryInfo.getMusicGroupId());
|
|
|
+ Map<Integer, String> gradeList = organizationService.getGradeList(musicGroup.getOrganId());
|
|
|
for (MusicGroupStudentsDto row : musicGroupStudentsDtoPageInfo.getRows()) {
|
|
|
+ if(StringUtils.isNotEmpty(row.getCurrentGrade())){
|
|
|
+ String grade = gradeList.get(Integer.parseInt(row.getCurrentGrade()));
|
|
|
+ if(StringUtils.isNotEmpty(grade)){
|
|
|
+ row.setCurrentGrade(grade);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (row.getGender() != null) {
|
|
|
if (row.getGender().equals("1")) {
|
|
|
row.setGender("男");
|