Merge remote-tracking branch 'origin/main'

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java

@@ -197,6 +197,15 @@ public class ChaoseTopicPersionController extends JeecgController<ChaoseTopicPer
     @GetMapping(value = "/bmbhadd")
     public Result<String> bmbhadd(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="xmtmid",required=true) String xmtmid,HttpServletRequest req) {
         String strs[] = ids.split(",");
+        for (int o = 0 ; o < strs.length ; o++){
+            UpfilePersion upfilePersion = upfilePersionService.getById(strs[o]);
+            QueryWrapper<ChaoseTopicPersion> queryWrapperctp1 = new QueryWrapper<>();
+            queryWrapperctp1.eq("bmcode",upfilePersion.getApplyCode());
+            List<ChaoseTopicPersion> listctp1 = chaoseTopicPersionService.list(queryWrapperctp1);
+            if(listctp1.size()==0){
+                return Result.error(upfilePersion.getTopicName()+"未选题，绑定失败！");
+            }
+        }
         AnnComGroTop annComGroTop = new AnnComGroTop();
         QueryWrapper<AnnComGroTop> queryWrapper = QueryGenerator.initQueryWrapper(annComGroTop, req.getParameterMap());
         queryWrapper.eq("ann_com_p_g",xmtmid);

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/controller/UserHomePageController.java

@@ -48,4 +48,11 @@ public class UserHomePageController {
         Map<String, Object> result = homePageService.report4School();
         return Result.ok(result);
     }
+
+    @ApiOperation(value = "河南机电-部门综合报告", notes = "河南机电-部门综合报告")
+    @GetMapping(value = "/report4Depart")
+    public Result report4Depart(String orgCode) {
+        Map<String, Object> result = homePageService.report4Depart(orgCode);
+        return Result.ok(result);
+    }
 }

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

@@ -392,12 +392,11 @@ public class UserHomePageServiceImpl implements UserHomePageService {
         } else {
             countMap.put("已完成比赛比率", 0);
         }
+        resultMap.putAll(countMap);
 
         List<PersonalAbilityEvaluationCollect> evaluationCollects = iPersonalAbilityEvaluationCollectService
-                .list(new LambdaQueryWrapper<PersonalAbilityEvaluationCollect>()
+                .list(new LambdaQueryWrapper<PersonalAbilityEvaluationCollect>());
-                        .orderByDesc(PersonalAbilityEvaluationCollect::getCreateTime)
+//        resultMap.put("前60名学生能力值", evaluationCollects);
-                        .last(" limit 60"));
-        resultMap.put("前60名学生能力值", evaluationCollects);
 
         List<PersonalAbilityEvaluationCollect> vos = new LinkedList<>();
         Map<String, List<PersonalAbilityEvaluationCollect>> capacityIdListMap = Optional.ofNullable(evaluationCollects).orElse(new LinkedList<>()).stream()
@@ -416,7 +415,7 @@ public class UserHomePageServiceImpl implements UserHomePageService {
             vo.setCapacityName(departAbilityEvaluationList.get(0).getCapacityName());
             vos.add(vo);
         });
-        resultMap.put("前60名学生能力平均值", vos);
+        resultMap.put("学生能力平均值", vos);
 
         List<Map<String, Object>> abilityList = new LinkedList<>();
         List<Integer> years = DateUtils.getLastxYear(2);
@@ -635,13 +634,12 @@ public class UserHomePageServiceImpl implements UserHomePageService {
         } else {
             countMap.put("已完成比赛比率", 0);
         }
+        resultMap.putAll(countMap);
 
         List<PersonalAbilityEvaluationCollect> evaluationCollects = iPersonalAbilityEvaluationCollectService
                 .list(new LambdaQueryWrapper<PersonalAbilityEvaluationCollect>()
-                        .eq(PersonalAbilityEvaluationCollect::getDepetId, departId)
+                        .eq(PersonalAbilityEvaluationCollect::getDepetId, departId));
-                        .orderByDesc(PersonalAbilityEvaluationCollect::getCreateTime)
+//        resultMap.put("学生综合能力值分析", evaluationCollects);
-                        .last(" limit 60"));
-        resultMap.put("前60名学生能力值", evaluationCollects);
 
         List<PersonalAbilityEvaluationCollect> vos = new LinkedList<>();
         Map<String, List<PersonalAbilityEvaluationCollect>> capacityIdListMap = Optional.ofNullable(evaluationCollects).orElse(new LinkedList<>()).stream()
@@ -660,7 +658,7 @@ public class UserHomePageServiceImpl implements UserHomePageService {
             vo.setCapacityName(departAbilityEvaluationList.get(0).getCapacityName());
             vos.add(vo);
         });
-        resultMap.put("前60名学生能力平均值", vos);
+        resultMap.put("学生能力平均值", vos);
 
         List<Map<String, Object>> abilityList = new LinkedList<>();
         List<Integer> years = DateUtils.getLastxYear(2);
@@ -852,22 +850,4 @@ public class UserHomePageServiceImpl implements UserHomePageService {
         return map;
     }
 
-    List<CompVo> getCompList() {
-        List<AnnualCompPoint> annualCompPointList = iAnnualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>()
-                .eq(AnnualCompPoint::getRequireApply, "Y"));
-        List<CompVo> compVoList = new LinkedList<>();
-        Optional.ofNullable(annualCompPointList).orElse(new LinkedList<>()).stream().forEach(p -> {
-            CompVo compVo = new CompVo();
-            BeanUtils.copyProperties(p, compVo);
-            List<AnnualCompetitionProjectRegistration> list = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>()
-                    .eq(AnnualCompetitionProjectRegistration::getAnnualCompid, p.getId()));
-            if (!ObjectUtils.isEmpty(list)) {
-                Set<String> entryFormats = list.stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet());
-                Long count = iTeamManagementService.count(new LambdaQueryWrapper<TeamManagement>().in(TeamManagement::getEnrollCode, entryFormats));
-                compVo.setNumber(count.intValue());
-            }
-        });
-        return compVoList;
-    }
-
 }