班级量化考核中，准军事化管理查询调整

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -301,25 +301,21 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                     BeanUtils.copyProperties(dto, calssQuantitativeAssessmentPageDto);
 
                     //学生个人行为
-                    dto.setBaseStudentAssessmentCategoryId(1768178717588197377L);
+                    dto.setBaseStudentAssessmentCategoryId(1782327704603373570L);
                     Map<Long , QuantitativeAssessmentSingleScoreVo> individualBehaviorMap = getQuantitativeAssessmentSingleScoreMap(calssQuantitativeAssessmentPageDto);
 
                     //常规管理
-                    dto.setBaseStudentAssessmentCategoryId(1769927649167151105L);
+                    dto.setBaseStudentAssessmentCategoryId(1782329720935329794L);
                     Map<Long , QuantitativeAssessmentSingleScoreVo> conventionalManagementMap = getQuantitativeAssessmentSingleScoreMap(calssQuantitativeAssessmentPageDto);
 
                     //获奖及荣誉奖彰
-                    dto.setBaseStudentAssessmentCategoryId(1768179375900987394L);
+                    dto.setBaseStudentAssessmentCategoryId(1787316203484131329L);
                     Map<Long , QuantitativeAssessmentSingleScoreVo> awardsAndHonorableMap = getQuantitativeAssessmentSingleScoreMap(calssQuantitativeAssessmentPageDto);
 
                     //准军事化考核
-                    List<QuantitativeAssessmentSingleScoreVo> paramilitaryList = assessmentInspectionMapper.getParamilitaryList(new QuantitativeAssessmentSingleScoreDto(){{
-                        setClassIdList(classIdList);
-                    }});
-                    Map<Long , QuantitativeAssessmentSingleScoreVo> paramilitaryMap = new HashMap<>();
-                    for (QuantitativeAssessmentSingleScoreVo q : paramilitaryList) {
-                        awardsAndHonorableMap.put(q.getClassId(), q);
-                    }
+                    dto.setBaseStudentAssessmentCategoryId(1868835208799236098L);
+                    Map<Long , QuantitativeAssessmentSingleScoreVo> paramilitaryMap = getQuantitativeAssessmentSingleScoreMap(calssQuantitativeAssessmentPageDto);
+
 
                     //查询任课教师查询班级的数据
                     TeaEvaluateClassDto evaluateClassDto = new TeaEvaluateClassDto();
@@ -419,9 +415,22 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                                 Log.error(e.getMessage(), e);
                             }
                         }
+                        if(paramilitaryMap.get(classId) != null){
+                            Double sumScore = awardsAndHonorableMap.get(classId).getSumScore();
+                            if(sumScore != null){
+                                c.setMilitaryManageScore(sumScore.toString());
+                                if(sumScore < 10){
+                                    c.setHonorScore(sumScore.toString());
+                                }else {
+                                    c.setHonorScore("10");
+                                }
+
+                                double v = (100 + sumScore) / 100 * 25;
+                                c.setMilitaryManageComprehensiveIndex(v + "");
+                            }
+                        }
+
 
-                        c.setMilitaryManageScore(" ");
-                        c.setMilitaryManageComprehensiveIndex(" ");
                         c.setAssessMoney(" ");
                         c.setAssessSumScore(" ");
                     }
@@ -496,25 +505,20 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
         if(!classIdList.isEmpty()){
             //学生个人行为
-            dto.setBaseStudentAssessmentCategoryId(1768178717588197377L);
+            dto.setBaseStudentAssessmentCategoryId(1782327704603373570L);
             Map<Long , QuantitativeAssessmentSingleScoreVo> individualBehaviorMap = getQuantitativeAssessmentSingleScoreMap(dto);
 
             //常规管理
-            dto.setBaseStudentAssessmentCategoryId(1769927649167151105L);
+            dto.setBaseStudentAssessmentCategoryId(1782329720935329794L);
             Map<Long , QuantitativeAssessmentSingleScoreVo> conventionalManagementMap = getQuantitativeAssessmentSingleScoreMap(dto);
 
             //获奖及荣誉奖彰
-            dto.setBaseStudentAssessmentCategoryId(1768179375900987394L);
+            dto.setBaseStudentAssessmentCategoryId(1787316203484131329L);
             Map<Long , QuantitativeAssessmentSingleScoreVo> awardsAndHonorableMap = getQuantitativeAssessmentSingleScoreMap(dto);
 
             //准军事化考核
-            List<QuantitativeAssessmentSingleScoreVo> paramilitaryList = assessmentInspectionMapper.getParamilitaryList(new QuantitativeAssessmentSingleScoreDto(){{
-                setClassIdList(classIdList);
-            }});
-            Map<Long , QuantitativeAssessmentSingleScoreVo> paramilitaryMap = new HashMap<>();
-            for (QuantitativeAssessmentSingleScoreVo q : paramilitaryList) {
-                awardsAndHonorableMap.put(q.getClassId(), q);
-            }
+            dto.setBaseStudentAssessmentCategoryId(1868835208799236098L);
+            Map<Long , QuantitativeAssessmentSingleScoreVo> paramilitaryMap = getQuantitativeAssessmentSingleScoreMap(dto);
 
             //查询任课教师查询班级的数据
             TeaEvaluateClassDto evaluateClassDto = new TeaEvaluateClassDto();
@@ -568,6 +572,21 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                     }
                 }
 
+                if(paramilitaryMap.get(classId) != null){
+                    Double sumScore = awardsAndHonorableMap.get(classId).getSumScore();
+                    if(sumScore != null){
+                        c.setMilitaryManageScore(sumScore.toString());
+                        if(sumScore < 10){
+                            c.setHonorScore(sumScore.toString());
+                        }else {
+                            c.setHonorScore("10");
+                        }
+
+                        double v = (100 + sumScore) / 100 * 25;
+                        c.setMilitaryManageComprehensiveIndex(v + "");
+                    }
+                }
+
                 if(classEvaluateMap.containsKey(classId)){
                     Map<Long, List<TeaEvaluateClassListVo>> evaluateCategoryMap = classEvaluateMap.get(classId).stream().collect(Collectors.groupingBy(TeaEvaluateClassListVo::getId));
                     int size = evaluateCategoryMap.size();