提交代码

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormHygieneCheckServiceImpl.java

@@ -22,6 +22,7 @@ import org.dromara.xg.mapper.XgDormHygieneCheckMapper;
 import org.dromara.xg.mapper.XgDormHygieneStudentScoreMapper;
 import org.dromara.xg.service.IXgDormHygieneCheckService;
 import org.dromara.xg.service.IXgStudentMsgService;
+import org.dromara.system.service.ISysDictDataService;
 
 import java.util.List;
 import java.util.Map;
@@ -41,6 +42,7 @@ public class XgDormHygieneCheckServiceImpl implements IXgDormHygieneCheckService
     private final XgDormHygieneCheckMapper baseMapper;
     private final XgDormHygieneStudentScoreMapper studentScoreMapper;
     private final IXgStudentMsgService xgStudentMsgService;
+    private final ISysDictDataService sysDictDataService;
 
     /**
      * 查询宿舍卫生检查
@@ -82,7 +84,8 @@ public class XgDormHygieneCheckServiceImpl implements IXgDormHygieneCheckService
     private LambdaQueryWrapper<XgDormHygieneCheck> buildQueryWrapper(XgDormHygieneCheckBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<XgDormHygieneCheck> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(XgDormHygieneCheck::getId);
+        // lqw.orderByAsc(XgDormHygieneCheck::getId);
+        lqw.orderByDesc(XgDormHygieneCheck::getCreateTime);
         lqw.eq(bo.getDeleted() != null, XgDormHygieneCheck::getDeleted, bo.getDeleted());
         lqw.like(StringUtils.isNotBlank(bo.getCheckTitle()), XgDormHygieneCheck::getCheckTitle, bo.getCheckTitle());
         lqw.eq(bo.getCheckDate() != null, XgDormHygieneCheck::getCheckDate, bo.getCheckDate());
@@ -372,7 +375,7 @@ public class XgDormHygieneCheckServiceImpl implements IXgDormHygieneCheckService
             exportVo.setStudentGradeText(convertStudentGradeToText(exportVo.getStudentGradeText()));
 
             // 转换是否寝室长
-            exportVo.setIsResponsiblePersonText(convertResponsiblePersonToText(exportVo.getIsResponsiblePersonText()));
+            // exportVo.setIsResponsiblePersonText(convertResponsiblePersonToText(exportVo.getIsResponsiblePersonText()));
         }
 
         return exportList;
@@ -385,12 +388,12 @@ public class XgDormHygieneCheckServiceImpl implements IXgDormHygieneCheckService
         if (StringUtils.isEmpty(checkType)) {
             return "";
         }
-        Map<String, String> typeMap = Map.of(
-                "1", "日常检查",
-                "2", "专项检查",
-                "3", "突击检查",
-                "4", "复查");
-        return typeMap.getOrDefault(checkType, checkType);
+        try {
+            return sysDictDataService.selectDictLabel("xg_dorm_hygiene_check_type", checkType);
+        } catch (Exception e) {
+            log.warn("获取字典标签失败，字典类型: xg_dorm_hygiene_check_type, 字典值: {}, 错误: {}", checkType, e.getMessage());
+            return checkType;
+        }
     }
 
     /**
@@ -400,11 +403,12 @@ public class XgDormHygieneCheckServiceImpl implements IXgDormHygieneCheckService
         if (StringUtils.isEmpty(checkLevel)) {
             return "";
         }
-        Map<String, String> levelMap = Map.of(
-                "1", "宿管员",
-                "2", "学院",
-                "3", "学校");
-        return levelMap.getOrDefault(checkLevel, checkLevel);
+        try {
+            return sysDictDataService.selectDictLabel("xg_dorm_hygiene_check_level", checkLevel);
+        } catch (Exception e) {
+            log.warn("获取字典标签失败，字典类型: xg_dorm_hygiene_check_level, 字典值: {}, 错误: {}", checkLevel, e.getMessage());
+            return checkLevel;
+        }
     }
 
     /**
@@ -414,12 +418,12 @@ public class XgDormHygieneCheckServiceImpl implements IXgDormHygieneCheckService
         if (StringUtils.isEmpty(hygieneGrade)) {
             return "";
         }
-        Map<String, String> gradeMap = Map.of(
-                "A", "优秀",
-                "B", "良好",
-                "C", "合格",
-                "D", "不合格");
-        return gradeMap.getOrDefault(hygieneGrade, hygieneGrade);
+        try {
+            return sysDictDataService.selectDictLabel("xg_dorm_hygiene_grade", hygieneGrade);
+        } catch (Exception e) {
+            log.warn("获取字典标签失败，字典类型: xg_dorm_hygiene_grade, 字典值: {}, 错误: {}", hygieneGrade, e.getMessage());
+            return hygieneGrade;
+        }
     }
 
     /**
@@ -429,12 +433,12 @@ public class XgDormHygieneCheckServiceImpl implements IXgDormHygieneCheckService
         if (StringUtils.isEmpty(attendanceStatus)) {
             return "";
         }
-        Map<String, String> statusMap = Map.of(
-                "1", "在寝",
-                "2", "外出",
-                "3", "请假",
-                "4", "其他");
-        return statusMap.getOrDefault(attendanceStatus, attendanceStatus);
+        try {
+            return sysDictDataService.selectDictLabel("xg_student_attendance_status", attendanceStatus);
+        } catch (Exception e) {
+            log.warn("获取字典标签失败，字典类型: xg_student_attendance_status, 字典值: {}, 错误: {}", attendanceStatus, e.getMessage());
+            return attendanceStatus;
+        }
     }
 
     /**
@@ -444,12 +448,12 @@ public class XgDormHygieneCheckServiceImpl implements IXgDormHygieneCheckService
         if (StringUtils.isEmpty(studentGrade)) {
             return "";
         }
-        Map<String, String> gradeMap = Map.of(
-                "A", "优秀",
-                "B", "良好",
-                "C", "合格",
-                "D", "不合格");
-        return gradeMap.getOrDefault(studentGrade, studentGrade);
+        try {
+            return sysDictDataService.selectDictLabel("xg_dorm_hygiene_grade", studentGrade);
+        } catch (Exception e) {
+            log.warn("获取字典标签失败，字典类型: xg_dorm_hygiene_grade, 字典值: {}, 错误: {}", studentGrade, e.getMessage());
+            return studentGrade;
+        }
     }
 
     /**