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

Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

Browse Source
main
喻忠伟 4 months ago
parent 690c81fff3 a59f622cb3
commit 63ab42efc2
6 changed files with 855 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split 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. 669
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
  3. 10
      jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue
  4. 168
      jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
  5. 13
      jeecgboot-vue3-master/src/views/depart/workbench/components/student/student.vue
  6. 18
      jeecgboot-vue3-master/src/views/expscore/ExpScoreList.vue

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

669
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();
Map<String, Object> map4 = new HashMap<>();
map4.put("name", sysUser.getRealname());
map4.put("xh", sysUser.getUsername());
map4.put("xh", sysUser.getWorkNo());
map4.put("szyx", depart.getDepartName());
bmxsxxListMap.add(map4);
}
@ -1208,7 +1208,7 @@ public class AnnualCompetitionProjectRegistrationController {
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("xh", sysUser.getWorkNo());
map5.put("szyx", depart.getDepartName());
bmxsxxListMap.add(map5);
}
@ -1234,6 +1234,7 @@ public class AnnualCompetitionProjectRegistrationController {
public Result<?> xssybsjs( HttpServletRequest req) {
//获取当前登录用户
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String wonk = sysUserService.getById(user.getId()).getWorkNo();
TeamManagement teamManagement = new TeamManagement();
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap());
queryWrappertm.eq("user_id",user.getId());
@ -1382,11 +1383,278 @@ public class AnnualCompetitionProjectRegistrationController {
map.put("xj",0);
}
//获奖数
QueryWrapper<AwardPersion> queryWrapperaphj = new QueryWrapper<>();
queryWrapperaphj.eq("studentcode",wonk);
queryWrapperaphj.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> listhj = awardPersionService.list(queryWrapperaphj);
map.put("hjNumber",listhj.size());
//一等奖数
AwardPersion awardPersion1 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap1 = QueryGenerator.initQueryWrapper(awardPersion1, req.getParameterMap());
queryWrapperap1.eq("awardsort",1);
queryWrapperap1.eq("studentcode",wonk);
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.eq("studentcode",wonk);
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.eq("studentcode",wonk);
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.eq("studentcode",wonk);
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.eq("studentcode",wonk);
queryWrapperap5.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list5 = awardPersionService.list(queryWrapperap5);
map.put("wdjNumber",list5.size());
//所有奖项(前六条)
AwardPersion awardPersionAll = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperapAll = QueryGenerator.initQueryWrapper(awardPersionAll, req.getParameterMap());
queryWrapperapAll.eq("studentcode",wonk);
queryWrapperapAll.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> listAll = awardPersionService.list(queryWrapperapAll);
List<Map<String,Object>> allApListMap = new ArrayList<>();
if(listAll.size()>6){
for (int y = 0 ; y < 6; 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<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",wonk);
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall1.put("jf",0);
}else {
mapall1.put("jf",listpcs.get(0).getScore());
}
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<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",wonk);
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall2.put("jf",0);
}else {
mapall2.put("jf",listpcs.get(0).getScore());
}
allApListMap.add(mapall2);
}
}
map.put("allApList",allApListMap);
}
return Result.OK(map);
}
/**
* 学生角色分析报告数据接口
*
* @param req
* @return
*/
@ApiOperation(value="学生角色分析报告数据接口", notes="学生角色分析报告数据接口")
@GetMapping(value = "/xsfxbg")
public Result<?> xsfxbg( HttpServletRequest req) {
//获取当前登录用户
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String wonk = sysUserService.getById(user.getId()).getWorkNo();
TeamManagement teamManagement = new TeamManagement();
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap());
queryWrappertm.eq("user_id",user.getId());
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
Map<String, Object> map = new HashMap<>();
if(listtm.size()!=0){
//学生参加比赛的所有报名编号
List<String> bmbhs = listtm.stream().map(TeamManagement::getEnrollCode).collect(Collectors.toList());
//查询报名表报名编号对应的所有年度比赛项目id
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap());
queryWrapperbm.in("enroll_code",bmbhs);
queryWrapperbm.eq("enroll_static", "2");
List<AnnualCompetitionProjectRegistration> listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm);
//参加比赛项目数量
map.put("cjbsxmsl",listbm.size());
if(listbm.size()!=0){
//年度比赛项目ids
List<String> ndbsxmids = listbm.stream().map(AnnualCompetitionProjectRegistration::getAnnualCompid).collect(Collectors.toList());
AnnualCompPoint annualCompPoint = new AnnualCompPoint();
QueryWrapper<AnnualCompPoint> queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap());
queryWrapperacp.in("id",ndbsxmids);
List<AnnualCompPoint> listacp = annualCompPointService.list(queryWrapperacp);
//报名比赛项目
List<Map<String,Object>> xmListMap = new ArrayList<>();
if(listacp.size()>6){
for (int k = 0 ; k < 6 ; k++){
Map<String, Object> map2 = new HashMap<>();
//年度比赛
map2.put("ndbsname",annualCompService.getById(listacp.get(k).getAnnualCompId()).getName());
//项目名称
map2.put("xmname",listacp.get(k).getObjName());
//参与形式
map2.put("cyxs",listacp.get(k).getEntryForm().equals("N") ? "个人":"团队");
//项目id
map2.put("xmid",listacp.get(k).getId());
//状态
Date date = new Date();
if(listacp.get(k).getApplyStartTime()!=null&&listacp.get(k).getApplyEndTime()!=null){
if(date.getTime()>=listacp.get(k).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(k).getApplyEndTime().getTime()){
map2.put("zt","报名");
}
}
if(listacp.get(k).getTopicStartTime()!=null&&listacp.get(k).getTopicEndTime()!=null){
if(date.getTime()>=listacp.get(k).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(k).getTopicEndTime().getTime()){
map2.put("zt","选题");
}
}
if(listacp.get(k).getUploadStartTime()!=null&&listacp.get(k).getUploadEndTime()!=null){
if(date.getTime()>=listacp.get(k).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(k).getUploadEndTime().getTime()){
map2.put("zt","上传作品");
}
}
if(listacp.get(k).getScoreStartTime()!=null&&listacp.get(k).getScoreEndTime()!=null){
if(date.getTime()>=listacp.get(k).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(k).getScoreEndTime().getTime()){
map2.put("zt","评分");
}
}
if(listacp.get(k).getScoreEndTime()!=null){
if(date.getTime()>listacp.get(k).getScoreEndTime().getTime()){
map2.put("zt","已结束");
}
}
xmListMap.add(map2);
}
}else {
for (int o = 0 ; o < listacp.size() ; o++){
Map<String, Object> map3 = new HashMap<>();
//年度比赛
map3.put("ndbsname",annualCompService.getById(listacp.get(o).getAnnualCompId()).getName());
//项目名称
map3.put("xmname",listacp.get(o).getObjName());
//参与形式
map3.put("cyxs",listacp.get(o).getEntryForm().equals("N") ? "个人":"团队");
//项目id
map3.put("xmid",listacp.get(o).getId());
//状态
Date date = new Date();
if(listacp.get(o).getApplyStartTime()!=null&&listacp.get(o).getApplyEndTime()!=null){
if(date.getTime()>=listacp.get(o).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(o).getApplyEndTime().getTime()){
map3.put("zt","报名");
}
}
if(listacp.get(o).getTopicStartTime()!=null&&listacp.get(o).getTopicEndTime()!=null){
if(date.getTime()>=listacp.get(o).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(o).getTopicEndTime().getTime()){
map3.put("zt","选题");
}
}
if(listacp.get(o).getUploadStartTime()!=null&&listacp.get(o).getUploadEndTime()!=null){
if(date.getTime()>=listacp.get(o).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(o).getUploadEndTime().getTime()){
map3.put("zt","上传作品");
}
}
if(listacp.get(o).getScoreStartTime()!=null&&listacp.get(o).getScoreEndTime()!=null){
if(date.getTime()>=listacp.get(o).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(o).getScoreEndTime().getTime()){
map3.put("zt","评分");
}
}
if(listacp.get(o).getScoreEndTime()!=null){
if(date.getTime()>listacp.get(o).getScoreEndTime().getTime()){
map3.put("zt","已结束");
}
}
xmListMap.add(map3);
}
}
map.put("bmbsxm",xmListMap);
int gjj = 0;
int shengj = 0;
int shij = 0;
int xj = 0;
for (int i = 0 ; i < listacp.size() ; i++){
if(listacp.get(i).getObjLevel().equals("1809121223401168898")){
//国家
gjj = gjj+1;
}
if(listacp.get(i).getObjLevel().equals("1809121301201313793")){
//省
shengj = shengj+1;
}
if(listacp.get(i).getObjLevel().equals("1809121356582903809")){
//市
shij = shij+1;
}
if(listacp.get(i).getObjLevel().equals("1809121454654119937")){
//校
xj = xj+1;
}
}
map.put("gjj",gjj);
map.put("shengj",shengj);
map.put("shij",shij);
map.put("xj",xj);
}else{
map.put("gjj",0);
map.put("shengj",0);
map.put("shij",0);
map.put("xj",0);
}
//获奖数
QueryWrapper<AwardPersion> queryWrapperaphj = new QueryWrapper<>();
queryWrapperaphj.eq("studentcode",wonk);
queryWrapperaphj.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> listhj = awardPersionService.list(queryWrapperaphj);
map.put("hjNumber",listhj.size());
//一等奖数
AwardPersion awardPersion1 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap1 = QueryGenerator.initQueryWrapper(awardPersion1, req.getParameterMap());
queryWrapperap1.eq("awardsort",1);
queryWrapperap1.eq("studentcode",user.getUsername());
queryWrapperap1.eq("studentcode",wonk);
queryWrapperap1.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list1 = awardPersionService.list(queryWrapperap1);
map.put("ydjNumber",list1.size());
@ -1394,7 +1662,7 @@ public class AnnualCompetitionProjectRegistrationController {
AwardPersion awardPersion2 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap2 = QueryGenerator.initQueryWrapper(awardPersion2, req.getParameterMap());
queryWrapperap2.eq("awardsort",2);
queryWrapperap2.eq("studentcode",user.getUsername());
queryWrapperap2.eq("studentcode",wonk);
queryWrapperap2.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list2 = awardPersionService.list(queryWrapperap2);
map.put("edjNumber",list2.size());
@ -1402,7 +1670,7 @@ public class AnnualCompetitionProjectRegistrationController {
AwardPersion awardPersion3 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap3 = QueryGenerator.initQueryWrapper(awardPersion3, req.getParameterMap());
queryWrapperap3.eq("awardsort",3);
queryWrapperap3.eq("studentcode",user.getUsername());
queryWrapperap3.eq("studentcode",wonk);
queryWrapperap3.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list3 = awardPersionService.list(queryWrapperap3);
map.put("sdjNumber",list3.size());
@ -1410,7 +1678,7 @@ public class AnnualCompetitionProjectRegistrationController {
AwardPersion awardPersion4 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap4 = QueryGenerator.initQueryWrapper(awardPersion4, req.getParameterMap());
queryWrapperap4.eq("awardsort",4);
queryWrapperap4.eq("studentcode",user.getUsername());
queryWrapperap4.eq("studentcode",wonk);
queryWrapperap4.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list4 = awardPersionService.list(queryWrapperap4);
map.put("sidjNumber",list4.size());
@ -1418,14 +1686,14 @@ public class AnnualCompetitionProjectRegistrationController {
AwardPersion awardPersion5 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap5 = QueryGenerator.initQueryWrapper(awardPersion5, req.getParameterMap());
queryWrapperap5.eq("awardsort",5);
queryWrapperap5.eq("studentcode",user.getUsername());
queryWrapperap5.eq("studentcode",wonk);
queryWrapperap5.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list5 = awardPersionService.list(queryWrapperap5);
map.put("wdjNumber",list5.size());
//所有奖项(前六条)
AwardPersion awardPersionAll = new AwardPersion();
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);
List<AwardPersion> listAll = awardPersionService.list(queryWrapperapAll);
List<Map<String,Object>> allApListMap = new ArrayList<>();
@ -1435,10 +1703,19 @@ public class AnnualCompetitionProjectRegistrationController {
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());
}else {
mapall1.put("dwname","暂无数据");
}
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",user.getUsername());
queryWrapperpcs.eq("work_on",wonk);
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall1.put("jf",0);
@ -1454,10 +1731,19 @@ public class AnnualCompetitionProjectRegistrationController {
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());
}else {
mapall2.put("dwname","暂无数据");
}
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",user.getUsername());
queryWrapperpcs.eq("work_on",wonk);
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall2.put("jf",0);
@ -1475,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) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();

10
jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue
Unescape View File

@ -349,11 +349,17 @@
}
function handlePreview(record) {
const previewServerUrl = 'http://127.0.0.1:8012/onlinePreview?url=';
const previewServerUrl = 'http://10.20.15.171:8012/onlinePreview?url=';
const fileUrl = `${globalSetting.domainUrl}${getDownWork}?id=${record.id}`;
const extName = record.url.substring(record.url.lastIndexOf('.'));
const previewUrl = `${fileUrl}&fullfilename=${new Date().getTime()}${extName}`;
window.open(previewServerUrl + encodeURIComponent(Base64.encode(previewUrl)));
window.open(previewServerUrl + encodeURIComponent(base64Encode(previewUrl)));
}
function base64Encode(str: string): string {
return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
return String.fromCharCode('0x' + p1);
}));
}
function handleDown(record) {

168
jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
Unescape View File

@ -6,21 +6,72 @@
我是比赛综述：全面落实立德树人根本任务，依据CDIO工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识；在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力；具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好素养，能适应产业与社会变革的国际化应用型人。
</p>
<a-row class="card-box" :gutter="[16, 16]" type="flex">
<a-col :xs="24" :md="12" :xl="6" v-for="i in 4" :key="i">
<div class="card">
<a-col :xs="24" :md="12" :xl="12">
<!-- <div class="card">
<div class="inner">
<div class="container">
<div class="fl-box">
<div class="tit">参加的比赛数</div>
<div class="center">88</div>
<div class="tit">参加的比赛数</div>
<div class="center">{{ data.cjbsxmsl }}</div>
<div class="info">
<div class="li">国赛：12</div>
<div class="li">省赛：32</div>
<div class="li">校赛：44</div>
<div class="li">国家级：{{ data.gjj }}</div>
<div class="li">省级：{{ data.shengj }}</div>
<div class="li">市级：{{ data.shij }}</div>
<div class="li">校级：{{ data.xj }}</div>
</div>
</div>
</div>
</div>
</div> -->
<div class="card1">
<div class="title">
<div class="left">参加比赛项目数量</div>
<div class="right">
<SvgIcon size="20" name="content" />
</div>
</div>
<div class="name">{{ data.cjbsxmsl }}</div>
<div class="total" style="margin-top: 10px">
<div class="two">国家级：{{ data.gjj }}</div>
<div class="three">省级：{{ data.shengj }}</div>
<div class="three">市级：{{ data.shij }}</div>
<div class="three">校级：{{ data.xj }}</div>
</div>
</div>
</a-col>
<a-col :xs="24" :md="12" :xl="12">
<!-- <div class="card">
<div class="inner">
<div class="container">
<div class="fl-box">
<div class="tit">获奖数</div>
<div class="center">{{ data.hjNumber }}</div>
<div class="info">
<div class="li">一等：{{ data.ydjNumber }}</div>
<div class="li">二等：{{ data.edjNumber }}</div>
<div class="li">三等：{{ data.sdjNumber }}</div>
<div class="li">四等：{{ data.sidjNumber }}</div>
<div class="li">五等：{{ data.wdjNumber }}</div>
</div>
</div>
</div>
</div>
</div> -->
<div class="card1">
<div class="title">
<div class="left">获奖数</div>
<div class="right">
<SvgIcon size="20" name="content" />
</div>
</div>
<div class="name">{{ data.hjNumber }}</div>
<div class="total" style="grid-template-columns: repeat(5, 1fr)">
<div class="one">一等：{{ data.ydjNumber }}</div>
<div class="two">二等：{{ data.edjNumber }}</div>
<div class="three">三等：{{ data.sdjNumber }}</div>
<div class="two">四等：{{ data.sidjNumber }}</div>
<div class="three">五等：{{ data.wdjNumber }}</div>
</div>
</div>
</a-col>
</a-row>
@ -49,34 +100,27 @@
<p class="paragraph">
我是比赛参赛情况综述：全面落实立德树人根本任务，依据CDIO工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识；在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力；具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好素养，能适应产业与社会变革的国际化应用型人。
</p>
<div class="table-box">
<div class="table-box" style="min-height: 500px;">
<table>
<caption>
个人比赛获奖情况
</caption>
<thead>
<tr>
<th scope="col">获奖等级</th>
<th scope="col">比赛名称</th>
<th scope="col">项目名称</th>
<th scope="col">所在小队</th>
<th scope="col">奖项名称</th>
<th scope="col">年度比赛</th>
<th scope="col">年度比赛项目</th>
<th scope="col">所在队伍名称</th>
<th scope="col">积分</th>
</tr>
</thead>
<tbody>
<tr>
<th scope="row">一等奖</th>
<td>全国计算机大赛</td>
<td>项目一</td>
<td>我是一个小队</td>
<td>135</td>
</tr>
<tr>
<th scope="row">一等奖</th>
<td>全国计算机大赛</td>
<td>项目一</td>
<td>我是一个小队</td>
<td>135</td>
<tr v-for="item, i in data.allApList" :key="i">
<th scope="row">{{ item.jxname }}</th>
<td>{{ item.ndbs }}</td>
<td>{{ item.ndbsxm }}</td>
<td>{{ item.dwname }}</td>
<td>{{ item.jf }}</td>
</tr>
</tbody>
</table>
@ -88,6 +132,33 @@
<script lang='ts' setup>
import cardList from './components/cardList.vue';
import randerChart from './components/randerChart.vue';
import { getXsfxbg } from '/@/api/demo/depart';
import { reactive } from 'vue';
type allApList = {
jxname: string
ndbs: string
ndbsxm: string
dwname: string
jf: string
}[] | []
const data = reactive({
cjbsxmsl: 0,
gjj: 0,
shengj: 0,
shij: 0,
xj: 0,
hjNumber: 0,
ydjNumber: 0,
edjNumber: 0,
sdjNumber: 0,
sidjNumber: 0,
wdjNumber: 0,
allApList: [] as allApList
})
getXsfxbg().then(res => {
Object.assign(data, res)
})
</script>
<style lang='less' scoped>
@ -218,5 +289,52 @@ import randerChart from './components/randerChart.vue';
}
}
/** */
.card1 {
width: 100%;
height: 182px;
// background-color: #ffffff00;
border: 1px solid #ccc;
padding: 20px;
.title {
display: flex;
width: 100%;
justify-content: space-between;
.left {
font-size: 14px;
color: #fff;
color: rgba(0, 0, 0, 0.45);
}
}
.name {
font-size: 42px;
font-weight: 500;
color: #000;
margin-top: 10px;
}
.total {
margin-top: 20px;
font-size: 12px;
color: #000;
// display: flex;
width: 100%;
display: grid;
grid-template-columns: repeat(4, 1fr);
/* 创建两列，每列宽度相等 */
grid-template-rows: repeat(2, 10px);
/* 创建四行，每行高度固定为100px */
gap: 10px;
div {
// width: 25%;
}
}
}
}
</style>

13
jeecgboot-vue3-master/src/views/depart/workbench/components/student/student.vue
Unescape View File

@ -11,10 +11,10 @@
</div>
<div class="name">{{ data.cjbsxmsl }}</div>
<div class="total" style="margin-top: 10px">
<div class="two">国家级：：{{ data.gjj }}</div>
<div class="three">省级：：{{ data.shengj }}</div>
<div class="three">市级：：{{ data.shij }}</div>
<div class="three">校级：：{{ data.xj }}</div>
<div class="two">国家级：{{ data.gjj }}</div>
<div class="three">省级：{{ data.shengj }}</div>
<div class="three">市级：{{ data.shij }}</div>
<div class="three">校级：{{ data.xj }}</div>
</div>
</div>
</a-col>
@ -24,7 +24,7 @@
<div class="left">获奖数</div>
<div class="right"><SvgIcon size="20" name="content" /></div>
</div>
<div class="name">1314</div>
<div class="name">{{ data.hjNumber }}</div>
<div class="total" style="grid-template-columns: repeat(5, 1fr)">
<div class="one">一等：{{data.ydjNumber}}</div>
<div class="two">二等：{{data.edjNumber}}</div>
@ -114,7 +114,8 @@ const router = useRouter()
wdjNumber:0,
allApList:[],
ndbsxm:[],
bmbsxm:[]
bmbsxm:[],
hjNumber:0
});
const getStudentEvent = async () => {
const res = await getStudent();

18
jeecgboot-vue3-master/src/views/expscore/ExpScoreList.vue
Unescape View File

@ -43,6 +43,8 @@
<template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
<a-button v-if="text" type="primary" preIcon="ant-design:download-outlined" size="small" @click="handlePreview(text)">预览</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
@ -62,6 +64,7 @@
import JSelectUserByDept from '/@/components/Form/src/jeecg/components/JSelectUserByDept.vue';
import { useRoute } from 'vue-router';
import {useMessage} from "../../hooks/web/useMessage";
import {getDownWork} from "/@/views/UpfilePersion/UpfilePersion.api";
const { createMessage } = useMessage();
const route = useRoute();
@ -105,6 +108,21 @@
sm: { span: 16 },
});
function handlePreview(record) {
console.log("===========================================================");
console.log(record);
console.log("===========================================================");
const previewServerUrl = 'http://10.20.15.171:8012/onlinePreview?url=';
let url = 'http://10.20.15.171/jeecg-boot/sys/common/static/' + record;
window.open(previewServerUrl + encodeURIComponent(base64Encode(url)));
}
function base64Encode(str: string): string {
return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
return String.fromCharCode('0x' + p1);
}));
}
/**
* 新增事件
*/

Write Preview
Loading…
Cancel
Save