|
|
@ -152,7 +152,7 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward |
|
|
|
//学院(上传和查询)(根据部门查询数据,该学院下所有学生的获奖信息)
|
|
|
|
//学院(上传和查询)(根据部门查询数据,该学院下所有学生的获奖信息)
|
|
|
|
Page<AwardPersion> page = new Page<AwardPersion>(pageNo, pageSize); |
|
|
|
Page<AwardPersion> page = new Page<AwardPersion>(pageNo, pageSize); |
|
|
|
QueryWrapper<AwardPersion> queryWrapper = QueryGenerator.initQueryWrapper(awardPersion, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapper = QueryGenerator.initQueryWrapper(awardPersion, req.getParameterMap()); |
|
|
|
queryWrapper.eq("studentorg",sysDepartService.queryDepartsByUsername(user.getUsername()).get(0).getOrgCode()); |
|
|
|
queryWrapper.eq("studentorg",sysDepartService.queryDepartsByUsername(user.getUsername()).get(0).getId()); |
|
|
|
IPage<AwardPersion> pageList = awardPersionService.page(page, queryWrapper); |
|
|
|
IPage<AwardPersion> pageList = awardPersionService.page(page, queryWrapper); |
|
|
|
return Result.OK(pageList); |
|
|
|
return Result.OK(pageList); |
|
|
|
}else { |
|
|
|
}else { |
|
|
@ -225,7 +225,7 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward |
|
|
|
SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId()); |
|
|
|
SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId()); |
|
|
|
awardPersion.setStudentname(sysUser.getRealname()); |
|
|
|
awardPersion.setStudentname(sysUser.getRealname()); |
|
|
|
awardPersion.setStudentcode(sysUser.getUsername()); |
|
|
|
awardPersion.setStudentcode(sysUser.getUsername()); |
|
|
|
awardPersion.setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getOrgCode()); |
|
|
|
awardPersion.setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getId()); |
|
|
|
awardPersionService.save(awardPersion); |
|
|
|
awardPersionService.save(awardPersion); |
|
|
|
} |
|
|
|
} |
|
|
|
AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardPersion.getAnnualCompP()); |
|
|
|
AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardPersion.getAnnualCompP()); |
|
|
@ -511,7 +511,7 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward |
|
|
|
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); |
|
|
|
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); |
|
|
|
for (int l = 0 ; l < listtm.size() ; l++){ |
|
|
|
for (int l = 0 ; l < listtm.size() ; l++){ |
|
|
|
SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId()); |
|
|
|
SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId()); |
|
|
|
list.get(i).setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getOrgCode()); |
|
|
|
list.get(i).setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getId()); |
|
|
|
if(listaca.get(0).getFirstPrize().equals(list.get(i).getAwardname())){ |
|
|
|
if(listaca.get(0).getFirstPrize().equals(list.get(i).getAwardname())){ |
|
|
|
list.get(i).setAwardsort(1); |
|
|
|
list.get(i).setAwardsort(1); |
|
|
|
list.get(i).setAwardid(listaca.get(0).getId()); |
|
|
|
list.get(i).setAwardid(listaca.get(0).getId()); |
|
|
|