|
|
@ -539,12 +539,11 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward |
|
|
|
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap()); |
|
|
|
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap()); |
|
|
|
queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode()); |
|
|
|
queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode()); |
|
|
|
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); |
|
|
|
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); |
|
|
|
try { |
|
|
|
if(annualService.getannualthisid(list.get(i).getAnnualid())==null){ |
|
|
|
list.get(i).setAnnualid(annualService.getannualthisid(list.get(i).getAnnualid())); |
|
|
|
|
|
|
|
}catch (Exception e){ |
|
|
|
|
|
|
|
return Result.error("文件导入失败:第"+(i+1)+"行年度不存在"); |
|
|
|
return Result.error("文件导入失败:第"+(i+1)+"行年度不存在"); |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
list.get(i).setAnnualid(annualService.getannualthisid(list.get(i).getAnnualid())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
try { |
|
|
|
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()); |
|
|
|