zhc077
/
hnjd_comp
forked from wangjiadong/comp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
王家东 4 months ago
parent 9ca644f016 63ab42efc2
commit d4f5d49ed3
11 changed files with 436 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java
  2. 408
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
  3. 7
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
  4. 9
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java
  5. 7
      jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  6. 5
      jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualComp.data.ts
  7. 4
      jeecgboot-vue3-master/src/views/comp/Comp.data.ts
  8. 2
      jeecgboot-vue3-master/src/views/scorepersion/ScorePersionList.vue
  9. 2
      jeecgboot-vue3-master/src/views/scorestapoint/ScoreStaPointList.vue
  10. 2
      jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue
  11. 6
      jeecgboot-vue3-master/src/views/topic/Topic.data.ts

34
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java
Unescape View File

@ -513,6 +513,9 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
QueryWrapper<AnnualCompAward> queryWrapper = QueryGenerator.initQueryWrapper(annualCompAward, req.getParameterMap()); QueryWrapper<AnnualCompAward> queryWrapper = QueryGenerator.initQueryWrapper(annualCompAward, req.getParameterMap());
queryWrapper.eq("annucompid",id); queryWrapper.eq("annucompid",id);
List<AnnualCompAward> list = annualCompAwardService.list(queryWrapper); List<AnnualCompAward> list = annualCompAwardService.list(queryWrapper);
if(list.size()==0){
return Result.error("未设置年度比赛奖项!");
}
QueryWrapper<ScorePersion> queryWrappersp = new QueryWrapper<>(); QueryWrapper<ScorePersion> queryWrappersp = new QueryWrapper<>();
queryWrappersp.eq("annualid",annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); queryWrappersp.eq("annualid",annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid());
queryWrappersp.eq("annual_compid",annualCompPoint.getAnnualCompId()); queryWrappersp.eq("annual_compid",annualCompPoint.getAnnualCompId());
@ -538,7 +541,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname()); awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername()); awardPersion.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion); awardPersionService.save(awardPersion);
} }
} }
@ -561,7 +564,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname()); awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername()); awardPersion.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion); awardPersionService.save(awardPersion);
} }
} }
@ -585,7 +588,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname()); awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername()); awardPersion.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion); awardPersionService.save(awardPersion);
} }
} }
@ -610,7 +613,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname()); awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername()); awardPersion.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion); awardPersionService.save(awardPersion);
} }
} }
@ -636,7 +639,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname()); awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername()); awardPersion.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion); awardPersionService.save(awardPersion);
} }
} }
@ -656,6 +659,13 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
@ApiOperation(value="评奖数据生成", notes="评奖数据生成") @ApiOperation(value="评奖数据生成", notes="评奖数据生成")
@PostMapping(value = "/cxhq") @PostMapping(value = "/cxhq")
public Result<String> cxhq(@RequestBody AwardPersion awardPersion,HttpServletRequest req) { public Result<String> cxhq(@RequestBody AwardPersion awardPersion,HttpServletRequest req) {
AnnualCompAward annualCompAward = new AnnualCompAward();
QueryWrapper<AnnualCompAward> queryWrapper = QueryGenerator.initQueryWrapper(annualCompAward, req.getParameterMap());
queryWrapper.eq("annucompid",awardPersion.getAnnualCompP());
List<AnnualCompAward> list = annualCompAwardService.list(queryWrapper);
if(list.size()==0){
return Result.error("未设置年度比赛奖项!");
}
AwardPersion awardPersionqw = new AwardPersion(); AwardPersion awardPersionqw = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap = QueryGenerator.initQueryWrapper(awardPersionqw, req.getParameterMap()); QueryWrapper<AwardPersion> queryWrapperap = QueryGenerator.initQueryWrapper(awardPersionqw, req.getParameterMap());
queryWrapperap.eq("annualid",awardPersion.getAnnualid()); queryWrapperap.eq("annualid",awardPersion.getAnnualid());
@ -668,10 +678,6 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
} }
} }
AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardPersion.getAnnualCompP()); AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardPersion.getAnnualCompP());
AnnualCompAward annualCompAward = new AnnualCompAward();
QueryWrapper<AnnualCompAward> queryWrapper = QueryGenerator.initQueryWrapper(annualCompAward, req.getParameterMap());
queryWrapper.eq("annucompid",awardPersion.getAnnualCompP());
List<AnnualCompAward> list = annualCompAwardService.list(queryWrapper);
QueryWrapper<ScorePersion> queryWrappersp = new QueryWrapper<>(); QueryWrapper<ScorePersion> queryWrappersp = new QueryWrapper<>();
queryWrappersp.eq("annualid",annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); queryWrappersp.eq("annualid",annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid());
queryWrappersp.eq("annual_compid",annualCompPoint.getAnnualCompId()); queryWrappersp.eq("annual_compid",annualCompPoint.getAnnualCompId());
@ -698,7 +704,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion1.setStudentname(sysUser.getRealname()); awardPersion1.setStudentname(sysUser.getRealname());
awardPersion1.setStudentcode(sysUser.getUsername()); awardPersion1.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion1); awardPersionService.save(awardPersion1);
} }
@ -724,7 +730,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion1.setStudentname(sysUser.getRealname()); awardPersion1.setStudentname(sysUser.getRealname());
awardPersion1.setStudentcode(sysUser.getUsername()); awardPersion1.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion1); awardPersionService.save(awardPersion1);
} }
} }
@ -750,7 +756,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion1.setStudentname(sysUser.getRealname()); awardPersion1.setStudentname(sysUser.getRealname());
awardPersion1.setStudentcode(sysUser.getUsername()); awardPersion1.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion1); awardPersionService.save(awardPersion1);
} }
} }
@ -777,7 +783,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion1.setStudentname(sysUser.getRealname()); awardPersion1.setStudentname(sysUser.getRealname());
awardPersion1.setStudentcode(sysUser.getUsername()); awardPersion1.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion1); awardPersionService.save(awardPersion1);
} }
} }
@ -805,7 +811,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm); List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion1.setStudentname(sysUser.getRealname()); awardPersion1.setStudentname(sysUser.getRealname());
awardPersion1.setStudentcode(sysUser.getUsername()); awardPersion1.setStudentcode(sysUser.getWorkNo());
awardPersionService.save(awardPersion1); awardPersionService.save(awardPersion1);
} }
} }

408
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
Unescape View File

@ -1196,7 +1196,7 @@ public class AnnualCompetitionProjectRegistrationController {
SysDepart depart = sysDepartService.query().eq("id", userDeparts.get(0).getDepId()).one(); SysDepart depart = sysDepartService.query().eq("id", userDeparts.get(0).getDepId()).one();
Map<String, Object> map4 = new HashMap<>(); Map<String, Object> map4 = new HashMap<>();
map4.put("name", sysUser.getRealname()); map4.put("name", sysUser.getRealname());
map4.put("xh", sysUser.getUsername()); map4.put("xh", sysUser.getWorkNo());
map4.put("szyx", depart.getDepartName()); map4.put("szyx", depart.getDepartName());
bmxsxxListMap.add(map4); bmxsxxListMap.add(map4);
} }
@ -1208,7 +1208,7 @@ public class AnnualCompetitionProjectRegistrationController {
SysDepart depart = sysDepartService.query().eq("id", userDeparts.get(0).getDepId()).one(); SysDepart depart = sysDepartService.query().eq("id", userDeparts.get(0).getDepId()).one();
Map<String, Object> map5 = new HashMap<>(); Map<String, Object> map5 = new HashMap<>();
map5.put("name", sysUser.getRealname()); map5.put("name", sysUser.getRealname());
map5.put("xh", sysUser.getUsername()); map5.put("xh", sysUser.getWorkNo());
map5.put("szyx", depart.getDepartName()); map5.put("szyx", depart.getDepartName());
bmxsxxListMap.add(map5); bmxsxxListMap.add(map5);
} }
@ -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<>();
@ -1702,6 +1705,7 @@ public class AnnualCompetitionProjectRegistrationController {
mapall1.put("ndbsxm",annualCompPointService.getById(listAll.get(y).getAnnualCompP()).getObjName()); mapall1.put("ndbsxm",annualCompPointService.getById(listAll.get(y).getAnnualCompP()).getObjName());
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperlist = new QueryWrapper<>(); QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperlist = new QueryWrapper<>();
queryWrapperlist.eq("enroll_code",listAll.get(y).getEnrollCode()); queryWrapperlist.eq("enroll_code",listAll.get(y).getEnrollCode());
queryWrapperlist.eq("enroll_static", "2");
List<AnnualCompetitionProjectRegistration> listdw = annualCompetitionProjectRegistrationService.list(queryWrapperlist); List<AnnualCompetitionProjectRegistration> listdw = annualCompetitionProjectRegistrationService.list(queryWrapperlist);
if(listdw.size()>0){ if(listdw.size()>0){
mapall1.put("dwname",listdw.get(0).getTeamName()); mapall1.put("dwname",listdw.get(0).getTeamName());
@ -1711,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);
@ -1729,6 +1733,7 @@ public class AnnualCompetitionProjectRegistrationController {
mapall2.put("ndbsxm",annualCompPointService.getById(listAll.get(n).getAnnualCompP()).getObjName()); mapall2.put("ndbsxm",annualCompPointService.getById(listAll.get(n).getAnnualCompP()).getObjName());
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperlist = new QueryWrapper<>(); QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperlist = new QueryWrapper<>();
queryWrapperlist.eq("enroll_code",listAll.get(n).getEnrollCode()); queryWrapperlist.eq("enroll_code",listAll.get(n).getEnrollCode());
queryWrapperlist.eq("enroll_static", "2");
List<AnnualCompetitionProjectRegistration> listdw = annualCompetitionProjectRegistrationService.list(queryWrapperlist); List<AnnualCompetitionProjectRegistration> listdw = annualCompetitionProjectRegistrationService.list(queryWrapperlist);
if(listdw.size()>0){ if(listdw.size()>0){
mapall2.put("dwname",listdw.get(0).getTeamName()); mapall2.put("dwname",listdw.get(0).getTeamName());
@ -1738,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);
@ -1756,6 +1761,369 @@ public class AnnualCompetitionProjectRegistrationController {
} }
/**
* 组委会角色分析报告比赛数据接口
*
* @param req
* @return
*/
@ApiOperation(value="组委会角色分析报告比赛数据接口", notes="组委会角色分析报告比赛数据接口")
@GetMapping(value = "/zwhfxbg")
public Result<?> zwhfxbg( HttpServletRequest req) {
//获取当前登录用户 最新的年度比赛记录
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
Comp comp = new Comp();
QueryWrapper<Comp> queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap());
queryWrappercomp.like("comp_admin", user.getUsername());
List<Comp> list = compService.list(queryWrappercomp);
Map<String, Object> map = new HashMap<>();
if (list.size() > 0) {
List<String> ids = list.stream().map(Comp::getId).collect(Collectors.toList());
QueryWrapper<AnnualComp> queryWrapperAnnual = new QueryWrapper<>();
queryWrapperAnnual.in(ids.size() != 0, "compid", ids);
queryWrapperAnnual.orderByDesc("create_time");
List<AnnualComp> annualCompList = annualCompService.list(queryWrapperAnnual);
if (annualCompList.size() > 0) {
//年度比赛名称
map.put("annualCompName", annualCompList.get(0).getName());
//共多少届以及当前第几届
map.put("sum", annualCompList.size());
AnnualCompPoint annualCompPoint = new AnnualCompPoint();
QueryWrapper<AnnualCompPoint> queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap());
queryWrapperacp.eq("annual_comp_id", annualCompList.get(0).getId());
queryWrapperacp.eq("annual_comp_switch", "Y"); // 比赛必须是开启的
//queryWrapperacp.orderByDesc("create_time");
List<AnnualCompPoint> listacp = annualCompPointService.list(queryWrapperacp);
//比赛项目数
map.put("bsxmSum", listacp.size());
//前五条项目名称数据以及对应的报名数
/* List<Map<String, Object>> xmListMap = new ArrayList<>();
if (listacp.size() > 5) {
for (int i = 0; i < 5; i++) {
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap());
queryWrapperbm.eq("annual_compid", listacp.get(i).getId());
queryWrapperbm.eq("enroll_static", "2");
List<AnnualCompetitionProjectRegistration> listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm);
Map<String, Object> map1 = new HashMap<>();
map1.put("xmname", listacp.get(i).getObjName());
map1.put("xmbmrs", listbm.size());
xmListMap.add(map1);
}
} else {
for (int m = 0; m < listacp.size(); m++) {
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap());
queryWrapperbm.eq("annual_compid", listacp.get(m).getId());
queryWrapperbm.eq("enroll_static", "2");
List<AnnualCompetitionProjectRegistration> listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm);
Map<String, Object> map1 = new HashMap<>();
map1.put("xmname", listacp.get(m).getObjName());
map1.put("xmbmrs", listbm.size());
xmListMap.add(map1);
}
}
map.put("qwtxmList", xmListMap);*/
//参加比赛队伍数(报名数)
if(listacp.size()>0){
List<String> acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList());
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap());
queryWrapperbm.in(acpIds.size() != 0, "annual_compid", acpIds);
queryWrapperbm.eq("enroll_static", "2");
List<AnnualCompetitionProjectRegistration> listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm);
map.put("bmNumber", listbm.size());
//参数人数
if (listbm.size() == 0) {
map.put("csNumber", 0);
map.put("ydjNumber", 0);
map.put("edjNumber", 0);
map.put("sdjNumber", 0);
map.put("sidjNumber", 0);
map.put("wdjNumber", 0);
} else {
TeamManagement teamManagement = new TeamManagement();
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap());
List<String> bmbhs = listbm.stream().map(AnnualCompetitionProjectRegistration::getEnrollCode).collect(Collectors.toList());
queryWrappertm.in(bmbhs.size() != 0, "enroll_code", bmbhs);
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
map.put("csNumber", listtm.size());
/* //一等奖人数
AwardPersion awardPersion1 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap1 = QueryGenerator.initQueryWrapper(awardPersion1, req.getParameterMap());
queryWrapperap1.eq("awardsort", 1);
queryWrapperap1.in(bmbhs.size() != 0, "enroll_code", bmbhs);
List<AwardPersion> list1 = awardPersionService.list(queryWrapperap1);
map.put("ydjNumber", list1.size());
//二等奖人数
AwardPersion awardPersion2 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap2 = QueryGenerator.initQueryWrapper(awardPersion2, req.getParameterMap());
queryWrapperap2.eq("awardsort", 2);
queryWrapperap2.in(bmbhs.size() != 0, "enroll_code", bmbhs);
List<AwardPersion> list2 = awardPersionService.list(queryWrapperap2);
map.put("edjNumber", list2.size());
//三等奖人数
AwardPersion awardPersion3 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap3 = QueryGenerator.initQueryWrapper(awardPersion3, req.getParameterMap());
queryWrapperap3.eq("awardsort", 3);
queryWrapperap3.in(bmbhs.size() != 0, "enroll_code", bmbhs);
List<AwardPersion> list3 = awardPersionService.list(queryWrapperap3);
map.put("sdjNumber", list3.size());
//四等奖人数
AwardPersion awardPersion4 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap4 = QueryGenerator.initQueryWrapper(awardPersion4, req.getParameterMap());
queryWrapperap4.eq("awardsort", 4);
queryWrapperap4.in(bmbhs.size() != 0, "enroll_code", bmbhs);
List<AwardPersion> list4 = awardPersionService.list(queryWrapperap4);
map.put("sidjNumber", list4.size());
//五等奖人数
AwardPersion awardPersion5 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap5 = QueryGenerator.initQueryWrapper(awardPersion5, req.getParameterMap());
queryWrapperap5.eq("awardsort", 5);
queryWrapperap5.in(bmbhs.size() != 0, "enroll_code", bmbhs);
List<AwardPersion> list5 = awardPersionService.list(queryWrapperap5);
map.put("wdjNumber", list5.size());*/
}
//参赛院系用到的list
List<TeamManagement> listcs = new ArrayList<>();
//个人赛人数
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration1 = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm1 = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration1, req.getParameterMap());
queryWrapperbm1.in(acpIds.size() != 0, "annual_compid", acpIds);
queryWrapperbm1.eq("enroll_static", "2");
queryWrapperbm1.eq("entry_format", "0");
List<AnnualCompetitionProjectRegistration> listbm1 = annualCompetitionProjectRegistrationService.list(queryWrapperbm1);
if (listbm1.size() == 0) {
map.put("grsNumber", 0);
} else {
TeamManagement teamManagement = new TeamManagement();
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap());
List<String> bmbhs = listbm1.stream().map(AnnualCompetitionProjectRegistration::getEnrollCode).collect(Collectors.toList());
queryWrappertm.in(bmbhs.size() != 0, "enroll_code", bmbhs);
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
map.put("grsNumber", listtm.size());
listcs.addAll(listtm);
}
//团队赛人数
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration2 = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm2 = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration2, req.getParameterMap());
queryWrapperbm2.in(acpIds.size() != 0, "annual_compid", acpIds);
queryWrapperbm2.eq("enroll_static", "2");
queryWrapperbm2.eq("entry_format", "1");
List<AnnualCompetitionProjectRegistration> listbm2 = annualCompetitionProjectRegistrationService.list(queryWrapperbm2);
if (listbm2.size() == 0) {
map.put("tdsNumber", 0);
} else {
TeamManagement teamManagement = new TeamManagement();
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap());
List<String> bmbhs = listbm2.stream().map(AnnualCompetitionProjectRegistration::getEnrollCode).collect(Collectors.toList());
queryWrappertm.in(bmbhs.size() != 0, "enroll_code", bmbhs);
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
map.put("tdsNumber", listtm.size());
//查只是队长的用户id
queryWrappertm.eq("captain", "1");
List<TeamManagement> listdz = teamManagementService.list(queryWrappertm);
listcs.addAll(listdz);
}
//参赛院系人数排名(只取前六条)
if (listcs.size() == 0) {
map.put("csyxbmpm", new ArrayList<>());
map.put("bmxsxxList", new ArrayList<>());
} else {
//拿到所有的userid
List<String> userIds = listcs.stream().map(TeamManagement::getUserId).collect(Collectors.toList());
QueryWrapper<SysUserDepart> queryWrappersud = new QueryWrapper<>();
queryWrappersud.select("dep_id,COUNT(*) as user_id");
queryWrappersud.in("user_id", userIds);
queryWrappersud.groupBy("dep_id");
queryWrappersud.orderByDesc("COUNT(*)");
List<SysUserDepart> listsud = sysUserDepartService.list(queryWrappersud);
List<Map<String, Object>> csyxpmListMap = new ArrayList<>();
if (listsud.size() > 6) {
for (int o = 0; o < 6; o++) {
Map<String, Object> map2 = new HashMap<>();
map2.put("pm", o + 1);
map2.put("csyxid", listsud.get(o).getDepId());
SysDepart depart = sysDepartService.query().eq("id", listsud.get(o).getDepId()).one();
map2.put("csyxname", depart.getDepartName());
map2.put("bms", listsud.get(o).getUserId());
csyxpmListMap.add(map2);
}
map.put("csyxbmpm", csyxpmListMap);
} else {
for (int u = 0; u < listsud.size(); u++) {
Map<String, Object> map3 = new HashMap<>();
map3.put("pm", u + 1);
map3.put("csyxid", listsud.get(u).getDepId());
SysDepart depart = sysDepartService.query().eq("id", listsud.get(u).getDepId()).one();
map3.put("csyxname", depart.getDepartName());
map3.put("bms", listsud.get(u).getUserId());
csyxpmListMap.add(map3);
}
map.put("csyxbmpm", csyxpmListMap);
}
//报名学生列表(只取前六条)
//根据userIds查询出六个学生信息
/* List<Map<String, Object>> bmxsxxListMap = new ArrayList<>();
if (userIds.size() > 6) {
for (int p = 0; p < 6; p++) {
List<SysUserDepart> userDeparts = sysUserDepartService.query().eq("user_id", userIds.get(p)).list();
SysUser sysUser = sysUserService.query().eq("id", userIds.get(p)).one();
SysDepart depart = sysDepartService.query().eq("id", userDeparts.get(0).getDepId()).one();
Map<String, Object> map4 = new HashMap<>();
map4.put("name", sysUser.getRealname());
map4.put("xh", sysUser.getUsername());
map4.put("szyx", depart.getDepartName());
bmxsxxListMap.add(map4);
}
map.put("bmxsxxList", bmxsxxListMap);
} else {
for (int a = 0; a < userIds.size(); a++) {
List<SysUserDepart> userDeparts = sysUserDepartService.query().eq("user_id", userIds.get(a)).list();
SysUser sysUser = sysUserService.query().eq("id", userIds.get(a)).one();
SysDepart depart = sysDepartService.query().eq("id", userDeparts.get(0).getDepId()).one();
Map<String, Object> map5 = new HashMap<>();
map5.put("name", sysUser.getRealname());
map5.put("xh", sysUser.getUsername());
map5.put("szyx", depart.getDepartName());
bmxsxxListMap.add(map5);
}
map.put("bmxsxxList", bmxsxxListMap);
}*/
}
AwardPersion awardPersionAll = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperapAll = QueryGenerator.initQueryWrapper(awardPersionAll, req.getParameterMap());
queryWrapperapAll.in(acpIds.size()!=0,"annual_comp_p",acpIds);
List<AwardPersion> listAll = awardPersionService.list(queryWrapperapAll);
List<Map<String,Object>> allApListMap = new ArrayList<>();
if(listAll.size()>7){
for (int y = 0 ; y < 7; y++){
Map<String, Object> mapall1 = new HashMap<>();
mapall1.put("jxname",listAll.get(y).getAwardname());
mapall1.put("ndbs",annualCompService.getById(listAll.get(y).getAnnalComp()).getName());
mapall1.put("ndbsxm",annualCompPointService.getById(listAll.get(y).getAnnualCompP()).getObjName());
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperlist = new QueryWrapper<>();
queryWrapperlist.eq("enroll_code",listAll.get(y).getEnrollCode());
queryWrapperlist.eq("enroll_static", "2");
List<AnnualCompetitionProjectRegistration> listdw = annualCompetitionProjectRegistrationService.list(queryWrapperlist);
if(listdw.size()>0){
mapall1.put("dwname",listdw.get(0).getTeamName());
if(listdw.get(0).getEntryFormat().equals("0")){
//个人
QueryWrapper<TeamManagement> queryWrappertm1 = new QueryWrapper<>();
queryWrappertm1.eq( "enroll_code", listAll.get(y).getEnrollCode());
List<TeamManagement> listtm1 = teamManagementService.list(queryWrappertm1);
if(listtm1.size()>0){
String wn = sysUserService.getById(listtm1.get(0).getUserId()).getWorkNo();
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>();
queryWrapperpcs.eq("annual_comp_id",listAll.get(y).getAnnalComp());
queryWrapperpcs.eq("annual_comp_p",listAll.get(y).getAnnualCompP());
queryWrapperpcs.eq("work_on",wn);
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall1.put("jf",0);
}else {
mapall1.put("jf",listpcs.get(0).getScore());
}
}
}else {
//团队 积分这块只统计队长的积分
QueryWrapper<TeamManagement> queryWrappertm2 = new QueryWrapper<>();
queryWrappertm2.eq( "enroll_code", listAll.get(y).getEnrollCode());
queryWrappertm2.eq("captain", "1");
List<TeamManagement> listtm2 = teamManagementService.list(queryWrappertm2);
if(listtm2.size()>0){
String wn2 = sysUserService.getById(listtm2.get(0).getUserId()).getWorkNo();
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>();
queryWrapperpcs.eq("annual_comp_id",listAll.get(y).getAnnalComp());
queryWrapperpcs.eq("annual_comp_p",listAll.get(y).getAnnualCompP());
queryWrapperpcs.eq("work_on",wn2);
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall1.put("jf",0);
}else {
mapall1.put("jf",listpcs.get(0).getScore());
}
}
}
}else {
mapall1.put("jf",0);
mapall1.put("dwname","暂无数据");
}
allApListMap.add(mapall1);
}
}else{
for (int n = 0 ; n < listAll.size(); n++){
Map<String, Object> mapall2 = new HashMap<>();
mapall2.put("jxname",listAll.get(n).getAwardname());
mapall2.put("ndbs",annualCompService.getById(listAll.get(n).getAnnalComp()).getName());
mapall2.put("ndbsxm",annualCompPointService.getById(listAll.get(n).getAnnualCompP()).getObjName());
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperlist = new QueryWrapper<>();
queryWrapperlist.eq("enroll_code",listAll.get(n).getEnrollCode());
queryWrapperlist.eq("enroll_static", "2");
List<AnnualCompetitionProjectRegistration> listdw = annualCompetitionProjectRegistrationService.list(queryWrapperlist);
if(listdw.size()>0){
mapall2.put("dwname",listdw.get(0).getTeamName());
if(listdw.get(0).getEntryFormat().equals("0")){
//个人
QueryWrapper<TeamManagement> queryWrappertm1 = new QueryWrapper<>();
queryWrappertm1.eq( "enroll_code", listAll.get(n).getEnrollCode());
List<TeamManagement> listtm1 = teamManagementService.list(queryWrappertm1);
if(listtm1.size()>0){
String wn = sysUserService.getById(listtm1.get(0).getUserId()).getWorkNo();
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>();
queryWrapperpcs.eq("annual_comp_id",listAll.get(n).getAnnalComp());
queryWrapperpcs.eq("annual_comp_p",listAll.get(n).getAnnualCompP());
queryWrapperpcs.eq("work_on",wn);
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall2.put("jf",0);
}else {
mapall2.put("jf",listpcs.get(0).getScore());
}
}
}else {
//团队 积分这块只统计队长的积分
QueryWrapper<TeamManagement> queryWrappertm2 = new QueryWrapper<>();
queryWrappertm2.eq( "enroll_code", listAll.get(n).getEnrollCode());
queryWrappertm2.eq("captain", "1");
List<TeamManagement> listtm2 = teamManagementService.list(queryWrappertm2);
if(listtm2.size()>0){
String wn2 = sysUserService.getById(listtm2.get(0).getUserId()).getWorkNo();
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>();
queryWrapperpcs.eq("annual_comp_id",listAll.get(n).getAnnalComp());
queryWrapperpcs.eq("annual_comp_p",listAll.get(n).getAnnualCompP());
queryWrapperpcs.eq("work_on",wn2);
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall2.put("jf",0);
}else {
mapall2.put("jf",listpcs.get(0).getScore());
}
}
}
}else {
mapall2.put("jf",0);
mapall2.put("dwname","暂无数据");
}
allApListMap.add(mapall2);
}
}
map.put("allApList",allApListMap);
}
}
}
return Result.OK(map);
}
public List<AnnualComp> getZXAnnualComp(HttpServletRequest req) { public List<AnnualComp> getZXAnnualComp(HttpServletRequest req) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();

7
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
Unescape View File

@ -340,13 +340,12 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
expert.setExpYjfx(expYjfx);//研究方向 expert.setExpYjfx(expYjfx);//研究方向
expert.setExpCsgz(expCsgz);//从事工作 expert.setExpCsgz(expCsgz);//从事工作
expertService.save(expert); expertService.save(expert);
/*
CompExp compExp = new CompExp(); CompExp compExp = new CompExp();
compExp.setCompid(compid); compExp.setCompid(compid);
compExp.setCompName(compName); compExp.setCompName(compName);
compExp.setExpid(expert.getId()); compExp.setExpid(expert.getId());
compExp.setStat(stat); compExp.setStat(stat);
compExpService.save(compExp);*/ compExpService.save(compExp);
result.success("添加成功！"); result.success("添加成功！");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@ -408,7 +407,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
expert.setExpCsgz(expCsgz);//从事工作 expert.setExpCsgz(expCsgz);//从事工作
expertService.updateById(expert); expertService.updateById(expert);
/* CompExp compExp = new CompExp(); CompExp compExp = new CompExp();
QueryWrapper<CompExp> queryWrapper1 = QueryGenerator.initQueryWrapper(compExp, req.getParameterMap()); QueryWrapper<CompExp> queryWrapper1 = QueryGenerator.initQueryWrapper(compExp, req.getParameterMap());
queryWrapper1.eq("expid",expert.getId()); queryWrapper1.eq("expid",expert.getId());
List<CompExp> listce = compExpService.list(queryWrapper1); List<CompExp> listce = compExpService.list(queryWrapper1);
@ -417,7 +416,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
compExp.setCompName(compName); compExp.setCompName(compName);
compExp.setExpid(expert.getId()); compExp.setExpid(expert.getId());
compExp.setStat(stat); compExp.setStat(stat);
compExpService.updateById(compExp);*/ compExpService.updateById(compExp);
result.success("修改成功!"); result.success("修改成功!");
} }
} catch (Exception e) { } catch (Exception e) {

9
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java
Unescape View File

@ -336,9 +336,12 @@ public class TopicController extends JeecgController<Topic, ITopicService> {
QueryWrapper<Topic> queryWrapper= new QueryWrapper<>(); QueryWrapper<Topic> queryWrapper= new QueryWrapper<>();
queryWrapper.eq("annual_compid",topic.getAnnualCompid()).eq("number",topic.getNumber()); queryWrapper.eq("annual_compid",topic.getAnnualCompid()).eq("number",topic.getNumber());
Topic one = topicService.getOne(queryWrapper); Topic one = topicService.getOne(queryWrapper);
if (!Objects.equals(one.getId(), topic.getId())){ if(one!=null){
return Result.error("编码重复"); if (!Objects.equals(one.getId(), topic.getId())){
} return Result.error("编码重复");
}
}
topicService.updateById(topic); topicService.updateById(topic);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }

7
jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
Unescape View File

@ -247,6 +247,13 @@ public class SysUserController {
// 保存用户走一个service 保证事务 // 保存用户走一个service 保证事务
//获取租户ids //获取租户ids
String relTenantIds = jsonObject.getString("relTenantIds"); String relTenantIds = jsonObject.getString("relTenantIds");
SysUser sysUser = sysUserService.getUserByPhone(user.getPhone());
if (sysUser != null) {
result.setMessage("该手机号已注册");
result.setSuccess(false);
return result;
}
sysUserService.saveUser(user, selectedRoles, selectedDeparts, relTenantIds); sysUserService.saveUser(user, selectedRoles, selectedDeparts, relTenantIds);
baseCommonService.addLog("添加用户，username： " +user.getUsername() ,CommonConstant.LOG_TYPE_2, 2); baseCommonService.addLog("添加用户，username： " +user.getUsername() ,CommonConstant.LOG_TYPE_2, 2);
result.success("添加成功！"); result.success("添加成功！");

5
jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualComp.data.ts
Unescape View File

@ -149,9 +149,12 @@ export const formSchema: FormSchema[] = [
}, },
{ {
label: '驳回信息', label: '反馈信息',
field: 'backinfo', field: 'backinfo',
component: 'InputTextArea', component: 'InputTextArea',
dynamicDisabled: ({ values }) => {
return !!values.id;
},
}, },
// TODO 主键隐藏字段，目前写死为ID // TODO 主键隐藏字段，目前写死为ID
{ {

4
jeecgboot-vue3-master/src/views/comp/Comp.data.ts
Unescape View File

@ -30,12 +30,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'compImg', dataIndex: 'compImg',
customRender: render.renderImage, customRender: render.renderImage,
}, },
{ /* {
title: '比赛详情', title: '比赛详情',
align: 'center', align: 'center',
dataIndex: 'compDetail', dataIndex: 'compDetail',
slots: { customRender: 'htmlSlot' }, slots: { customRender: 'htmlSlot' },
}, },*/
{ {
title: '比赛介绍文件', title: '比赛介绍文件',
align: 'center', align: 'center',

2
jeecgboot-vue3-master/src/views/scorepersion/ScorePersionList.vue
Unescape View File

@ -105,7 +105,7 @@
canResize:false, canResize:false,
useSearchForm: false, useSearchForm: false,
actionColumn: { actionColumn: {
width: 120, width: 160,
fixed: 'right', fixed: 'right',
}, },
beforeFetch: (params) => { beforeFetch: (params) => {

2
jeecgboot-vue3-master/src/views/scorestapoint/ScoreStaPointList.vue
Unescape View File

@ -73,7 +73,7 @@
canResize:false, canResize:false,
useSearchForm: false, useSearchForm: false,
actionColumn: { actionColumn: {
width: 120, width: 160,
fixed: 'right', fixed: 'right',
}, },
beforeFetch: (params) => { beforeFetch: (params) => {

2
jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue
Unescape View File

@ -78,7 +78,7 @@
canResize:false, canResize:false,
useSearchForm: false, useSearchForm: false,
actionColumn: { actionColumn: {
width: 120, width: 160,
fixed: 'right', fixed: 'right',
}, },
beforeFetch: (params) => { beforeFetch: (params) => {

6
jeecgboot-vue3-master/src/views/topic/Topic.data.ts
Unescape View File

@ -70,11 +70,11 @@ export const formSchema: FormSchema[] = [
multi:true multi:true
} }
}, },
dynamicRules: ({model,schema}) => { /* dynamicRules: ({model,schema}) => {
return [ return [
{ required: true, message: '请输入年度比赛项目id!'}, { required: true, message: '请选择年度比赛项目!'},
]; ];
}, },*/
}, },
{ {
label: '题目编号', label: '题目编号',

Write Preview
Loading…
Cancel
Save