diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java index ac96dfb2..5b2b5c14 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.subject.Subject; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -38,6 +39,8 @@ import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.IAnnu import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.IInstructorSheetService; import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.ITeamManagementService; import org.jeecg.modules.demo.awardpersion.entity.AwardPersion; +import org.jeecg.modules.demo.awardpersion.entity.AwardPersionMb; +import org.jeecg.modules.demo.awardpersion.entity.AwardPersionOptions; import org.jeecg.modules.demo.awardpersion.service.IAwardPersionService; import org.jeecg.modules.demo.comp.entity.Comp; import org.jeecg.modules.demo.comp.service.ICompService; @@ -47,13 +50,12 @@ import org.jeecg.modules.demo.expert.entity.Expert; import org.jeecg.modules.demo.expert.service.IExpertService; import org.jeecg.modules.demo.expscore.entity.ExpScore; import org.jeecg.modules.demo.expscore.service.IExpScoreService; +import org.jeecg.modules.demo.score_management.entity.ScoreManagement; import org.jeecg.modules.demo.scorepersion.entity.ScorePersion; import org.jeecg.modules.demo.scorepersion.service.IScorePersionService; -import org.jeecg.modules.demo.teamseq.entity.TeamSeq; -import org.jeecg.modules.demo.teamseq.service.ITeamSeqService; -import org.jeecg.modules.demo.teamseq.vo.TeamSeqVo; import org.jeecg.modules.demo.upfile_persion.entity.UpfilePersion; import org.jeecg.modules.demo.upfile_persion.service.IUpfilePersionService; +import org.jeecg.modules.system.entity.SysDict; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysUserService; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -61,9 +63,7 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -74,7 +74,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; +import java.time.LocalDateTime; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -137,9 +139,6 @@ public class AnnualCompPointController extends JeecgController list = compService.list(queryWrapperComp); - if (list.isEmpty()) { - return Result.error("未绑定比赛"); + if(list.isEmpty()){ + return Result.error("未绑定比赛"); } List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); // 获取负责的年度比赛id QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); /*queryWrapperAnnual.in(ids.size()!=0,"compid",ids);*/ - queryWrapperAnnual.in("compid", ids); + queryWrapperAnnual.in("compid",ids); List listAnnual = annualCompService.list(queryWrapperAnnual); - if (listAnnual.isEmpty()) { - return Result.error("未创建年度比赛"); + if(listAnnual.isEmpty()){ + return Result.error("未创建年度比赛"); } List annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); - queryWrapper.in("annual_comp_id", annualIds); - queryWrapper.eq("annual_comp_switch", "Y"); // 比赛必须是开启的 + queryWrapper.in("annual_comp_id",annualIds); + queryWrapper.eq("annual_comp_switch","Y"); // 比赛必须是开启的 Page page = new Page(pageNo, pageSize); IPage pageList = annualCompPointService.page(page, queryWrapper); - List records = pageList.getRecords(); - Optional.ofNullable(records).orElse(new LinkedList<>()).stream().forEach(point -> { - TeamSeq teamSeq = iTeamSeqService.getOne(new LambdaQueryWrapper().eq(TeamSeq::getPointId, point.getId())); - if (!ObjectUtils.isEmpty(teamSeq)) { - TeamSeqVo teamSeqVo = new TeamSeqVo(); - BeanUtils.copyProperties(teamSeq, teamSeqVo); - BeanUtils.copyProperties(teamSeqVo, point); - } - }); + return Result.OK(pageList); } /** * 教务处 显示所有 - * * @param annualCompPoint * @param pageNo * @param pageSize @@ -208,9 +198,9 @@ public class AnnualCompPointController extends JeecgController> listAdmin(AnnualCompPoint annualCompPoint, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = annualCompPointService.page(page, queryWrapper); @@ -220,7 +210,6 @@ public class AnnualCompPointController extends JeecgController> listdsh(AnnualCompPoint annualCompPoint, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); - queryWrapper.eq("annual_comp_state", "1"); + queryWrapper.eq("annual_comp_state","1"); Page page = new Page(pageNo, pageSize); IPage pageList = annualCompPointService.page(page, queryWrapper); @@ -242,7 +231,6 @@ public class AnnualCompPointController extends JeecgController> listysh(AnnualCompPoint annualCompPoint, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); - queryWrapper.eq("annual_comp_state", "2"); + queryWrapper.eq("annual_comp_state","2"); Page page = new Page(pageNo, pageSize); IPage pageList = annualCompPointService.page(page, queryWrapper); @@ -264,8 +252,8 @@ public class AnnualCompPointController extends JeecgController> listdbh(AnnualCompPoint annualCompPoint, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); - queryWrapper.eq("annual_comp_state", "3"); + queryWrapper.eq("annual_comp_state","3"); Page page = new Page(pageNo, pageSize); IPage pageList = annualCompPointService.page(page, queryWrapper); @@ -288,7 +276,6 @@ public class AnnualCompPointController extends JeecgController> listZJ(AnnualCompPoint annualCompPoint, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); // 获取当前登录用户 Subject subject = SecurityUtils.getSubject(); @@ -307,7 +294,8 @@ public class AnnualCompPointController extends JeecgController exqueryWrapper = new QueryWrapper<>(); exqueryWrapper.eq("user_id", loginUser.getId()); Expert expert = expertService.getOne(exqueryWrapper); - if (expert == null) { + if(expert==null) + { return Result.OK(null); } //开始获取exp-comp @@ -315,43 +303,46 @@ public class AnnualCompPointController extends JeecgController compExpList = compExpService.list(coexqueryWrapper); List compIdListss = new ArrayList<>(); - List compList = new ArrayList<>(); - if (compExpList.size() > 0) { + List compList =new ArrayList<>(); + if(compExpList.size()>0) + { for (CompExp compExps : compExpList) { compIdListss.add(compExps.getCompid()); } QueryWrapper coqueryWrapper = new QueryWrapper<>(); - coqueryWrapper.in("id", compIdListss); + coqueryWrapper.in("id",compIdListss); compList = compService.list(coqueryWrapper); } - List annualCompList = new ArrayList<>(); - if (compList.size() > 0) { + List annualCompList=new ArrayList<>(); + if(compList.size()>0) + { List needlist = new ArrayList<>(); - for (Comp comp : compList) { + for (Comp comp : compList){ needlist.add(comp.getId()); } QueryWrapper anncoqueryWrapper = new QueryWrapper<>(); - anncoqueryWrapper.in("compid", needlist); + anncoqueryWrapper.in("compid",needlist); annualCompList = annualCompService.list(anncoqueryWrapper); } List stringList = new ArrayList<>(); - if (annualCompList.size() > 0) { - for (AnnualComp annualComp : annualCompList) { + if(annualCompList.size()>0) + { + for (AnnualComp annualComp : annualCompList){ stringList.add(annualComp.getId()); } - queryWrapper.in("annual_comp_id", stringList); + queryWrapper.in("annual_comp_id",stringList); Page page = new Page(pageNo, pageSize); IPage pageList = annualCompPointService.page(page, queryWrapper); return Result.OK(pageList); - } else { + }else + { return Result.OK(null); } } /** * 学生端列表 - * * @param annualCompPoint * @param pageNo * @param pageSize @@ -360,14 +351,14 @@ public class AnnualCompPointController extends JeecgController> listStudent(AnnualCompPoint annualCompPoint, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); // 这里状态是字符串，比较按照ascii值，如果状态数大于9，这里要改 - queryWrapper.ge("annual_comp_state", '5').or().eq("annual_comp_state", '2'); + queryWrapper.ge("annual_comp_state",'5').or().eq("annual_comp_state",'2'); // 比赛项目必须打开 - queryWrapper.eq("annual_comp_switch", "Y"); + queryWrapper.eq("annual_comp_switch","Y"); Page page = new Page(pageNo, pageSize); IPage pageList = annualCompPointService.page(page, queryWrapper); @@ -400,11 +391,9 @@ public class AnnualCompPointController extends JeecgController edit(@RequestBody AnnualCompPoint annualCompPoint) { - boolean isUpdate; - if (annualCompPoint.getAnnualCompState().equals("0") || annualCompPoint.getAnnualCompState().equals("4")) { + boolean isUpdate ; + if(annualCompPoint.getAnnualCompState().equals("0") && annualCompPoint.getAnnualCompState().equals("4") ){ isUpdate = annualCompPointService.updateById(annualCompPoint); - //更新团队赛队员积分计算配置 add by zhc 8.22 - iTeamSeqService.saveOrUpdate4TeamSeq(annualCompPoint); } else { return Result.error("当前状态不可修改"); } @@ -426,10 +415,11 @@ public class AnnualCompPointController extends JeecgController edit1(@RequestBody AnnualCompPoint annualCompPoint) { - boolean isUpdate = annualCompPointService.updateById(annualCompPoint); + boolean isUpdate = annualCompPointService.updateById(annualCompPoint); - if (!isUpdate) { + + if (!isUpdate){ return Result.error("编辑失败!"); } else { return Result.OK("编辑成功!"); @@ -447,16 +437,15 @@ public class AnnualCompPointController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { - AnnualCompPoint annualCompPoint = annualCompPointService.getById(id); - if (annualCompPoint.getAnnualCompState().equals("0") && annualCompPoint.getAnnualCompState().equals("4")) { + AnnualCompPoint annualCompPoint =annualCompPointService.getById(id); + if(annualCompPoint.getAnnualCompState().equals("0") && annualCompPoint.getAnnualCompState().equals("4") ) { System.out.println(id); annualCompPointService.removeById(id); - } else { + }else { return Result.error("当前状态不可删除"); } return Result.OK("删除成功!"); } - /** * 成绩汇总数据生成 * @@ -467,35 +456,35 @@ public class AnnualCompPointController extends JeecgController cjhz(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) { + public Result cjhz(@RequestParam(name = "id", required = true) String id,HttpServletRequest req) { AnnualCompPoint annualCompPoint = annualCompPointService.getById(id); QueryWrapper queryWrappersc = new QueryWrapper<>(); - queryWrappersc.eq("annual_compid", annualCompPoint.getAnnualCompId()); - queryWrappersc.eq("annual_comp_p", annualCompPoint.getId()); + queryWrappersc.eq("annual_compid",annualCompPoint.getAnnualCompId()); + queryWrappersc.eq("annual_comp_p",annualCompPoint.getId()); List listsc = scorePersionService.list(queryWrappersc); - if (listsc.size() > 0) { - for (int k = 0; k < listsc.size(); k++) { + if(listsc.size()>0){ + for (int k = 0 ; k < listsc.size() ; k++){ scorePersionService.removeById(listsc.get(k).getId()); } } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("bmcode,SUM(score) as score"); - queryWrapper.eq("ann_com_p", id); - queryWrapper.eq("ispf", "1"); + queryWrapper.eq("ann_com_p",id); + queryWrapper.eq("ispf","1"); queryWrapper.groupBy("bmcode"); List list = expScoreService.list(queryWrapper); - for (int i = 0; i < list.size(); i++) { + for (int i = 0 ; i < list.size() ; i++){ AnnComGroTopP annComGroTopP = new AnnComGroTopP(); QueryWrapper queryWrapperagt = QueryGenerator.initQueryWrapper(annComGroTopP, req.getParameterMap()); - queryWrapperagt.eq("bmcode", list.get(i).getBmcode()); + queryWrapperagt.eq("bmcode",list.get(i).getBmcode()); int score = list.get(i).getScore(); int ypzj = annComGroTopPService.list(queryWrapperagt).get(0).getYpzj(); - double df = (double) score / ypzj; + double df = (double)score/ypzj; DecimalFormat decimalFormat = new DecimalFormat("0.00"); String dfstr = decimalFormat.format(df); ScorePersion scorePersion = new ScorePersion(); QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.eq("bmcode", list.get(i).getBmcode()); + queryWrapper1.eq("bmcode",list.get(i).getBmcode()); List list1 = expScoreService.list(queryWrapper1); scorePersion.setAnnualid(list1.get(0).getAnnid()); scorePersion.setAnnualCompid(list1.get(0).getAnnalComp()); @@ -505,21 +494,21 @@ public class AnnualCompPointController extends JeecgController queryWrappersp = new QueryWrapper<>(); - queryWrappersp.eq("annualid", annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); - queryWrappersp.eq("annual_compid", annualCompPoint.getAnnualCompId()); - queryWrappersp.eq("annual_comp_p", id); + queryWrappersp.eq("annualid",annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); + queryWrappersp.eq("annual_compid",annualCompPoint.getAnnualCompId()); + queryWrappersp.eq("annual_comp_p",id); queryWrappersp.orderByDesc("score+0"); List listsp = scorePersionService.list(queryWrappersp); - for (int k = 0; k < listsp.size(); k++) { - if (k == 0) { + for (int k = 0 ; k < listsp.size() ;k++){ + if(k==0){ listsp.get(k).setSort(1); scorePersionService.updateById(listsp.get(k)); - } else { - if (listsp.get(k - 1).getScore().equals(listsp.get(k).getScore())) { - listsp.get(k).setSort(listsp.get(k - 1).getSort()); + }else{ + if(listsp.get(k-1).getScore().equals(listsp.get(k).getScore())){ + listsp.get(k).setSort(listsp.get(k-1).getSort()); scorePersionService.updateById(listsp.get(k)); - } else { - listsp.get(k).setSort(k + 1); + }else { + listsp.get(k).setSort(k+1); scorePersionService.updateById(listsp.get(k)); } } @@ -527,12 +516,12 @@ public class AnnualCompPointController extends JeecgController queryWrapperup = new QueryWrapper<>(); - queryWrapperup.eq("apply_code", list.get(b).getBmcode()); + queryWrapperup.eq("apply_code",list.get(b).getBmcode()); List listup = upfilePersionService.list(queryWrapperup); - if (listup.size() > 0) { + if(listup.size()>0){ up = listup.get(0); up.setStatus(1); upfilePersionService.updateById(up); @@ -540,7 +529,6 @@ public class AnnualCompPointController extends JeecgController cjcxhq(@RequestBody ScorePersion scorePersiontem, HttpServletRequest req) { + public Result cjcxhq(@RequestBody ScorePersion scorePersiontem,HttpServletRequest req) { ScorePersion scorePersionsc = new ScorePersion(); QueryWrapper queryWrappersc = QueryGenerator.initQueryWrapper(scorePersionsc, req.getParameterMap()); - queryWrappersc.eq("annualid", scorePersiontem.getAnnualid()); - queryWrappersc.eq("annual_compid", scorePersiontem.getAnnualCompid()); - queryWrappersc.eq("annual_comp_p", scorePersiontem.getAnnualCompP()); + queryWrappersc.eq("annualid",scorePersiontem.getAnnualid()); + queryWrappersc.eq("annual_compid",scorePersiontem.getAnnualCompid()); + queryWrappersc.eq("annual_comp_p",scorePersiontem.getAnnualCompP()); List listsc = scorePersionService.list(queryWrappersc); - if (listsc.size() > 0) { - for (int k = 0; k < listsc.size(); k++) { + if(listsc.size()>0){ + for (int k = 0 ; k < listsc.size() ; k++){ scorePersionService.removeById(listsc.get(k).getId()); } } AnnualCompPoint annualCompPoint = annualCompPointService.getById(scorePersiontem.getAnnualCompP()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("bmcode,SUM(score) as score"); - queryWrapper.eq("ann_com_p", scorePersiontem.getAnnualCompP()); - queryWrapper.eq("ispf", "1"); + queryWrapper.eq("ann_com_p",scorePersiontem.getAnnualCompP()); + queryWrapper.eq("ispf","1"); queryWrapper.groupBy("bmcode"); List list = expScoreService.list(queryWrapper); - for (int i = 0; i < list.size(); i++) { + for (int i = 0 ; i < list.size() ; i++){ AnnComGroTopP annComGroTopP = new AnnComGroTopP(); QueryWrapper queryWrapperagt = QueryGenerator.initQueryWrapper(annComGroTopP, req.getParameterMap()); - queryWrapperagt.eq("bmcode", list.get(i).getBmcode()); + queryWrapperagt.eq("bmcode",list.get(i).getBmcode()); int score = list.get(i).getScore(); int ypzj = annComGroTopPService.list(queryWrapperagt).get(0).getYpzj(); - double df = (double) score / ypzj; + double df = (double)score/ypzj; DecimalFormat decimalFormat = new DecimalFormat("0.00"); String dfstr = decimalFormat.format(df); ScorePersion scorePersion = new ScorePersion(); QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.eq("bmcode", list.get(i).getBmcode()); + queryWrapper1.eq("bmcode",list.get(i).getBmcode()); List list1 = expScoreService.list(queryWrapper1); scorePersion.setAnnualid(list1.get(0).getAnnid()); scorePersion.setAnnualCompid(list1.get(0).getAnnalComp()); @@ -590,21 +578,21 @@ public class AnnualCompPointController extends JeecgController queryWrappersp = new QueryWrapper<>(); - queryWrappersp.eq("annualid", annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); - queryWrappersp.eq("annual_compid", annualCompPoint.getAnnualCompId()); - queryWrappersp.eq("annual_comp_p", scorePersiontem.getAnnualCompP()); + queryWrappersp.eq("annualid",annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); + queryWrappersp.eq("annual_compid",annualCompPoint.getAnnualCompId()); + queryWrappersp.eq("annual_comp_p",scorePersiontem.getAnnualCompP()); queryWrappersp.orderByDesc("score+0"); List listsp = scorePersionService.list(queryWrappersp); - for (int k = 0; k < listsp.size(); k++) { - if (k == 0) { + for (int k = 0 ; k < listsp.size() ;k++){ + if(k==0){ listsp.get(k).setSort(1); scorePersionService.updateById(listsp.get(k)); - } else { - if (listsp.get(k - 1).getScore().equals(listsp.get(k).getScore())) { - listsp.get(k).setSort(listsp.get(k - 1).getSort()); + }else{ + if(listsp.get(k-1).getScore().equals(listsp.get(k).getScore())){ + listsp.get(k).setSort(listsp.get(k-1).getSort()); scorePersionService.updateById(listsp.get(k)); - } else { - listsp.get(k).setSort(k + 1); + }else { + listsp.get(k).setSort(k+1); scorePersionService.updateById(listsp.get(k)); } } @@ -612,12 +600,12 @@ public class AnnualCompPointController extends JeecgController queryWrapperup = new QueryWrapper<>(); - queryWrapperup.eq("apply_code", list.get(b).getBmcode()); + queryWrapperup.eq("apply_code",list.get(b).getBmcode()); List listup = upfilePersionService.list(queryWrapperup); - if (listup.size() > 0) { + if(listup.size()>0){ up = listup.get(0); up.setStatus(1); upfilePersionService.updateById(up); @@ -634,24 +622,24 @@ public class AnnualCompPointController extends JeecgController tffp(@RequestBody ScorePersion scorePersiontem, HttpServletRequest req) { + public Result tffp(@RequestBody ScorePersion scorePersiontem,HttpServletRequest req) { ScorePersion scorePersionsc = new ScorePersion(); QueryWrapper queryWrappersc = QueryGenerator.initQueryWrapper(scorePersionsc, req.getParameterMap()); - queryWrappersc.eq("annualid", scorePersiontem.getAnnualid()); - queryWrappersc.eq("annual_compid", scorePersiontem.getAnnualCompid()); - queryWrappersc.eq("annual_comp_p", scorePersiontem.getAnnualCompP()); - queryWrappersc.inSql("score", "SELECT score FROM score_persion GROUP BY score HAVING COUNT( score ) > 1"); + queryWrappersc.eq("annualid",scorePersiontem.getAnnualid()); + queryWrappersc.eq("annual_compid",scorePersiontem.getAnnualCompid()); + queryWrappersc.eq("annual_comp_p",scorePersiontem.getAnnualCompP()); + queryWrappersc.inSql("score","SELECT score FROM score_persion GROUP BY score HAVING COUNT( score ) > 1"); List listsc = scorePersionService.list(queryWrappersc); - if (listsc.size() > 0) { - for (int i = 0; i < listsc.size(); i++) { + if(listsc.size()>0){ + for (int i = 0 ; i < listsc.size(); i++){ ExpScore expScore = new ExpScore(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(expScore, req.getParameterMap()); - queryWrapper.eq("annid", listsc.get(i).getAnnualid()); - queryWrapper.eq("annal_comp", listsc.get(i).getAnnualCompid()); - queryWrapper.eq("ann_com_p", listsc.get(i).getAnnualCompP()); - queryWrapper.eq("bmcode", listsc.get(i).getEnrollCode()); + queryWrapper.eq("annid",listsc.get(i).getAnnualid()); + queryWrapper.eq("annal_comp",listsc.get(i).getAnnualCompid()); + queryWrapper.eq("ann_com_p",listsc.get(i).getAnnualCompP()); + queryWrapper.eq("bmcode",listsc.get(i).getEnrollCode()); List list = expScoreService.list(queryWrapper); ExpScore expScore1 = list.get(0); expScore1.setIspf("0"); @@ -673,154 +661,154 @@ public class AnnualCompPointController extends JeecgController pj(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) { + public Result pj(@RequestParam(name = "id", required = true) String id,HttpServletRequest req) { AnnualCompPoint annualCompPoint = annualCompPointService.getById(id); AnnualCompAward annualCompAward = new AnnualCompAward(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompAward, req.getParameterMap()); - queryWrapper.eq("annucompid", id); + queryWrapper.eq("annucompid",id); List list = annualCompAwardService.list(queryWrapper); - if (list.size() == 0) { + if(list.size()==0){ return Result.error("未设置年度比赛奖项!"); } QueryWrapper queryWrapperap = new QueryWrapper<>(); - queryWrapperap.eq("annal_comp", annualCompPoint.getAnnualCompId()); - queryWrapperap.eq("annual_comp_p", annualCompPoint.getId()); + queryWrapperap.eq("annal_comp",annualCompPoint.getAnnualCompId()); + queryWrapperap.eq("annual_comp_p",annualCompPoint.getId()); List listap = awardPersionService.list(queryWrapperap); - if (listap.size() > 0) { - for (int k = 0; k < listap.size(); k++) { + if(listap.size()>0){ + for (int k = 0 ; k < listap.size() ; k++){ awardPersionService.removeById(listap.get(k).getId()); } } QueryWrapper queryWrappersp = new QueryWrapper<>(); - queryWrappersp.eq("annualid", annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); - queryWrappersp.eq("annual_compid", annualCompPoint.getAnnualCompId()); - queryWrappersp.eq("annual_comp_p", id); + queryWrappersp.eq("annualid",annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); + queryWrappersp.eq("annual_compid",annualCompPoint.getAnnualCompId()); + queryWrappersp.eq("annual_comp_p",id); queryWrappersp.orderByAsc("sort"); List 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(); - String num1 = list.get(i).getFirstNum(); - for (int j = 0; j < Integer.valueOf(num1); j++) { - AwardPersion awardPersion = new AwardPersion(); - awardPersion.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion.setAwardname(name1); - awardPersion.setAwardsort(1); - awardPersion.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion); - } + for (int i = 0 ; i queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion.setStudentname(sysUser.getRealname()); + awardPersion.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion); } - if (list.get(i).getIsSecondPrize().equals("Y")) { - String name2 = list.get(i).getSecondPrize(); - String num1 = list.get(i).getFirstNum(); - String num2 = list.get(i).getSecondNum(); - for (int j = Integer.valueOf(num1); j < (Integer.valueOf(num1) + Integer.valueOf(num2)); j++) { - AwardPersion awardPersion = new AwardPersion(); - awardPersion.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion.setAwardname(name2); - awardPersion.setAwardsort(2); - awardPersion.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion); - } + } + if(list.get(i).getIsSecondPrize().equals("Y")){ + String name2 = list.get(i).getSecondPrize(); + String num1 = list.get(i).getFirstNum(); + String num2 = list.get(i).getSecondNum(); + for(int j = Integer.valueOf(num1) ; j < (Integer.valueOf(num1)+Integer.valueOf(num2));j++){ + AwardPersion awardPersion = new AwardPersion(); + awardPersion.setAnnualid(listsp.get(j).getAnnualid()); + awardPersion.setAnnalComp(listsp.get(j).getAnnualCompid()); + awardPersion.setAnnualCompP(listsp.get(j).getAnnualCompP()); + awardPersion.setEnrollCode(listsp.get(j).getEnrollCode()); + awardPersion.setAwardname(name2); + awardPersion.setAwardsort(2); + awardPersion.setAwardid(list.get(i).getId()); + TeamManagement teamManagement = new TeamManagement(); + QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion.setStudentname(sysUser.getRealname()); + awardPersion.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion); } - if (list.get(i).getIsThirdPrize().equals("Y")) { - String name3 = list.get(i).getThirdPrize(); - String num3 = list.get(i).getThirdNum(); - String num1 = list.get(i).getFirstNum(); - String num2 = list.get(i).getSecondNum(); - for (int j = (Integer.valueOf(num1) + Integer.valueOf(num2)); j < (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3)); j++) { - AwardPersion awardPersion = new AwardPersion(); - awardPersion.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion.setAwardname(name3); - awardPersion.setAwardsort(3); - awardPersion.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion); - } + } + if(list.get(i).getIsThirdPrize().equals("Y")){ + String name3 = list.get(i).getThirdPrize(); + String num3 = list.get(i).getThirdNum(); + String num1 = list.get(i).getFirstNum(); + String num2 = list.get(i).getSecondNum(); + for(int j = (Integer.valueOf(num1)+Integer.valueOf(num2)) ; j < (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3));j++){ + AwardPersion awardPersion = new AwardPersion(); + awardPersion.setAnnualid(listsp.get(j).getAnnualid()); + awardPersion.setAnnalComp(listsp.get(j).getAnnualCompid()); + awardPersion.setAnnualCompP(listsp.get(j).getAnnualCompP()); + awardPersion.setEnrollCode(listsp.get(j).getEnrollCode()); + awardPersion.setAwardname(name3); + awardPersion.setAwardsort(3); + awardPersion.setAwardid(list.get(i).getId()); + TeamManagement teamManagement = new TeamManagement(); + QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion.setStudentname(sysUser.getRealname()); + awardPersion.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion); } - if (list.get(i).getIsFourthPrize().equals("Y")) { - String name4 = list.get(i).getFourthPrize(); - String num4 = list.get(i).getFourthNum(); - String num3 = list.get(i).getThirdNum(); - String num1 = list.get(i).getFirstNum(); - String num2 = list.get(i).getSecondNum(); - for (int j = (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3)); j < (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3) + Integer.valueOf(num4)); j++) { - AwardPersion awardPersion = new AwardPersion(); - awardPersion.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion.setAwardname(name4); - awardPersion.setAwardsort(4); - awardPersion.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion); - } + } + if(list.get(i).getIsFourthPrize().equals("Y")){ + String name4 = list.get(i).getFourthPrize(); + String num4 = list.get(i).getFourthNum(); + String num3 = list.get(i).getThirdNum(); + String num1 = list.get(i).getFirstNum(); + String num2 = list.get(i).getSecondNum(); + for(int j = (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3)) ; j < (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3)+Integer.valueOf(num4));j++){ + AwardPersion awardPersion = new AwardPersion(); + awardPersion.setAnnualid(listsp.get(j).getAnnualid()); + awardPersion.setAnnalComp(listsp.get(j).getAnnualCompid()); + awardPersion.setAnnualCompP(listsp.get(j).getAnnualCompP()); + awardPersion.setEnrollCode(listsp.get(j).getEnrollCode()); + awardPersion.setAwardname(name4); + awardPersion.setAwardsort(4); + awardPersion.setAwardid(list.get(i).getId()); + TeamManagement teamManagement = new TeamManagement(); + QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion.setStudentname(sysUser.getRealname()); + awardPersion.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion); } - if (list.get(i).getIsFifthPrize().equals("Y")) { - String name5 = list.get(i).getFifthPrize(); - String num5 = list.get(i).getFifthNum(); - String num4 = list.get(i).getFourthNum(); - String num3 = list.get(i).getThirdNum(); - String num1 = list.get(i).getFirstNum(); - String num2 = list.get(i).getSecondNum(); - for (int j = (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3) + Integer.valueOf(num4)); j < (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3) + Integer.valueOf(num4) + Integer.valueOf(num5)); j++) { - AwardPersion awardPersion = new AwardPersion(); - awardPersion.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion.setAwardname(name5); - awardPersion.setAwardsort(5); - awardPersion.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion); - } + } + if(list.get(i).getIsFifthPrize().equals("Y")){ + String name5 = list.get(i).getFifthPrize(); + String num5 = list.get(i).getFifthNum(); + String num4 = list.get(i).getFourthNum(); + String num3 = list.get(i).getThirdNum(); + String num1 = list.get(i).getFirstNum(); + String num2 = list.get(i).getSecondNum(); + for(int j = (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3)+Integer.valueOf(num4)) ; j < (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3)+Integer.valueOf(num4)+Integer.valueOf(num5));j++){ + AwardPersion awardPersion = new AwardPersion(); + awardPersion.setAnnualid(listsp.get(j).getAnnualid()); + awardPersion.setAnnalComp(listsp.get(j).getAnnualCompid()); + awardPersion.setAnnualCompP(listsp.get(j).getAnnualCompP()); + awardPersion.setEnrollCode(listsp.get(j).getEnrollCode()); + awardPersion.setAwardname(name5); + awardPersion.setAwardsort(5); + awardPersion.setAwardid(list.get(i).getId()); + TeamManagement teamManagement = new TeamManagement(); + QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion.setStudentname(sysUser.getRealname()); + awardPersion.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion); } } - } catch (Exception e) { + } + }catch (Exception e){ return Result.error("参与评奖人数少于年度比赛奖项设置的数量"); } annualCompPoint.setIsPj(1); @@ -828,7 +816,6 @@ public class AnnualCompPointController extends JeecgController cxhq(@RequestBody AwardPersion awardPersion, HttpServletRequest req) { + public Result cxhq(@RequestBody AwardPersion awardPersion,HttpServletRequest req) { AnnualCompAward annualCompAward = new AnnualCompAward(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompAward, req.getParameterMap()); - queryWrapper.eq("annucompid", awardPersion.getAnnualCompP()); + queryWrapper.eq("annucompid",awardPersion.getAnnualCompP()); List list = annualCompAwardService.list(queryWrapper); - if (list.size() == 0) { + if(list.size()==0){ return Result.error("未设置年度比赛奖项!"); } AwardPersion awardPersionqw = new AwardPersion(); QueryWrapper queryWrapperap = QueryGenerator.initQueryWrapper(awardPersionqw, req.getParameterMap()); - queryWrapperap.eq("annualid", awardPersion.getAnnualid()); - queryWrapperap.eq("annal_comp", awardPersion.getAnnalComp()); - queryWrapperap.eq("annual_comp_p", awardPersion.getAnnualCompP()); + queryWrapperap.eq("annualid",awardPersion.getAnnualid()); + queryWrapperap.eq("annal_comp",awardPersion.getAnnalComp()); + queryWrapperap.eq("annual_comp_p",awardPersion.getAnnualCompP()); List listap = awardPersionService.list(queryWrapperap); - if (listap.size() > 0) { - for (int k = 0; k < listap.size(); k++) { + if(listap.size()>0){ + for (int k = 0 ; k < listap.size() ; k++){ awardPersionService.removeById(listap.get(k).getId()); } } AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardPersion.getAnnualCompP()); QueryWrapper queryWrappersp = new QueryWrapper<>(); - queryWrappersp.eq("annualid", annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); - queryWrappersp.eq("annual_compid", annualCompPoint.getAnnualCompId()); - queryWrappersp.eq("annual_comp_p", awardPersion.getAnnualCompP()); + queryWrappersp.eq("annualid",annualCompService.getById(annualCompPoint.getAnnualCompId()).getAnnualid()); + queryWrappersp.eq("annual_compid",annualCompPoint.getAnnualCompId()); + queryWrappersp.eq("annual_comp_p",awardPersion.getAnnualCompP()); queryWrappersp.orderByAsc("sort"); List 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(); - String num1 = list.get(i).getFirstNum(); - for (int j = 0; j < Integer.valueOf(num1); j++) { - if (j < listsp.size()) { - AwardPersion awardPersion1 = new AwardPersion(); - awardPersion1.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion1.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion1.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion1.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion1.setAwardname(name1); - awardPersion1.setAwardsort(1); - awardPersion1.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion1.setStudentname(sysUser.getRealname()); - awardPersion1.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion1); - } - + for (int i = 0 ; i queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion1); } + } - if (list.get(i).getIsSecondPrize().equals("Y")) { - String name2 = list.get(i).getSecondPrize(); - String num1 = list.get(i).getFirstNum(); - String num2 = list.get(i).getSecondNum(); - for (int j = Integer.valueOf(num1); j < (Integer.valueOf(num1) + Integer.valueOf(num2)); j++) { - if (j < listsp.size()) { - AwardPersion awardPersion1 = new AwardPersion(); - awardPersion1.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion1.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion1.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion1.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion1.setAwardname(name2); - awardPersion1.setAwardsort(2); - awardPersion1.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion1.setStudentname(sysUser.getRealname()); - awardPersion1.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion1); - } + } + if(list.get(i).getIsSecondPrize().equals("Y")){ + String name2 = list.get(i).getSecondPrize(); + String num1 = list.get(i).getFirstNum(); + String num2 = list.get(i).getSecondNum(); + for(int j = Integer.valueOf(num1) ; j < (Integer.valueOf(num1)+Integer.valueOf(num2));j++){ + if(j queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion1); } } - if (list.get(i).getIsThirdPrize().equals("Y")) { - String name3 = list.get(i).getThirdPrize(); - String num3 = list.get(i).getThirdNum(); - String num1 = list.get(i).getFirstNum(); - String num2 = list.get(i).getSecondNum(); - for (int j = (Integer.valueOf(num1) + Integer.valueOf(num2)); j < (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3)); j++) { - if (j < listsp.size()) { - AwardPersion awardPersion1 = new AwardPersion(); - awardPersion1.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion1.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion1.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion1.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion1.setAwardname(name3); - awardPersion1.setAwardsort(3); - awardPersion1.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion1.setStudentname(sysUser.getRealname()); - awardPersion1.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion1); - } + } + if(list.get(i).getIsThirdPrize().equals("Y")){ + String name3 = list.get(i).getThirdPrize(); + String num3 = list.get(i).getThirdNum(); + String num1 = list.get(i).getFirstNum(); + String num2 = list.get(i).getSecondNum(); + for(int j = (Integer.valueOf(num1)+Integer.valueOf(num2)) ; j < (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3));j++){ + if(j queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion1); } } - if (list.get(i).getIsFourthPrize().equals("Y")) { - String name4 = list.get(i).getFourthPrize(); - String num4 = list.get(i).getFourthNum(); - String num3 = list.get(i).getThirdNum(); - String num1 = list.get(i).getFirstNum(); - String num2 = list.get(i).getSecondNum(); - for (int j = (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3)); j < (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3) + Integer.valueOf(num4)); j++) { - if (j < listsp.size()) { - AwardPersion awardPersion1 = new AwardPersion(); - awardPersion1.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion1.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion1.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion1.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion1.setAwardname(name4); - awardPersion1.setAwardsort(4); - awardPersion1.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion1.setStudentname(sysUser.getRealname()); - awardPersion1.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion1); - } + } + if(list.get(i).getIsFourthPrize().equals("Y")){ + String name4 = list.get(i).getFourthPrize(); + String num4 = list.get(i).getFourthNum(); + String num3 = list.get(i).getThirdNum(); + String num1 = list.get(i).getFirstNum(); + String num2 = list.get(i).getSecondNum(); + for(int j = (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3)) ; j < (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3)+Integer.valueOf(num4));j++){ + if(j queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion1); } } - if (list.get(i).getIsFifthPrize().equals("Y")) { - String name5 = list.get(i).getFifthPrize(); - String num5 = list.get(i).getFifthNum(); - String num4 = list.get(i).getFourthNum(); - String num3 = list.get(i).getThirdNum(); - String num1 = list.get(i).getFirstNum(); - String num2 = list.get(i).getSecondNum(); - for (int j = (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3) + Integer.valueOf(num4)); j < (Integer.valueOf(num1) + Integer.valueOf(num2) + Integer.valueOf(num3) + Integer.valueOf(num4) + Integer.valueOf(num5)); j++) { - if (j < listsp.size()) { - AwardPersion awardPersion1 = new AwardPersion(); - awardPersion1.setAnnualid(listsp.get(j).getAnnualid()); - awardPersion1.setAnnalComp(listsp.get(j).getAnnualCompid()); - awardPersion1.setAnnualCompP(listsp.get(j).getAnnualCompP()); - awardPersion1.setEnrollCode(listsp.get(j).getEnrollCode()); - awardPersion1.setAwardname(name5); - awardPersion1.setAwardsort(5); - awardPersion1.setAwardid(list.get(i).getId()); - TeamManagement teamManagement = new TeamManagement(); - QueryWrapper queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion1.setStudentname(sysUser.getRealname()); - awardPersion1.setStudentcode(sysUser.getWorkNo()); - awardPersionService.save(awardPersion1); - } + } + if(list.get(i).getIsFifthPrize().equals("Y")){ + String name5 = list.get(i).getFifthPrize(); + String num5 = list.get(i).getFifthNum(); + String num4 = list.get(i).getFourthNum(); + String num3 = list.get(i).getThirdNum(); + String num1 = list.get(i).getFirstNum(); + String num2 = list.get(i).getSecondNum(); + for(int j = (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3)+Integer.valueOf(num4)) ; j < (Integer.valueOf(num1)+Integer.valueOf(num2)+Integer.valueOf(num3)+Integer.valueOf(num4)+Integer.valueOf(num5));j++){ + if(j queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getWorkNo()); + awardPersionService.save(awardPersion1); } } } - } catch (Exception e) { - return Result.error("参与评奖人数少于年度比赛奖项设置的数量"); } + }catch (Exception e){ + return Result.error("参与评奖人数少于年度比赛奖项设置的数量"); + } annualCompPoint.setIsPj(1); annualCompPointService.updateById(annualCompPoint); @@ -1045,7 +1032,7 @@ public class AnnualCompPointController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response, @RequestParam(name = "ndbsxmid", required = true) String ndbsxmid) { + public Result importExcel(HttpServletRequest request, HttpServletResponse response,@RequestParam(name = "ndbsxmid", required = true) String ndbsxmid) { //获取年度比赛项目 AnnualCompPoint annualCompPointss = annualCompPointService.getById(ndbsxmid); //获取队伍的人数 - int teamnumber = annualCompPointss.getTeacherNumber(); + int teamnumber =annualCompPointss.getTeacherNumber(); //获取教师熟练 int teachernumber = annualCompPointss.getTeacherNumber(); MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; @@ -1102,7 +1090,7 @@ public class AnnualCompPointController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), AnnualCompPointMb.class, params); for (int i = 0; i < list.size(); i++) { QueryWrapper qw = new QueryWrapper<>(); @@ -1114,7 +1102,7 @@ public class AnnualCompPointController extends JeecgController teachernumber) { + if(itemsArray.length>teachernumber){ return Result.error("文件导入失败:第" + (i + 1) + "老师个数信息有误"); } } @@ -1163,14 +1151,14 @@ public class AnnualCompPointController extends JeecgController teacherZysList = Arrays.asList(teacherZys); List teacherYjfxlist = Arrays.asList(teacherYjfxs); List teacherPhonelist = Arrays.asList(teacherPhone); - for (int c = 0; c < teachernumber; c++) { + for (int c =0;c list = ExcelImportUtil.importExcel(file.getInputStream(), AnnualCompPointMb.class, params); for (int i = 0; i < list.size(); i++) { QueryWrapper qw = new QueryWrapper<>(); @@ -1200,7 +1188,7 @@ public class AnnualCompPointController extends JeecgController teachernumber) { + if(itemsArray.length>teachernumber){ return Result.error("文件导入失败:第" + (i + 1) + "老师个数信息有误"); } } @@ -1220,18 +1208,18 @@ public class AnnualCompPointController extends JeecgController teamnamelist = Arrays.asList(teaname); + List teamnamelist =Arrays.asList(teaname); //将学生的学号放入list String[] teamworkno = list.get(k).getStudentcode().split("%"); - List teamworknolist = Arrays.asList(teamworkno); - for (int a = 0; a < teamnumber; a++) { + List teamworknolist =Arrays.asList(teamworkno); + for(int a =0;a qw1 = new QueryWrapper<>(); - qw1.eq("work_no", teamworknolist.get(a)); + qw1.eq("work_no",teamworknolist.get(a)); List listsys1 = sysUserService.list(qw1); tm.setUserId(listsys1.get(a).getId()); - if (a == 0) { + if (a==0) { tm.setCaptain("1"); } teamManagementService.save(tm); @@ -1259,14 +1247,14 @@ public class AnnualCompPointController extends JeecgController teacherZysList = Arrays.asList(teacherZys); List teacherYjfxlist = Arrays.asList(teacherYjfxs); List teacherPhonelist = Arrays.asList(teacherPhone); - for (int c = 0; c < teachernumber; c++) { + for (int c =0;c= 0) { + if(msg!=null && msg.indexOf("Duplicate entry")>=0){ return Result.error("文件导入失败:有重复数据！"); - } else { + }else{ return Result.error("文件导入失败:" + e.getMessage()); } } finally { @@ -1307,14 +1295,12 @@ public class AnnualCompPointController extends JeecgController list = annualCompetitionProjectRegistrationService.query().eq("enroll_code", enrollCode).list(); if (list == null || list.size() == 0) @@ -1352,34 +1338,34 @@ public class AnnualCompPointController extends JeecgController tongfenfuping(@RequestParam(name = "id", required = true) String id) { - String iscf = annualCompPointService.tongfenfupingiscf(id); - if (iscf.equals("0")) { - return Result.error("没有发现同分现象"); - } else { - AnnualCompPoint annualCompPoint = annualCompPointService.getById(id); - AnnualComp annualComp = annualCompService.getById(annualCompPoint.getAnnualCompId()); - TongfenComp tongfenComp = new TongfenComp(); - tongfenComp.setComp(annualComp.getCompid()); - tongfenComp.setAnnualid(annualComp.getAnnualid()); - tongfenComp.setComppoint(id); - tongfenCompService.save(tongfenComp); - //获取重复的成绩 - List scorePersionList = tongfenCompinfoService.getscorePersionList(id); - for (int i = 0; i < scorePersionList.size(); i++) { - TongfenCompinfo tongfenCompinfo = new TongfenCompinfo(); - tongfenCompinfo.setScore(scorePersionList.get(i).getScore()); - tongfenCompinfo.setAnncomppid(id); - if (scorePersionList.get(i).getEnrollCode().substring(5, 7).equals("GR")) { - tongfenCompinfo.setIstd("个人"); - } else { - tongfenCompinfo.setIstd("团队"); - } - tongfenCompinfo.setCcode(scorePersionList.get(i).getEnrollCode()); - tongfenCompinfo.setZpfile(tongfenCompinfoService.geturl(scorePersionList.get(i).getEnrollCode())); - tongfenCompinfoService.save(tongfenCompinfo); - } - return Result.OK("已经完成数据统计"); - } + String iscf = annualCompPointService.tongfenfupingiscf(id); + if (iscf.equals("0")){ + return Result.error("没有发现同分现象"); + }else{ + AnnualCompPoint annualCompPoint = annualCompPointService.getById(id); + AnnualComp annualComp = annualCompService.getById(annualCompPoint.getAnnualCompId()); + TongfenComp tongfenComp = new TongfenComp(); + tongfenComp.setComp(annualComp.getCompid()); + tongfenComp.setAnnualid(annualComp.getAnnualid()); + tongfenComp.setComppoint(id); + tongfenCompService.save(tongfenComp); + //获取重复的成绩 + List scorePersionList =tongfenCompinfoService.getscorePersionList(id); + for (int i = 0; i < scorePersionList.size(); i++) { + TongfenCompinfo tongfenCompinfo= new TongfenCompinfo(); + tongfenCompinfo.setScore(scorePersionList.get(i).getScore()); + tongfenCompinfo.setAnncomppid(id); + if (scorePersionList.get(i).getEnrollCode().substring(5, 7).equals("GR")){ + tongfenCompinfo.setIstd("个人"); + }else { + tongfenCompinfo.setIstd("团队"); + } + tongfenCompinfo.setCcode(scorePersionList.get(i).getEnrollCode()); + tongfenCompinfo.setZpfile(tongfenCompinfoService.geturl(scorePersionList.get(i).getEnrollCode())); + tongfenCompinfoService.save(tongfenCompinfo); + } + return Result.OK("已经完成数据统计"); + } } @@ -1390,149 +1376,149 @@ public class AnnualCompPointController extends JeecgController zjsybsjs(HttpServletRequest req, @RequestParam(name = "recreateFlag") boolean recreateFlag) { + public Result zjsybsjs( HttpServletRequest req,@RequestParam(name = "recreateFlag") boolean recreateFlag) { final String ZJSYBSJS = "zjsybsjs"; Map map = new HashMap<>(); if (recreateFlag) { - //获取当前登录用户 - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - - QueryWrapper exqueryWrapper = new QueryWrapper<>(); - exqueryWrapper.eq("user_id", user.getId()); - Expert expert = expertService.getOne(exqueryWrapper); - if (expert != null) { - QueryWrapper coexqueryWrapper = new QueryWrapper<>(); - coexqueryWrapper.eq("expid", expert.getId()); - List compExpList = compExpService.list(coexqueryWrapper); - if (compExpList.size() > 0) { - List compids = compExpList.stream().map(CompExp::getCompid).collect(Collectors.toList()); - QueryWrapper anncoqueryWrapper = new QueryWrapper<>(); - anncoqueryWrapper.in("compid", compids); - List annualCompList = annualCompService.list(anncoqueryWrapper); - List> jxzListMap = new ArrayList<>(); - List> lsListMap = new ArrayList<>(); - if (annualCompList.size() > 0) { - List ndbsids = annualCompList.stream().map(AnnualComp::getId).collect(Collectors.toList()); - //进行中年度比赛项目 - AnnualCompPoint annualCompPoint = new AnnualCompPoint(); - QueryWrapper queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); - queryWrapperacp.in("annual_comp_id", ndbsids); - queryWrapperacp.le("starttime", new Date()); - queryWrapperacp.ge("endtime", new Date()); - List listacp = annualCompPointService.list(queryWrapperacp); - map.put("jxzndbsxmNumber", listacp.size()); - if (listacp.size() > 6) { - for (int p = 0; p < 6; p++) { - Map mapall1 = new HashMap<>(); - mapall1.put("xh", p + 1); - mapall1.put("ndbs", annualCompService.getById(listacp.get(p).getAnnualCompId()).getName()); - mapall1.put("ndbsxm", listacp.get(p).getObjName()); - jxzListMap.add(mapall1); - } - } else { - for (int o = 0; o < listacp.size(); o++) { - Map mapall2 = new HashMap<>(); - mapall2.put("xh", o + 1); - mapall2.put("ndbs", annualCompService.getById(listacp.get(o).getAnnualCompId()).getName()); - mapall2.put("ndbsxm", listacp.get(o).getObjName()); - jxzListMap.add(mapall2); - } + //获取当前登录用户 + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + QueryWrapper exqueryWrapper = new QueryWrapper<>(); + exqueryWrapper.eq("user_id", user.getId()); + Expert expert = expertService.getOne(exqueryWrapper); + if(expert!=null){ + QueryWrapper coexqueryWrapper = new QueryWrapper<>(); + coexqueryWrapper.eq("expid", expert.getId()); + List compExpList = compExpService.list(coexqueryWrapper); + if(compExpList.size()>0){ + List compids = compExpList.stream().map(CompExp::getCompid).collect(Collectors.toList()); + QueryWrapper anncoqueryWrapper = new QueryWrapper<>(); + anncoqueryWrapper.in("compid",compids); + List annualCompList = annualCompService.list(anncoqueryWrapper); + List> jxzListMap = new ArrayList<>(); + List> lsListMap = new ArrayList<>(); + if(annualCompList.size()>0){ + List ndbsids = annualCompList.stream().map(AnnualComp::getId).collect(Collectors.toList()); + //进行中年度比赛项目 + AnnualCompPoint annualCompPoint = new AnnualCompPoint(); + QueryWrapper queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); + queryWrapperacp.in("annual_comp_id",ndbsids); + queryWrapperacp.le("starttime",new Date()); + queryWrapperacp.ge("endtime",new Date()); + List listacp = annualCompPointService.list(queryWrapperacp); + map.put("jxzndbsxmNumber",listacp.size()); + if(listacp.size()>6){ + for (int p = 0 ; p < 6 ; p++){ + Map mapall1 = new HashMap<>(); + mapall1.put("xh",p+1); + mapall1.put("ndbs",annualCompService.getById(listacp.get(p).getAnnualCompId()).getName()); + mapall1.put("ndbsxm",listacp.get(p).getObjName()); + jxzListMap.add(mapall1); } - map.put("jxzndbsxmList", jxzListMap); - - //历史年度比赛项目 - QueryWrapper queryWrapperacpls = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); - queryWrapperacpls.in("annual_comp_id", ndbsids); - queryWrapperacpls.lt("endtime", new Date()); - List listacpls = annualCompPointService.list(queryWrapperacpls); - map.put("lsndbsxmNumber", listacpls.size()); - if (listacpls.size() > 6) { - for (int q = 0; q < 6; q++) { - Map mapall3 = new HashMap<>(); - mapall3.put("xh", q + 1); - mapall3.put("ndbs", annualCompService.getById(listacpls.get(q).getAnnualCompId()).getName()); - mapall3.put("ndbsxm", listacpls.get(q).getObjName()); - lsListMap.add(mapall3); - } - } else { - for (int w = 0; w < listacpls.size(); w++) { - Map mapall4 = new HashMap<>(); - mapall4.put("xh", w + 1); - mapall4.put("ndbs", annualCompService.getById(listacpls.get(w).getAnnualCompId()).getName()); - mapall4.put("ndbsxm", listacpls.get(w).getObjName()); - lsListMap.add(mapall4); - } + }else{ + for (int o = 0 ; o < listacp.size() ; o++){ + Map mapall2 = new HashMap<>(); + mapall2.put("xh",o+1); + mapall2.put("ndbs",annualCompService.getById(listacp.get(o).getAnnualCompId()).getName()); + mapall2.put("ndbsxm",listacp.get(o).getObjName()); + jxzListMap.add(mapall2); } - map.put("lsndbsxmList", lsListMap); - //进行中 国 省 市 校 - 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("jxzndbsxmList",jxzListMap); + + //历史年度比赛项目 + QueryWrapper queryWrapperacpls = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); + queryWrapperacpls.in("annual_comp_id",ndbsids); + queryWrapperacpls.lt("endtime",new Date()); + List listacpls = annualCompPointService.list(queryWrapperacpls); + map.put("lsndbsxmNumber",listacpls.size()); + if(listacpls.size()>6){ + for (int q = 0 ; q < 6 ; q++){ + Map mapall3 = new HashMap<>(); + mapall3.put("xh",q+1); + mapall3.put("ndbs",annualCompService.getById(listacpls.get(q).getAnnualCompId()).getName()); + mapall3.put("ndbsxm",listacpls.get(q).getObjName()); + lsListMap.add(mapall3); } - map.put("gjj", gjj); - map.put("shengj", shengj); - map.put("shij", shij); - map.put("xj", xj); - //历史 国 省 市 校 - int gjjls = 0; - int shengjls = 0; - int shijls = 0; - int xjls = 0; - for (int k = 0; k < listacpls.size(); k++) { - if (listacpls.get(k).getObjLevel().equals("1809121223401168898")) { - //国家 - gjjls = gjjls + 1; - } - if (listacpls.get(k).getObjLevel().equals("1809121301201313793")) { - //省 - shengjls = shengjls + 1; - } - if (listacpls.get(k).getObjLevel().equals("1809121356582903809")) { - //市 - shijls = shijls + 1; - } - if (listacpls.get(k).getObjLevel().equals("1809121454654119937")) { - //校 - xjls = xjls + 1; - } + }else{ + for (int w = 0 ; w < listacpls.size() ; w++){ + Map mapall4 = new HashMap<>(); + mapall4.put("xh",w+1); + mapall4.put("ndbs",annualCompService.getById(listacpls.get(w).getAnnualCompId()).getName()); + mapall4.put("ndbsxm",listacpls.get(w).getObjName()); + lsListMap.add(mapall4); } - map.put("gjjls", gjjls); - map.put("shengjls", shengjls); - map.put("shijls", shijls); - map.put("xjls", xjls); - } - } + map.put("lsndbsxmList",lsListMap); + //进行中 国 省 市 校 + 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); + //历史 国 省 市 校 + int gjjls = 0; + int shengjls = 0; + int shijls = 0; + int xjls = 0; + for (int k = 0 ; k < listacpls.size() ; k++){ + if(listacpls.get(k).getObjLevel().equals("1809121223401168898")){ + //国家 + gjjls = gjjls+1; + } + if(listacpls.get(k).getObjLevel().equals("1809121301201313793")){ + //省 + shengjls = shengjls+1; + } + if(listacpls.get(k).getObjLevel().equals("1809121356582903809")){ + //市 + shijls = shijls+1; + } + if(listacpls.get(k).getObjLevel().equals("1809121454654119937")){ + //校 + xjls = xjls+1; + } + } + map.put("gjjls",gjjls); + map.put("shengjls",shengjls); + map.put("shijls",shijls); + map.put("xjls",xjls); + } } + + } redisUtil.set(ZJSYBSJS, map); - return Result.OK(map); - } else { + return Result.OK(map); + }else { boolean hasKey = redisUtil.hasKey(ZJSYBSJS); if (hasKey) { return Result.OK(redisUtil.get(ZJSYBSJS)); } else { - return this.zjsybsjs(req, true); + return this.zjsybsjs(req,true); } } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java index affc820f..45636d9b 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; @@ -14,15 +13,15 @@ import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; import org.jeecg.modules.demo.annualcomp.service.impl.AnnualCompServiceImpl; import org.jeecg.modules.demo.annualcompaward.entity.AnnualCompAward; import org.jeecg.modules.demo.annualcompaward.mapper.AnnualCompAwardMapper; +import org.jeecg.modules.demo.objLevel.entity.ObjLevel; import org.jeecg.modules.demo.objLevel.service.impl.ObjLevelServiceImpl; import org.jeecg.modules.demo.projectlevel.entity.Projectlevel; import org.jeecg.modules.demo.projectlevel.service.IProjectlevelService; -import org.jeecg.modules.demo.teamseq.entity.TeamSeq; -import org.jeecg.modules.demo.teamseq.service.ITeamSeqService; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + import javax.servlet.http.HttpServletRequest; import java.time.LocalDate; import java.util.List; @@ -55,9 +54,6 @@ public class AnnualCompPointServiceImpl extends ServiceImpl> pageList(AnnualCompPoint annualCompPoint, Integer pageNo, Integer pageSize, HttpServletRequest req) { List levelList = projectlevelService.list(); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/controller/TeamSeqController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/controller/TeamSeqController.java index 2dc5e340..d4188c8f 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/controller/TeamSeqController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/controller/TeamSeqController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.demo.teamseq.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -20,6 +21,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.List; /** * @Description: 团队赛队员积分计算配置 @@ -57,6 +59,12 @@ public class TeamSeqController extends JeecgController return Result.OK(pageList); } + @ApiOperation(value = "团队赛队员积分计算配置-分页列表查询", notes = "团队赛队员积分计算配置-分页列表查询") + @GetMapping(value = "/listByPointId") + public Result> queryPageList(String pointId) { + return Result.OK(teamSeqService.list(new LambdaQueryWrapper().eq(TeamSeq::getPointId,pointId))); + } + /** * 添加 * @@ -72,6 +80,15 @@ public class TeamSeqController extends JeecgController return Result.OK("添加成功！"); } + @AutoLog(value = "团队赛队员积分计算配置-添加") + @ApiOperation(value = "团队赛队员积分计算配置-添加", notes = "团队赛队员积分计算配置-添加") +// @RequiresPermissions("teamseq:team_seq:add") + @PostMapping(value = "/saveOrUpdate4TeamSeq") + public Result saveOrUpdate4TeamSeq(@RequestBody List seqList) { + teamSeqService.saveOrUpdate4TeamSeq(seqList); + return Result.OK("添加成功！"); + } + /** * 编辑 * diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/service/ITeamSeqService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/service/ITeamSeqService.java index 198d9427..bea209bb 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/service/ITeamSeqService.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/service/ITeamSeqService.java @@ -4,6 +4,8 @@ import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.teamseq.entity.TeamSeq; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @Description: 团队赛队员积分计算配置 * @Author: jeecg-boot @@ -12,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ITeamSeqService extends IService { - void saveOrUpdate4TeamSeq(AnnualCompPoint point); + void saveOrUpdate4TeamSeq(List list); } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/service/impl/TeamSeqServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/service/impl/TeamSeqServiceImpl.java index e76fa648..5bcd0ae5 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/service/impl/TeamSeqServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/teamseq/service/impl/TeamSeqServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.demo.teamseq.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.demo.teamseq.entity.TeamSeq; import org.jeecg.modules.demo.teamseq.mapper.TeamSeqMapper; import org.jeecg.modules.demo.teamseq.service.ITeamSeqService; @@ -9,25 +9,26 @@ import org.jeecg.modules.demo.teamseq.vo.TeamSeqVo; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 团队赛队员积分计算配置 * @Author: jeecg-boot - * @Date: 2024-08-22 + * @Date: 2024-08-22 * @Version: V1.0 */ @Service public class TeamSeqServiceImpl extends ServiceImpl implements ITeamSeqService { @Override - public void saveOrUpdate4TeamSeq(AnnualCompPoint point) { - this.remove(new LambdaQueryWrapper().eq(TeamSeq::getPointId,point.getId())); - TeamSeqVo vo = new TeamSeqVo(); - BeanUtils.copyProperties(point,vo); - vo.setPointId(point.getId()); - TeamSeq teamSeq = new TeamSeq(); - BeanUtils.copyProperties(vo,teamSeq); - this.save(teamSeq); + public void saveOrUpdate4TeamSeq(List list) { + String pointId = list.get(0).getPointId(); + this.remove(new LambdaQueryWrapper().eq(TeamSeq::getPointId, pointId)); +// TeamSeqVo vo = new TeamSeqVo(); +// BeanUtils.copyProperties(point, vo); +// vo.setPointId(point.getId()); +// TeamSeq teamSeq = new TeamSeq(); +// BeanUtils.copyProperties(vo, teamSeq); + this.saveBatch(list); } } diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue index 58a8e3bd..75f53436 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue @@ -44,9 +44,13 @@ - + - {{ item.name }} + {{ + item.name + }} + @@ -66,18 +70,21 @@ - + - - + @@ -101,79 +108,79 @@ - + --> @@ -186,7 +193,8 @@ - @@ -194,7 +202,8 @@ - @@ -212,7 +221,8 @@ - @@ -220,7 +230,8 @@ - @@ -229,7 +240,8 @@ - @@ -238,7 +250,8 @@ - @@ -246,16 +259,19 @@ - - @@ -270,7 +286,8 @@ - @@ -278,7 +295,8 @@ - @@ -299,16 +317,18 @@ - - - - - - - - + + + + + + + +