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 8f8ab76b0d c2c0f719cc
commit d128f70162
5 changed files with 88 additions and 69 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. 4
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java
  3. 109
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java
  4. 3
      jeecgboot-vue3-master/src/views/expscore/ExpScoreList.vue
  5. 7
      jeecgboot-vue3-master/src/views/expscore/components/ExpScoreModal.vue

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

@ -337,6 +337,15 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
@GetMapping(value = "/cjhz")
public Result<String> cjhz(@RequestParam(name = "id", required = true) String id,HttpServletRequest req) {
AnnualCompPoint annualCompPoint = annualCompPointService.getById(id);
QueryWrapper<ScorePersion> queryWrappersc = new QueryWrapper<>();
queryWrappersc.eq("annual_compid",annualCompPoint.getAnnualCompId());
queryWrappersc.eq("annual_comp_p",annualCompPoint.getId());
List<ScorePersion> listsc = scorePersionService.list(queryWrappersc);
if(listsc.size()>0){
for (int k = 0 ; k < listsc.size() ; k++){
scorePersionService.removeById(listsc.get(k).getId());
}
}
QueryWrapper<ExpScore> queryWrapper = new QueryWrapper<>();
queryWrapper.select("bmcode,SUM(score) as score");
queryWrapper.eq("ann_com_p",id);
@ -516,12 +525,22 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
if(list.size()==0){
return Result.error("未设置年度比赛奖项!");
}
QueryWrapper<AwardPersion> queryWrapperap = new QueryWrapper<>();
queryWrapperap.eq("annal_comp",annualCompPoint.getAnnualCompId());
queryWrapperap.eq("annual_comp_p",annualCompPoint.getId());
List<AwardPersion> listap = awardPersionService.list(queryWrapperap);
if(listap.size()>0){
for (int k = 0 ; k < listap.size() ; k++){
awardPersionService.removeById(listap.get(k).getId());
}
}
QueryWrapper<ScorePersion> queryWrappersp = new QueryWrapper<>();
queryWrappersp.eq("annualid",annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid());
queryWrappersp.eq("annual_compid",annualCompPoint.getAnnualCompId());
queryWrappersp.eq("annual_comp_p",id);
queryWrappersp.orderByAsc("sort");
List<ScorePersion> listsp = scorePersionService.list(queryWrappersp);
try {
for (int i = 0 ; i<list.size();i++){
if(list.get(i).getIsFirstPrize().equals("Y")){
String name1 = list.get(i).getFirstPrize();
@ -643,9 +662,12 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
awardPersionService.save(awardPersion);
}
}
annualCompPoint.setIsPj(1);
annualCompPointService.updateById(annualCompPoint);
}
}catch (Exception e){
return Result.error("参与评奖人数少于年度比赛奖项设置的数量");
}
annualCompPoint.setIsPj(1);
annualCompPointService.updateById(annualCompPoint);
return Result.OK("成功!");
}
@ -684,6 +706,7 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
queryWrappersp.eq("annual_comp_p",awardPersion.getAnnualCompP());
queryWrappersp.orderByAsc("sort");
List<ScorePersion> listsp = scorePersionService.list(queryWrappersp);
try {
for (int i = 0 ; i<list.size();i++){
if(list.get(i).getIsFirstPrize().equals("Y")){
String name1 = list.get(i).getFirstPrize();
@ -816,9 +839,12 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
}
}
}
annualCompPoint.setIsPj(1);
annualCompPointService.updateById(annualCompPoint);
}
}catch (Exception e){
return Result.error("参与评奖人数少于年度比赛奖项设置的数量");
}
annualCompPoint.setIsPj(1);
annualCompPointService.updateById(annualCompPoint);
return Result.OK("成功!");
}

4
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java
Unescape View File

@ -102,11 +102,13 @@ public class ExpScoreController extends JeecgController<ExpScore, IExpScoreServi
queryWrappereg.eq("ann_comp_groupid",annComGroTop.getAnnComPG());
List<ExpGroup> listeg = expGroupService.list(queryWrappereg);
ExpScore expScorelist = new ExpScore();
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<ExpScore> queryWrapperlist = QueryGenerator.initQueryWrapper(expScorelist, req.getParameterMap());
queryWrapperlist.eq("annid",annComGroTop.getAnnid());
queryWrapperlist.eq("annal_comp",annualCompPointService.getById(annComGroTop.getAnnComP()).getAnnualCompId());
queryWrapperlist.eq("ann_com_p",annComGroTop.getAnnComP());
queryWrapperlist.eq("topid",annComGroTop.getTopid());
queryWrapperlist.eq("userid",sysUser.getId());
List<ExpScore> listeslist = expScoreService.list(queryWrapperlist);
if(listeslist.size()==0){
AnnComGroTopP annComGroTopP = new AnnComGroTopP();
@ -158,7 +160,7 @@ public class ExpScoreController extends JeecgController<ExpScore, IExpScoreServi
}
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<ExpScore> queryWrapper = QueryGenerator.initQueryWrapper(expScore, req.getParameterMap());
queryWrapper.eq("annid",annComGroTop.getAnnid());
queryWrapper.eq("annal_comp",annualCompPointService.getById(annComGroTop.getAnnComP()).getAnnualCompId());

109
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java
Unescape View File

@ -26,7 +26,6 @@ import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.IAnnu
import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.ITeamManagementService;
import org.jeecg.modules.demo.awardpersion.entity.AwardPersion;
import org.jeecg.modules.demo.awardpersion.service.IAwardPersionService;
import org.jeecg.modules.demo.bigScreen.vo.CompVo;
import org.jeecg.modules.demo.comp.entity.Comp;
import org.jeecg.modules.demo.comp.service.ICompService;
import org.jeecg.modules.demo.comptype.entity.CompType;
@ -524,24 +523,26 @@ public class UserHomePageServiceImpl implements UserHomePageService {
Map<String, Object> departMap = new LinkedHashMap<>();
departMap.put("部门名称", depart.getDepartName());
//报名列表
List<AnnualCompetitionProjectRegistration> registrationList = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>()
.in(!ObjectUtils.isEmpty(pointIds4Depart), AnnualCompetitionProjectRegistration::getAnnualCompid, pointIds4Depart));
if (!ObjectUtils.isEmpty(registrationList)) {
//报名编号
Set<String> enrollCodes = Optional.ofNullable(registrationList).orElse(new LinkedList<>()).stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet());
Long count = iTeamManagementService.count(new LambdaQueryWrapper<TeamManagement>().in(TeamManagement::getEnrollCode, enrollCodes));
departMap.put("比赛总人数", count);
//个人赛报名数
List<AnnualCompetitionProjectRegistration> registrationList4Stu = registrationList.stream().filter(b -> b.getEntryFormat().equals("0")).collect(Collectors.toList());
Set<String> enrollCodes4Stu = Optional.ofNullable(registrationList4Stu).orElse(new LinkedList<>()).stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet());
Long count4Stu = iTeamManagementService.count(new LambdaQueryWrapper<TeamManagement>().in(!ObjectUtils.isEmpty(enrollCodes4Stu), TeamManagement::getEnrollCode, enrollCodes4Stu));
//学生人数
departMap.put("个人赛人数", count4Stu);
departMap.put("团队赛人数", count - count4Stu);
if (!ObjectUtils.isEmpty(pointIds4Depart)) {
List<AnnualCompetitionProjectRegistration> registrationList = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>()
.in(AnnualCompetitionProjectRegistration::getAnnualCompid, pointIds4Depart));
if (!ObjectUtils.isEmpty(registrationList)) {
//报名编号
Set<String> enrollCodes = Optional.ofNullable(registrationList).orElse(new LinkedList<>()).stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet());
Long count = iTeamManagementService.count(new LambdaQueryWrapper<TeamManagement>().in(TeamManagement::getEnrollCode, enrollCodes));
departMap.put("比赛总人数", count);
//个人赛报名数
List<AnnualCompetitionProjectRegistration> registrationList4Stu = registrationList.stream().filter(b -> b.getEntryFormat().equals("0")).collect(Collectors.toList());
Set<String> enrollCodes4Stu = Optional.ofNullable(registrationList4Stu).orElse(new LinkedList<>()).stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet());
Long count4Stu = iTeamManagementService.count(new LambdaQueryWrapper<TeamManagement>().in(!ObjectUtils.isEmpty(enrollCodes4Stu), TeamManagement::getEnrollCode, enrollCodes4Stu));
//学生人数
departMap.put("个人赛人数", count4Stu);
departMap.put("团队赛人数", count - count4Stu);
}
}
canSaiList.add(departMap);
List<AwardPersion> awardPersionList4Depart = iAwardPersionService.list(new LambdaQueryWrapper<AwardPersion>().eq(AwardPersion::getAnnualCompP, pointIds4Depart));
/*List<AwardPersion> awardPersionList4Depart = iAwardPersionService.list(new LambdaQueryWrapper<AwardPersion>().eq(AwardPersion::getAnnualCompP, pointIds4Depart));
Map<String, Object> departHuoJiangMap = new LinkedHashMap<>();
departHuoJiangMap.put("部门名称", depart.getDepartName());
departHuoJiangMap.put("获取人数", awardPersionList4Depart.size());
@ -551,10 +552,10 @@ public class UserHomePageServiceImpl implements UserHomePageService {
Optional.ofNullable(awardNameMap).orElse(new LinkedHashMap<>()).forEach((key, value) -> {
departHuoJiangMap.put(depart.getDepartName() + "-" + key, value.size());
});
huoJiangList.add(departHuoJiangMap);
huoJiangList.add(departHuoJiangMap);*/
});
resultMap.put("部门参赛情况列表", canSaiList);
resultMap.put("部门获奖情况列表", huoJiangList);
// resultMap.put("部门获奖情况列表", huoJiangList);
List<HomePageCompVo> scoreList4Point = new LinkedList<>();
List<PersonalCompScore> personalCompScores = iPersonalCompScoreService.list(new LambdaQueryWrapper<PersonalCompScore>().eq(PersonalCompScore::getAnnualCompP, annualCompPointIds));
@ -585,9 +586,15 @@ public class UserHomePageServiceImpl implements UserHomePageService {
private List<AnnualCompPoint> convertPoint4Depart(SysDepart depart) {
List<Comp> compList = iCompService.list(new LambdaQueryWrapper<Comp>().eq(Comp::getCompOrgan, depart.getId()));
Set<String> compIds = Optional.ofNullable(compList).orElse(new ArrayList<>()).stream().map(comp -> comp.getId()).collect(Collectors.toSet());
List<AnnualComp> annualCompList = iAnnualCompService.list(new LambdaQueryWrapper<AnnualComp>().in(!ObjectUtils.isEmpty(compIds), AnnualComp::getCompid, compIds));
Set<String> annualCompIds = Optional.ofNullable(annualCompList).orElse(new ArrayList<>()).stream().map(annualComp -> annualComp.getId()).collect(Collectors.toSet());
return iAnnualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>().in(!ObjectUtils.isEmpty(annualCompIds), AnnualCompPoint::getAnnualCompId, annualCompIds));
List<AnnualCompPoint> pointList = new LinkedList<>();
if (!ObjectUtils.isEmpty(compIds)) {
List<AnnualComp> annualCompList = iAnnualCompService.list(new LambdaQueryWrapper<AnnualComp>().in(AnnualComp::getCompid, compIds));
Set<String> annualCompIds = Optional.ofNullable(annualCompList).orElse(new ArrayList<>()).stream().map(annualComp -> annualComp.getId()).collect(Collectors.toSet());
if (!ObjectUtils.isEmpty(annualCompIds)) {
pointList = iAnnualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>().in(AnnualCompPoint::getAnnualCompId, annualCompIds));
}
}
return pointList;
}
@Override
@ -609,7 +616,7 @@ public class UserHomePageServiceImpl implements UserHomePageService {
List<AnnualComp> annualCompList = iAnnualCompService.list(new LambdaQueryWrapper<AnnualComp>()
.eq(AnnualComp::getAnnualid, annual.getId())
.in(AnnualComp::getCompid, compIds));
.in(!ObjectUtils.isEmpty(compIds),AnnualComp::getCompid, compIds));
Set<String> annualCompIds = Optional.ofNullable(annualCompList).orElse(new LinkedList<>()).stream().map(obj -> obj.getId()).collect(Collectors.toSet());
List<AnnualCompPoint> annualCompPointList = iAnnualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>().in(AnnualCompPoint::getAnnualCompId, annualCompIds));
@ -763,26 +770,28 @@ public class UserHomePageServiceImpl implements UserHomePageService {
Set<String> pointIds4Depart = Optional.ofNullable(pointList4Depart).orElse(new ArrayList<>()).stream().map(obj -> obj.getId()).collect(Collectors.toSet());
Map<String, Object> departMap = new LinkedHashMap<>();
departMap.put("部门名称", sysDepart.getDepartName());
//报名列表
List<AnnualCompetitionProjectRegistration> registrationList = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>()
.in(AnnualCompetitionProjectRegistration::getAnnualCompid, pointIds4Depart));
if (!ObjectUtils.isEmpty(registrationList)) {
//报名编号
Set<String> enrollCodes = Optional.ofNullable(registrationList).orElse(new LinkedList<>()).stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet());
Long count = iTeamManagementService.count(new LambdaQueryWrapper<TeamManagement>().in(TeamManagement::getEnrollCode, enrollCodes));
departMap.put("比赛总人数", count);
//个人赛报名数
List<AnnualCompetitionProjectRegistration> registrationList4Stu = registrationList.stream().filter(b -> b.getEntryFormat().equals("0")).collect(Collectors.toList());
Set<String> enrollCodes4Stu = Optional.ofNullable(registrationList4Stu).orElse(new LinkedList<>()).stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet());
Long count4Stu = iTeamManagementService.count(new LambdaQueryWrapper<TeamManagement>().in(!ObjectUtils.isEmpty(enrollCodes4Stu), TeamManagement::getEnrollCode, enrollCodes4Stu));
//学生人数
departMap.put("个人赛人数", count4Stu);
departMap.put("团队赛人数", count - count4Stu);
if (!ObjectUtils.isEmpty(pointIds4Depart)) {
//报名列表
List<AnnualCompetitionProjectRegistration> registrationList = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>()
.in(AnnualCompetitionProjectRegistration::getAnnualCompid, pointIds4Depart));
if (!ObjectUtils.isEmpty(registrationList)) {
//报名编号
Set<String> enrollCodes = Optional.ofNullable(registrationList).orElse(new LinkedList<>()).stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet());
Long count = iTeamManagementService.count(new LambdaQueryWrapper<TeamManagement>().in(TeamManagement::getEnrollCode, enrollCodes));
departMap.put("比赛总人数", count);
//个人赛报名数
List<AnnualCompetitionProjectRegistration> registrationList4Stu = registrationList.stream().filter(b -> b.getEntryFormat().equals("0")).collect(Collectors.toList());
Set<String> enrollCodes4Stu = Optional.ofNullable(registrationList4Stu).orElse(new LinkedList<>()).stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet());
Long count4Stu = iTeamManagementService.count(new LambdaQueryWrapper<TeamManagement>().in(!ObjectUtils.isEmpty(enrollCodes4Stu), TeamManagement::getEnrollCode, enrollCodes4Stu));
//学生人数
departMap.put("个人赛人数", count4Stu);
departMap.put("团队赛人数", count - count4Stu);
}
}
canSaiList.add(departMap);
resultMap.put("部门参赛情况列表", canSaiList);
List<AwardPersion> awardPersionList4Depart = iAwardPersionService.list(new LambdaQueryWrapper<AwardPersion>().eq(AwardPersion::getAnnualCompP, pointIds4Depart));
/* List<AwardPersion> awardPersionList4Depart = iAwardPersionService.list(new LambdaQueryWrapper<AwardPersion>().eq(AwardPersion::getAnnualCompP, pointIds4Depart));
Map<String, Object> departHuoJiangMap = new LinkedHashMap<>();
departHuoJiangMap.put("部门名称", sysDepart.getDepartName());
departHuoJiangMap.put("获取人数", awardPersionList4Depart.size());
@ -797,30 +806,8 @@ public class UserHomePageServiceImpl implements UserHomePageService {
});
// awardTypeMap2.put("获奖人数", huoJiangCount.get());
// huoJiangList.add(awardTypeMap2);
resultMap.put("部门获奖情况列表", departHuoJiangMap);
resultMap.put("部门获奖情况列表", departHuoJiangMap);*/
/*List<HomePageCompVo> scoreList4Point = new LinkedList<>();
List<PersonalCompScore> personalCompScores = iPersonalCompScoreService.list(new LambdaQueryWrapper<PersonalCompScore>().eq(PersonalCompScore::getAnnualCompP, annualCompPointIds));
Map<String, List<PersonalCompScore>> AnnualCompPointIdsMap = Optional.ofNullable(personalCompScores).orElse(new LinkedList<>()).stream()
.collect(Collectors.groupingBy(PersonalCompScore::getAnnualCompP));
Optional.ofNullable(AnnualCompPointIdsMap).orElse(new LinkedHashMap<>()).forEach((key, value) -> {
double sum = value.stream().mapToDouble(obj -> obj.getScore()).sum();
HomePageCompVo vo = new HomePageCompVo();
AnnualCompPoint point = iAnnualCompPointService.getById(key);
vo.setAnnualCompPointName(point.getObjName());
vo.setAnnualCompPointId(key);
AnnualComp annualComp = iAnnualCompService.getById(point.getAnnualCompId());
if (!ObjectUtils.isEmpty(annualComp)) {
Comp comp = iCompService.getById(annualComp.getCompid());
if (!ObjectUtils.isEmpty(comp)) {
vo.setCompName(comp.getCompName());
}
}
vo.setTotalScore(sum);
scoreList4Point.add(vo);
});
scoreList4Point.stream().sorted(Comparator.comparing(HomePageCompVo::getTotalScore)).collect(Collectors.toList());
resultMap.put("比赛学生积分况分析", scoreList4Point);*/
return resultMap;
}

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

@ -143,8 +143,9 @@
* 设置细则得分事件
*/
function szxzdf(record: Recordable) {
console.log(record.score,record.id )
xzzf({zjpfid:record.id}).then((result)=>{
console.log(result)
if(result=="true"){
registerModal.value.edit(record);
registerModal.value.disableSubmit = false;

7
jeecgboot-vue3-master/src/views/expscore/components/ExpScoreModal.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<a-modal :title="title" :width="width" v-if="visible" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<ExpScoreForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ExpScoreForm>
</a-modal>
</template>
@ -35,9 +35,12 @@
console.log(registerForm.value);
registerForm.value? registerForm.value.searchReset() : ''
title.value = disableSubmit.value ? '详情' : '细则得分';
visible.value = true;
let id= record.id;
route.query.zjpfid = id;
setTimeout(() => {
visible.value = true;
}, 0);
//router.push({query: id})
}

Write Preview
Loading…
Cancel
Save