|
|
|
@ -25,7 +25,9 @@ import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; |
|
|
|
|
import org.jeecg.modules.demo.annualcompaward.entity.AnnualCompAward; |
|
|
|
|
import org.jeecg.modules.demo.annualcompaward.service.IAnnualCompAwardService; |
|
|
|
|
import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.AnnualCompetitionProjectRegistration; |
|
|
|
|
import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.TeamManagement; |
|
|
|
|
import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.IAnnualCompetitionProjectRegistrationService; |
|
|
|
|
import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.ITeamManagementService; |
|
|
|
|
import org.jeecg.modules.demo.awardpersion.entity.AwardPersion; |
|
|
|
|
import org.jeecg.modules.demo.awardpersion.entity.AwardPersionMb; |
|
|
|
|
import org.jeecg.modules.demo.awardpersion.entity.AwardPersionOptions; |
|
|
|
@ -38,6 +40,8 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
|
|
|
|
import org.jeecg.modules.demo.comp.entity.Comp; |
|
|
|
|
import org.jeecg.modules.demo.comp.service.ICompService; |
|
|
|
|
import org.jeecg.modules.system.entity.SysUser; |
|
|
|
|
import org.jeecg.modules.system.service.ISysUserService; |
|
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil; |
|
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants; |
|
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams; |
|
|
|
@ -78,6 +82,10 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward |
|
|
|
|
private ICompService compService; |
|
|
|
|
@Autowired |
|
|
|
|
private IAnnualCompService annualCompService; |
|
|
|
|
@Autowired |
|
|
|
|
private ITeamManagementService teamManagementService; |
|
|
|
|
@Autowired |
|
|
|
|
private ISysUserService sysUserService; |
|
|
|
|
@Resource |
|
|
|
|
private JeecgBaseConfig jeecgBaseConfig; |
|
|
|
|
|
|
|
|
@ -120,6 +128,15 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward |
|
|
|
|
|
|
|
|
|
Page<AwardPersion> page = new Page<AwardPersion>(pageNo, pageSize); |
|
|
|
|
IPage<AwardPersion> pageList = awardPersionService.page(page, queryWrapper); |
|
|
|
|
for(int i = 0 ; i < pageList.getRecords().size();i++){ |
|
|
|
|
TeamManagement teamManagement = new TeamManagement(); |
|
|
|
|
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); |
|
|
|
|
queryWrappertm.eq("enroll_code",pageList.getRecords().get(i).getEnrollCode()); |
|
|
|
|
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); |
|
|
|
|
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); |
|
|
|
|
pageList.getRecords().get(i).setStudentcode(sysUser.getUsername()); |
|
|
|
|
pageList.getRecords().get(i).setStudentname(sysUser.getRealname()); |
|
|
|
|
} |
|
|
|
|
return Result.OK(pageList); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|