|
|
@ -1234,6 +1234,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
public Result<?> xssybsjs( HttpServletRequest req) { |
|
|
|
public Result<?> xssybsjs( HttpServletRequest req) { |
|
|
|
//获取当前登录用户
|
|
|
|
//获取当前登录用户
|
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
|
|
|
|
String wonk = sysUserService.getById(user.getId()).getWorkNo(); |
|
|
|
TeamManagement teamManagement = new TeamManagement(); |
|
|
|
TeamManagement teamManagement = new TeamManagement(); |
|
|
|
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); |
|
|
|
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); |
|
|
|
queryWrappertm.eq("user_id",user.getId()); |
|
|
|
queryWrappertm.eq("user_id",user.getId()); |
|
|
@ -1382,8 +1383,9 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
map.put("xj",0); |
|
|
|
map.put("xj",0); |
|
|
|
} |
|
|
|
} |
|
|
|
//获奖数
|
|
|
|
//获奖数
|
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<AwardPersion> queryWrapperaphj = new QueryWrapper<>(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperaphj = new QueryWrapper<>(); |
|
|
|
queryWrapperaphj.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperaphj.eq("studentcode",wonk); |
|
|
|
queryWrapperaphj.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperaphj.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> listhj = awardPersionService.list(queryWrapperaphj); |
|
|
|
List<AwardPersion> listhj = awardPersionService.list(queryWrapperaphj); |
|
|
|
map.put("hjNumber",listhj.size()); |
|
|
|
map.put("hjNumber",listhj.size()); |
|
|
@ -1391,7 +1393,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion1 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion1 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap1 = QueryGenerator.initQueryWrapper(awardPersion1, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap1 = QueryGenerator.initQueryWrapper(awardPersion1, req.getParameterMap()); |
|
|
|
queryWrapperap1.eq("awardsort",1); |
|
|
|
queryWrapperap1.eq("awardsort",1); |
|
|
|
queryWrapperap1.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap1.eq("studentcode",wonk); |
|
|
|
queryWrapperap1.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap1.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list1 = awardPersionService.list(queryWrapperap1); |
|
|
|
List<AwardPersion> list1 = awardPersionService.list(queryWrapperap1); |
|
|
|
map.put("ydjNumber",list1.size()); |
|
|
|
map.put("ydjNumber",list1.size()); |
|
|
@ -1399,7 +1401,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion2 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion2 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap2 = QueryGenerator.initQueryWrapper(awardPersion2, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap2 = QueryGenerator.initQueryWrapper(awardPersion2, req.getParameterMap()); |
|
|
|
queryWrapperap2.eq("awardsort",2); |
|
|
|
queryWrapperap2.eq("awardsort",2); |
|
|
|
queryWrapperap2.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap2.eq("studentcode",wonk); |
|
|
|
queryWrapperap2.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap2.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list2 = awardPersionService.list(queryWrapperap2); |
|
|
|
List<AwardPersion> list2 = awardPersionService.list(queryWrapperap2); |
|
|
|
map.put("edjNumber",list2.size()); |
|
|
|
map.put("edjNumber",list2.size()); |
|
|
@ -1407,7 +1409,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion3 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion3 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap3 = QueryGenerator.initQueryWrapper(awardPersion3, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap3 = QueryGenerator.initQueryWrapper(awardPersion3, req.getParameterMap()); |
|
|
|
queryWrapperap3.eq("awardsort",3); |
|
|
|
queryWrapperap3.eq("awardsort",3); |
|
|
|
queryWrapperap3.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap3.eq("studentcode",wonk); |
|
|
|
queryWrapperap3.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap3.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list3 = awardPersionService.list(queryWrapperap3); |
|
|
|
List<AwardPersion> list3 = awardPersionService.list(queryWrapperap3); |
|
|
|
map.put("sdjNumber",list3.size()); |
|
|
|
map.put("sdjNumber",list3.size()); |
|
|
@ -1415,7 +1417,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion4 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion4 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap4 = QueryGenerator.initQueryWrapper(awardPersion4, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap4 = QueryGenerator.initQueryWrapper(awardPersion4, req.getParameterMap()); |
|
|
|
queryWrapperap4.eq("awardsort",4); |
|
|
|
queryWrapperap4.eq("awardsort",4); |
|
|
|
queryWrapperap4.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap4.eq("studentcode",wonk); |
|
|
|
queryWrapperap4.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap4.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list4 = awardPersionService.list(queryWrapperap4); |
|
|
|
List<AwardPersion> list4 = awardPersionService.list(queryWrapperap4); |
|
|
|
map.put("sidjNumber",list4.size()); |
|
|
|
map.put("sidjNumber",list4.size()); |
|
|
@ -1423,14 +1425,14 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion5 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion5 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap5 = QueryGenerator.initQueryWrapper(awardPersion5, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap5 = QueryGenerator.initQueryWrapper(awardPersion5, req.getParameterMap()); |
|
|
|
queryWrapperap5.eq("awardsort",5); |
|
|
|
queryWrapperap5.eq("awardsort",5); |
|
|
|
queryWrapperap5.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap5.eq("studentcode",wonk); |
|
|
|
queryWrapperap5.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap5.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list5 = awardPersionService.list(queryWrapperap5); |
|
|
|
List<AwardPersion> list5 = awardPersionService.list(queryWrapperap5); |
|
|
|
map.put("wdjNumber",list5.size()); |
|
|
|
map.put("wdjNumber",list5.size()); |
|
|
|
//所有奖项(前六条)
|
|
|
|
//所有奖项(前六条)
|
|
|
|
AwardPersion awardPersionAll = new AwardPersion(); |
|
|
|
AwardPersion awardPersionAll = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperapAll = QueryGenerator.initQueryWrapper(awardPersionAll, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperapAll = QueryGenerator.initQueryWrapper(awardPersionAll, req.getParameterMap()); |
|
|
|
queryWrapperapAll.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperapAll.eq("studentcode",wonk); |
|
|
|
queryWrapperapAll.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperapAll.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> listAll = awardPersionService.list(queryWrapperapAll); |
|
|
|
List<AwardPersion> listAll = awardPersionService.list(queryWrapperapAll); |
|
|
|
List<Map<String,Object>> allApListMap = new ArrayList<>(); |
|
|
|
List<Map<String,Object>> allApListMap = new ArrayList<>(); |
|
|
@ -1443,7 +1445,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>(); |
|
|
|
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>(); |
|
|
|
queryWrapperpcs.eq("annual_comp_id",listAll.get(y).getAnnalComp()); |
|
|
|
queryWrapperpcs.eq("annual_comp_id",listAll.get(y).getAnnalComp()); |
|
|
|
queryWrapperpcs.eq("annual_comp_p",listAll.get(y).getAnnualCompP()); |
|
|
|
queryWrapperpcs.eq("annual_comp_p",listAll.get(y).getAnnualCompP()); |
|
|
|
queryWrapperpcs.eq("work_on",user.getUsername()); |
|
|
|
queryWrapperpcs.eq("work_on",wonk); |
|
|
|
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs); |
|
|
|
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs); |
|
|
|
if(listpcs.size()==0){ |
|
|
|
if(listpcs.size()==0){ |
|
|
|
mapall1.put("jf",0); |
|
|
|
mapall1.put("jf",0); |
|
|
@ -1462,7 +1464,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>(); |
|
|
|
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>(); |
|
|
|
queryWrapperpcs.eq("annual_comp_id",listAll.get(n).getAnnalComp()); |
|
|
|
queryWrapperpcs.eq("annual_comp_id",listAll.get(n).getAnnalComp()); |
|
|
|
queryWrapperpcs.eq("annual_comp_p",listAll.get(n).getAnnualCompP()); |
|
|
|
queryWrapperpcs.eq("annual_comp_p",listAll.get(n).getAnnualCompP()); |
|
|
|
queryWrapperpcs.eq("work_on",user.getUsername()); |
|
|
|
queryWrapperpcs.eq("work_on",wonk); |
|
|
|
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs); |
|
|
|
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs); |
|
|
|
if(listpcs.size()==0){ |
|
|
|
if(listpcs.size()==0){ |
|
|
|
mapall2.put("jf",0); |
|
|
|
mapall2.put("jf",0); |
|
|
@ -1490,6 +1492,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
public Result<?> xsfxbg( HttpServletRequest req) { |
|
|
|
public Result<?> xsfxbg( HttpServletRequest req) { |
|
|
|
//获取当前登录用户
|
|
|
|
//获取当前登录用户
|
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
|
|
|
|
String wonk = sysUserService.getById(user.getId()).getWorkNo(); |
|
|
|
TeamManagement teamManagement = new TeamManagement(); |
|
|
|
TeamManagement teamManagement = new TeamManagement(); |
|
|
|
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); |
|
|
|
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); |
|
|
|
queryWrappertm.eq("user_id",user.getId()); |
|
|
|
queryWrappertm.eq("user_id",user.getId()); |
|
|
@ -1643,7 +1646,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
} |
|
|
|
} |
|
|
|
//获奖数
|
|
|
|
//获奖数
|
|
|
|
QueryWrapper<AwardPersion> queryWrapperaphj = new QueryWrapper<>(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperaphj = new QueryWrapper<>(); |
|
|
|
queryWrapperaphj.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperaphj.eq("studentcode",wonk); |
|
|
|
queryWrapperaphj.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperaphj.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> listhj = awardPersionService.list(queryWrapperaphj); |
|
|
|
List<AwardPersion> listhj = awardPersionService.list(queryWrapperaphj); |
|
|
|
map.put("hjNumber",listhj.size()); |
|
|
|
map.put("hjNumber",listhj.size()); |
|
|
@ -1651,7 +1654,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion1 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion1 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap1 = QueryGenerator.initQueryWrapper(awardPersion1, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap1 = QueryGenerator.initQueryWrapper(awardPersion1, req.getParameterMap()); |
|
|
|
queryWrapperap1.eq("awardsort",1); |
|
|
|
queryWrapperap1.eq("awardsort",1); |
|
|
|
queryWrapperap1.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap1.eq("studentcode",wonk); |
|
|
|
queryWrapperap1.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap1.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list1 = awardPersionService.list(queryWrapperap1); |
|
|
|
List<AwardPersion> list1 = awardPersionService.list(queryWrapperap1); |
|
|
|
map.put("ydjNumber",list1.size()); |
|
|
|
map.put("ydjNumber",list1.size()); |
|
|
@ -1659,7 +1662,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion2 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion2 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap2 = QueryGenerator.initQueryWrapper(awardPersion2, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap2 = QueryGenerator.initQueryWrapper(awardPersion2, req.getParameterMap()); |
|
|
|
queryWrapperap2.eq("awardsort",2); |
|
|
|
queryWrapperap2.eq("awardsort",2); |
|
|
|
queryWrapperap2.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap2.eq("studentcode",wonk); |
|
|
|
queryWrapperap2.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap2.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list2 = awardPersionService.list(queryWrapperap2); |
|
|
|
List<AwardPersion> list2 = awardPersionService.list(queryWrapperap2); |
|
|
|
map.put("edjNumber",list2.size()); |
|
|
|
map.put("edjNumber",list2.size()); |
|
|
@ -1667,7 +1670,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion3 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion3 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap3 = QueryGenerator.initQueryWrapper(awardPersion3, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap3 = QueryGenerator.initQueryWrapper(awardPersion3, req.getParameterMap()); |
|
|
|
queryWrapperap3.eq("awardsort",3); |
|
|
|
queryWrapperap3.eq("awardsort",3); |
|
|
|
queryWrapperap3.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap3.eq("studentcode",wonk); |
|
|
|
queryWrapperap3.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap3.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list3 = awardPersionService.list(queryWrapperap3); |
|
|
|
List<AwardPersion> list3 = awardPersionService.list(queryWrapperap3); |
|
|
|
map.put("sdjNumber",list3.size()); |
|
|
|
map.put("sdjNumber",list3.size()); |
|
|
@ -1675,7 +1678,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion4 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion4 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap4 = QueryGenerator.initQueryWrapper(awardPersion4, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap4 = QueryGenerator.initQueryWrapper(awardPersion4, req.getParameterMap()); |
|
|
|
queryWrapperap4.eq("awardsort",4); |
|
|
|
queryWrapperap4.eq("awardsort",4); |
|
|
|
queryWrapperap4.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap4.eq("studentcode",wonk); |
|
|
|
queryWrapperap4.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap4.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list4 = awardPersionService.list(queryWrapperap4); |
|
|
|
List<AwardPersion> list4 = awardPersionService.list(queryWrapperap4); |
|
|
|
map.put("sidjNumber",list4.size()); |
|
|
|
map.put("sidjNumber",list4.size()); |
|
|
@ -1683,14 +1686,14 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
AwardPersion awardPersion5 = new AwardPersion(); |
|
|
|
AwardPersion awardPersion5 = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap5 = QueryGenerator.initQueryWrapper(awardPersion5, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperap5 = QueryGenerator.initQueryWrapper(awardPersion5, req.getParameterMap()); |
|
|
|
queryWrapperap5.eq("awardsort",5); |
|
|
|
queryWrapperap5.eq("awardsort",5); |
|
|
|
queryWrapperap5.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperap5.eq("studentcode",wonk); |
|
|
|
queryWrapperap5.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperap5.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> list5 = awardPersionService.list(queryWrapperap5); |
|
|
|
List<AwardPersion> list5 = awardPersionService.list(queryWrapperap5); |
|
|
|
map.put("wdjNumber",list5.size()); |
|
|
|
map.put("wdjNumber",list5.size()); |
|
|
|
//所有奖项(前六条)
|
|
|
|
//所有奖项(前六条)
|
|
|
|
AwardPersion awardPersionAll = new AwardPersion(); |
|
|
|
AwardPersion awardPersionAll = new AwardPersion(); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperapAll = QueryGenerator.initQueryWrapper(awardPersionAll, req.getParameterMap()); |
|
|
|
QueryWrapper<AwardPersion> queryWrapperapAll = QueryGenerator.initQueryWrapper(awardPersionAll, req.getParameterMap()); |
|
|
|
queryWrapperapAll.eq("studentcode",user.getUsername()); |
|
|
|
queryWrapperapAll.eq("studentcode",wonk); |
|
|
|
queryWrapperapAll.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
queryWrapperapAll.in(bmbhs.size()!=0,"enroll_code",bmbhs); |
|
|
|
List<AwardPersion> listAll = awardPersionService.list(queryWrapperapAll); |
|
|
|
List<AwardPersion> listAll = awardPersionService.list(queryWrapperapAll); |
|
|
|
List<Map<String,Object>> allApListMap = new ArrayList<>(); |
|
|
|
List<Map<String,Object>> allApListMap = new ArrayList<>(); |
|
|
@ -1712,7 +1715,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>(); |
|
|
|
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>(); |
|
|
|
queryWrapperpcs.eq("annual_comp_id",listAll.get(y).getAnnalComp()); |
|
|
|
queryWrapperpcs.eq("annual_comp_id",listAll.get(y).getAnnalComp()); |
|
|
|
queryWrapperpcs.eq("annual_comp_p",listAll.get(y).getAnnualCompP()); |
|
|
|
queryWrapperpcs.eq("annual_comp_p",listAll.get(y).getAnnualCompP()); |
|
|
|
queryWrapperpcs.eq("work_on",user.getUsername()); |
|
|
|
queryWrapperpcs.eq("work_on",wonk); |
|
|
|
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs); |
|
|
|
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs); |
|
|
|
if(listpcs.size()==0){ |
|
|
|
if(listpcs.size()==0){ |
|
|
|
mapall1.put("jf",0); |
|
|
|
mapall1.put("jf",0); |
|
|
@ -1740,7 +1743,7 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>(); |
|
|
|
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>(); |
|
|
|
queryWrapperpcs.eq("annual_comp_id",listAll.get(n).getAnnalComp()); |
|
|
|
queryWrapperpcs.eq("annual_comp_id",listAll.get(n).getAnnalComp()); |
|
|
|
queryWrapperpcs.eq("annual_comp_p",listAll.get(n).getAnnualCompP()); |
|
|
|
queryWrapperpcs.eq("annual_comp_p",listAll.get(n).getAnnualCompP()); |
|
|
|
queryWrapperpcs.eq("work_on",user.getUsername()); |
|
|
|
queryWrapperpcs.eq("work_on",wonk); |
|
|
|
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs); |
|
|
|
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs); |
|
|
|
if(listpcs.size()==0){ |
|
|
|
if(listpcs.size()==0){ |
|
|
|
mapall2.put("jf",0); |
|
|
|
mapall2.put("jf",0); |
|
|
|