收费统计调整

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.ArchivesStatusEnum;
+import com.xjrsoft.common.enums.StudentTypeEnum;
+import com.xjrsoft.common.enums.StudyStatusEnum;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
@@ -267,11 +269,11 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
         List<StringCountVo> countVoList = pbVXsxxsfytbMapper.studentCategoryStat(dto);
         PbStudentCategoryVo result = new PbStudentCategoryVo();
         for (StringCountVo stringCountVo : countVoList) {
-            if ("其他类型贫困".equals(stringCountVo.getName())) {
+            if (StudentTypeEnum.FB2803.getValue().equals(stringCountVo.getName())) {
                 result.setOtherPoorCount(stringCountVo.getCount());
-            } else if ("普通学生（非贫困）".equals(stringCountVo.getName())) {
+            } else if (StudentTypeEnum.FB2801.getValue().equals(stringCountVo.getName())) {
                 result.setInclusiveCount(stringCountVo.getCount());
-            } else if ("贫困生(建卡、低保、特困)".equals(stringCountVo.getName())) {
+            } else if (StudentTypeEnum.FB2802.getValue().equals(stringCountVo.getName())) {
                 result.setPoorCount(stringCountVo.getCount());
             }
         }
@@ -294,9 +296,9 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
         List<StringCountVo> countVoList = pbVXsxxsfytbMapper.stduyStatusStat(dto);
         PbStduyStatusVo result = new PbStduyStatusVo();
         for (StringCountVo stringCountVo : countVoList) {
-            if ("住宿".equals(stringCountVo.getName())) {
+            if ("住读".equals(stringCountVo.getName())) {
                 result.setStayCount(stringCountVo.getCount());
-            } else if ("走读".equals(stringCountVo.getName())) {
+            } else if (StudyStatusEnum.AttendDaySchool.getValue().equals(stringCountVo.getName())) {
                 result.setNotStayCount(stringCountVo.getCount());
             }
         }