Merge branch 'master' of http://gogs.gisvg.com/YDM/graduate

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectSupervisorRecord/StudentSelectSupervisorRecordController.java

@@ -66,7 +66,10 @@ public class StudentSelectSupervisorRecordController {
     @Idempotent(timeout = 10)
     public void checkIsSelection() {
         LocalDateTime nowTime =LocalDateTime.now();
-        studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(nowTime.getYear()),studentSelectionProjectSaveReqVO.class);
+        studentSelectionProjectSaveReqVO project
+                = BeanUtils.toBean(
+                        studentSelectionProjectService.getStudentSelectionProjectByYear(nowTime.getYear())
+                ,studentSelectionProjectSaveReqVO.class);
         LocalDateTime endTime = project.getSupervisorConfirmDeadline();
         if (nowTime.isAfter(endTime)){
             checkSelection();
@@ -110,8 +113,8 @@ public class StudentSelectSupervisorRecordController {
         if ((roleIds.contains(112L) || roleIds.contains(113L)) && project.getSupervisorConfirmDeadline().isBefore(dateTime)) {
             return error(1, "该项目已过截至日期");
         }else {
-            Integer occupiedAcademicSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),Math.toIntExact(createReqVO.getSupervisorId()), 1);//占用学硕
-            Integer occupiedProfessionalSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),Math.toIntExact(createReqVO.getSupervisorId()), 2);//占用专硕
+            Integer occupiedAcademicSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),createReqVO.getSupervisorId(), 1);//占用学硕
+            Integer occupiedProfessionalSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),createReqVO.getSupervisorId(), 2);//占用专硕
             supervisorSelectionSettingDO supervisorSelectionSetting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(createReqVO.getSupervisorId(), createReqVO.getProjectId());
 
             if (supervisorSelectionSetting == null || (supervisorSelectionSetting.getAcademicSlots() == null && supervisorSelectionSetting.getProfessionalSlots() == null)) {
@@ -146,7 +149,7 @@ public class StudentSelectSupervisorRecordController {
         return success("请求提交成功");
     }
 
-//    学院志愿编辑，
+    //    学院志愿编辑，
     @PutMapping("/update")
     @Operation(summary = "更新师生互选记录")
     @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:update')")
@@ -156,8 +159,8 @@ public class StudentSelectSupervisorRecordController {
         //
         studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProject(record.getProjectId()), studentSelectionProjectSaveReqVO.class);
         AdminUserDO user =adminUserService.getUser(record.getStudentId());
-        Integer  occupiedAcademicSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),Math.toIntExact(updateReqVO.getSupervisorId()),1);//占用学硕
-        Integer  occupiedProfessionalSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),Math.toIntExact(updateReqVO.getSupervisorId()),2);//占用专硕
+        Integer  occupiedAcademicSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),updateReqVO.getSupervisorId(),1);//占用学硕
+        Integer  occupiedProfessionalSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),updateReqVO.getSupervisorId(),2);//占用专硕
         supervisorSelectionSettingDO supervisorSelectionSetting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(updateReqVO.getSupervisorId(), record.getProjectId());
         // 检查导师是否有名额设置
         if (supervisorSelectionSetting == null || (supervisorSelectionSetting.getAcademicSlots() == null && supervisorSelectionSetting.getProfessionalSlots() == null)) {
@@ -215,7 +218,7 @@ public class StudentSelectSupervisorRecordController {
     @Operation(summary = "删除师生互选记录")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:delete')")
-    public CommonResult<Boolean> deleteStudentSelectSupervisorRecord(@RequestParam("id") Integer id) {
+    public CommonResult<Boolean> deleteStudentSelectSupervisorRecord(@RequestParam("id") Long id) {
         studentSelectSupervisorRecordService.deleteStudentSelectSupervisorRecord(id);
         return success(true);
     }
@@ -224,7 +227,7 @@ public class StudentSelectSupervisorRecordController {
     @Operation(summary = "获得师生互选记录")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:query')")
-    public CommonResult<StudentSelectSupervisorRecordRespVO> getStudentSelectSupervisorRecord(@RequestParam("id") Integer id) {
+    public CommonResult<StudentSelectSupervisorRecordRespVO> getStudentSelectSupervisorRecord(@RequestParam("id") Long id) {
         studentSelectSupervisorRecordDO studentSelectSupervisorRecord = studentSelectSupervisorRecordService.getStudentSelectSupervisorRecord(id);
         return success(BeanUtils.toBean(studentSelectSupervisorRecord, StudentSelectSupervisorRecordRespVO.class));
     }
@@ -273,8 +276,8 @@ public class StudentSelectSupervisorRecordController {
             Long loginId = SecurityFrameworkUtils.getLoginUserId();
             Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
 
-            Integer occupiedAcademicSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),Math.toIntExact(loginId), 1);//占用学硕名额
-            Integer occupiedProfessionalSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),Math.toIntExact(loginId), 2);//占用专硕名额
+            Integer occupiedAcademicSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),loginId, 1);//占用学硕名额
+            Integer occupiedProfessionalSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),loginId, 2);//占用专硕名额
 
             supervisorSelectionSettingDO supervisorSelectionSetting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(loginId, project.getId());
             // 检查导师是否有名额设置
@@ -400,7 +403,7 @@ public class StudentSelectSupervisorRecordController {
     @GetMapping("/getSelectionBook")
     @Operation(summary = "互选表打印数据")
     @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:getSelection')")
-    public CommonResult<PrintBookVO> getSelectionBook(@RequestParam("id") Integer recordId) {
+    public CommonResult<PrintBookVO> getSelectionBook(@RequestParam("id") Long recordId) {
         PrintBookVO record = studentSelectSupervisorRecordService.getSelectionBookById(recordId);
         if (record == null) {
             return error(1, "记录不存在");

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectSupervisorRecord/vo/StudentSelectSupervisorRecordSaveReqVO.java

@@ -14,10 +14,10 @@ import java.time.LocalDateTime;
 public class StudentSelectSupervisorRecordSaveReqVO {
 
     @Schema(description = "选择id，自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "2519")
-    private Integer id;
+    private Long id;
 
     @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20003")
-    private Integer projectId;
+    private Long projectId;
 
     @Schema(description = "学生id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14632")
     private Long studentId;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectionProject/studentSelectionProjectController.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.studentSelectionProject;
 
+import cn.iocoder.yudao.module.system.controller.admin.supervisorSelectionSetting.vo.supervisorSelectionSettingPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.supervisorSelectionSetting.vo.supervisorSelectionSettingSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.supervisorSelectionSetting.supervisorSelectionSettingDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
@@ -45,7 +46,13 @@ import cn.iocoder.yudao.module.system.service.studentSelectionProject.studentSel
 @RequestMapping("/system/student-selection-project")
 @Validated
 public class studentSelectionProjectController {
-
+    // TODO 1.删除项目时，应该同时删除对应的关联信息
+    //  2. 新增接口 ，学院 ：（1） 查看所有未提交、未通过、（注意提交但是撤回的状态）的学生 （2） 查看所有已通过的学生 （3） 招生详情只展示同意的
+    //   老师： （1） 新增菜单， 待审批接口 （2）已审批
+    //   学生：  （1）  操作提示 ，还有请求在待处理中 改为 已存在申请 ， (2)申请表样式
+    //  3.合并菜单
+    //  4. 项目创建表单 名称和描述  年份默认
+    // TODO PDF导出
     @Resource
     private studentSelectionProjectService studentSelectionProjectService;
     @Resource
@@ -80,7 +87,7 @@ public class studentSelectionProjectController {
         if (project!=null){
             return error(1,"今年已经创建过项目了");
         }else {
-            Integer projectId = studentSelectionProjectService.createStudentSelectionProject(createReqVO);
+            Long projectId = studentSelectionProjectService.createStudentSelectionProject(createReqVO);
             //创建初始化的导师名额设置
             for (Map<String, String> entry : createReqVO.getSupervisorsWithQuota()) {
                 supervisorSelectionSettingSaveReqVO settingSaveReqVO = new supervisorSelectionSettingSaveReqVO();
@@ -102,50 +109,102 @@ public class studentSelectionProjectController {
     @PutMapping("/update")
     @Operation(summary = "更新师生互选项目")
     @PreAuthorize("@ss.hasPermission('system:student-selection-project:update')")
+    @Transactional
     public CommonResult<Boolean> updateStudentSelectionProject(@Valid @RequestBody studentSelectionProjectSaveReqVO updateReqVO) {
         if (updateReqVO.getStudentStartTime().isAfter(updateReqVO.getSupervisorConfirmDeadline())){
             return error(1,"时间设置错误");
         }
+        studentSelectionProjectDO currentProject  = studentSelectionProjectService.getStudentSelectionProject(updateReqVO.getId());
+        if (currentProject == null) {
+            return error(1, "项目不存在");
+        }
         //创建新的教师设置
-        studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProject(updateReqVO.getId()),studentSelectionProjectSaveReqVO.class);
+        studentSelectionProjectSaveReqVO project = BeanUtils.toBean(currentProject,studentSelectionProjectSaveReqVO.class);
+
 
         List<Long> originSupervisorIds = project.getSupervisorIds();
-        List<Long> newSupervisorIds = new ArrayList<>(updateReqVO.getSupervisorIds()); // 先复制一份新的列表
+        supervisorSelectionSettingPageReqVO pageReqVO = new supervisorSelectionSettingPageReqVO();
+        pageReqVO.setPageNo(-1);
+        pageReqVO.setProjectId(updateReqVO.getId());
+        PageResult<supervisorSelectionSettingDO> pageResult
+                = supervisorSelectionSettingService.getSupervisorSelectionSettingPage(pageReqVO);
 
-        if (!originSupervisorIds.isEmpty()){
-            newSupervisorIds.removeAll(originSupervisorIds); // 从 newSupervisorIds 中移除 originSupervisorIds 中的元素
-        }
-        if (!newSupervisorIds.isEmpty()){
-            supervisorSelectionSettingSaveReqVO settingSaveReqVO = new supervisorSelectionSettingSaveReqVO();
-            newSupervisorIds.forEach(supervisorId -> {
+
+        List<Long> newSupervisorIds = new ArrayList<>(updateReqVO.getSupervisorIds()); // 新的导师ID列表
+
+        // 处理新增的导师（在新列表中存在但在原列表中不存在）
+        newSupervisorIds.removeAll(originSupervisorIds); // 移除已存在的导师
+        if (!newSupervisorIds.isEmpty()) {
+            // 批量新增导师设置
+            for (Long supervisorId : newSupervisorIds) {
+                supervisorSelectionSettingSaveReqVO settingSaveReqVO = new supervisorSelectionSettingSaveReqVO();
                 settingSaveReqVO.setSupervisorId(supervisorId);
                 settingSaveReqVO.setProjectId(updateReqVO.getId());
-                supervisorSelectionSettingService.createSupervisorSelectionSetting(settingSaveReqVO);
-            });
-        }
 
-        // 删除原来存在于 originSupervisorIds 中，但新设置中没有的导师
-        if (!originSupervisorIds.isEmpty()) {
-            List<Long> removedSupervisorIds = new ArrayList<>(originSupervisorIds);
-            removedSupervisorIds.removeAll(updateReqVO.getSupervisorIds()); // 找出被移除的导师ID
+                // 根据 request 中的名额信息设置名额
+                Map<String, String> supervisorQuota = findSupervisorQuotaById(updateReqVO.getSupervisorsWithQuota(), supervisorId);
+                if (supervisorQuota != null) {
+                    settingSaveReqVO.setAcademicSlots(Integer.valueOf(supervisorQuota.get("academicSlots")));
+                    settingSaveReqVO.setProfessionalSlots(Integer.valueOf(supervisorQuota.get("professionalSlots")));
+
+                    supervisorSelectionSettingService.createSupervisorSelectionSetting(settingSaveReqVO);
+                }
+            }
+        }
 
-            if (!removedSupervisorIds.isEmpty()) {
-                removedSupervisorIds.forEach(supervisorId -> {
-                    supervisorSelectionSettingDO settingDO = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(supervisorId,project.getId());
+        // 处理删除的导师（在原列表中存在但在新列表中不存在）
+        List<Long> removedSupervisorIds = new ArrayList<>(originSupervisorIds);
+        removedSupervisorIds.removeAll(updateReqVO.getSupervisorIds()); // 找出被移除的导师ID
+        if (!removedSupervisorIds.isEmpty()) {
+            for (Long supervisorId : removedSupervisorIds) {
+                supervisorSelectionSettingDO settingDO = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(supervisorId, updateReqVO.getId());
+                if (settingDO != null) {
                     supervisorSelectionSettingService.deleteSupervisorSelectionSetting(settingDO.getId());
-                });
+                }
+            }
+        }
+        List<supervisorSelectionSettingDO> originSupervisors = pageResult.getList().stream()
+                .filter(obj -> updateReqVO.getSupervisorIds().contains(obj.getSupervisorId()))  // 正确的写法
+                .collect(Collectors.toList());
+
+        // 更新已有的导师（名额发生变化的导师）
+        for (supervisorSelectionSettingDO supervisor : originSupervisors) {
+
+            supervisorSelectionSettingSaveReqVO settingSaveReqVO = new supervisorSelectionSettingSaveReqVO();
+            settingSaveReqVO.setId(supervisor.getId());
+            settingSaveReqVO.setSupervisorId(supervisor.getSupervisorId());
+            settingSaveReqVO.setProjectId(updateReqVO.getId());
+
+            // 根据 request 中的名额信息设置名额
+            Map<String, String> supervisorQuota = findSupervisorQuotaById(updateReqVO.getSupervisorsWithQuota(), supervisor.getSupervisorId());
+            if (supervisorQuota != null) {
+                settingSaveReqVO.setAcademicSlots(Integer.valueOf(supervisorQuota.get("academicSlots")));
+                settingSaveReqVO.setProfessionalSlots(Integer.valueOf(supervisorQuota.get("professionalSlots")));
+                supervisorSelectionSettingService.updateSupervisorSelectionSetting(settingSaveReqVO);
             }
         }
-        //更新
+
+        // 更新项目
         studentSelectionProjectService.updateStudentSelectionProject(updateReqVO);
+
         return success(true);
     }
 
+    private Map<String, String> findSupervisorQuotaById(List<Map<String, String>> supervisorsWithQuota, Long supervisorId) {
+        for (Map<String, String> supervisorMap : supervisorsWithQuota) {
+            if (supervisorId.toString().equals(supervisorMap.get("id"))) {
+                return supervisorMap;
+            }
+        }
+        return null;
+    }
+
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除师生互选项目")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('system:student-selection-project:delete')")
-    public CommonResult<Boolean> deleteStudentSelectionProject(@RequestParam("id") Integer id) {
+    public CommonResult<Boolean> deleteStudentSelectionProject(@RequestParam("id") Long id) {
         studentSelectionProjectService.deleteStudentSelectionProject(id);
         return success(true);
     }
@@ -154,9 +213,34 @@ public class studentSelectionProjectController {
     @Operation(summary = "获得师生互选项目")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('system:student-selection-project:query')")
-    public CommonResult<studentSelectionProjectRespVO> getStudentSelectionProject(@RequestParam("id") Integer id) {
+    public CommonResult<studentSelectionProjectRespVO> getStudentSelectionProject(@RequestParam("id") Long id) {
         studentSelectionProjectDO studentSelectionProject = studentSelectionProjectService.getStudentSelectionProject(id);
-        return success(BeanUtils.toBean(studentSelectionProject, studentSelectionProjectRespVO.class));
+
+        if (studentSelectionProject == null) {
+            return success(null);
+        }
+
+        supervisorSelectionSettingPageReqVO pageReqVO = new supervisorSelectionSettingPageReqVO();
+        pageReqVO.setPageNo(-1);
+        pageReqVO.setProjectId(id);
+        PageResult<supervisorSelectionSettingDO> pageResult
+                = supervisorSelectionSettingService.getSupervisorSelectionSettingPage(pageReqVO);
+
+        // 将分页结果的内容转换为 List<Map<String, String>> 格式
+        List<Map<String, String>> supervisorsWithQuota = pageResult.getList().stream()
+                .map(setting -> {
+
+                    Map<String, String> supervisorMap = new HashMap<>();
+                    supervisorMap.put("id", String.valueOf(setting.getSupervisorId()));  // 导师ID
+                    supervisorMap.put("academicSlots", String.valueOf(setting.getAcademicSlots()));
+                    supervisorMap.put("professionalSlots", String.valueOf(setting.getProfessionalSlots()));
+                    supervisorMap.put("name", setting.getSupervisorName());
+                    return supervisorMap;
+                })
+                .collect(Collectors.toList());
+        studentSelectionProjectRespVO responseVO = BeanUtils.toBean(studentSelectionProject, studentSelectionProjectRespVO.class);
+        responseVO.setSupervisorsWithQuota(supervisorsWithQuota);
+        return success(responseVO);
     }
 
     @GetMapping("/page")
@@ -189,7 +273,7 @@ public class studentSelectionProjectController {
 
     @GetMapping("/getProjectSupervisors")
     @Operation(summary = "获取当前项目的导师")
-    public CommonResult<List<AdminUserDO>> getProjectSupervisors(@RequestParam("projectId") Integer projectId) {
+    public CommonResult<List<AdminUserDO>> getProjectSupervisors(@RequestParam("projectId") Long projectId) {
         // 获取项目数据并转换成相应的 VO
         studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProject(projectId), studentSelectionProjectSaveReqVO.class);
         List<Long> supervisorIds = project.getSupervisorIds();

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectionProject/vo/studentSelectionProjectRespVO.java

@@ -38,6 +38,9 @@ public class studentSelectionProjectRespVO {
     @ExcelProperty("导师id数组")
     private List<Long> supervisorIds;
 
+    @Schema(description = "导师选择数组", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<Map<String,String>> supervisorsWithQuota;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectionProject/vo/studentSelectionProjectSaveReqVO.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 public class studentSelectionProjectSaveReqVO {
 
     @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer id;
+    private Long id;
 
     @Schema(description = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024师生互选项目")
     @NotEmpty(message = "项目名称不能为空")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supervisorSelectionSetting/supervisorSelectionSettingController.java

@@ -55,7 +55,7 @@ public class supervisorSelectionSettingController {
     @PostMapping("/create")
     @Operation(summary = "创建导师学硕专硕名额设置")
     @PreAuthorize("@ss.hasPermission('system:supervisor-selection-setting:create')")
-    public CommonResult<Integer> createSupervisorSelectionSetting(@Valid @RequestBody supervisorSelectionSettingSaveReqVO createReqVO) {
+    public CommonResult<Long> createSupervisorSelectionSetting(@Valid @RequestBody supervisorSelectionSettingSaveReqVO createReqVO) {
         return success(supervisorSelectionSettingService.createSupervisorSelectionSetting(createReqVO));
     }
 
@@ -68,8 +68,8 @@ public class supervisorSelectionSettingController {
 
         studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProject(setting.getProjectId()), studentSelectionProjectSaveReqVO.class);
 
-        Integer  occupiedAcademicSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),Math.toIntExact(setting.getSupervisorId()),1);//占用学硕
-        Integer  occupiedProfessionalSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),Math.toIntExact(setting.getSupervisorId()),2);//占用专硕
+        Integer  occupiedAcademicSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),setting.getSupervisorId(),1);//占用学硕
+        Integer  occupiedProfessionalSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),setting.getSupervisorId(),2);//占用专硕
 
         if (updateReqVO.getAcademicSlots()<occupiedAcademicSlots){
             return error(1,"占用学硕名额大于更新学硕名额");
@@ -87,7 +87,7 @@ public class supervisorSelectionSettingController {
     @Operation(summary = "删除导师学硕专硕名额设置")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('system:supervisor-selection-setting:delete')")
-    public CommonResult<Boolean> deleteSupervisorSelectionSetting(@RequestParam("id") Integer id) {
+    public CommonResult<Boolean> deleteSupervisorSelectionSetting(@RequestParam("id") Long id) {
         supervisorSelectionSettingService.deleteSupervisorSelectionSetting(id);
         return success(true);
     }
@@ -96,7 +96,7 @@ public class supervisorSelectionSettingController {
     @Operation(summary = "获得导师学硕专硕名额设置")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('system:supervisor-selection-setting:query')")
-    public CommonResult<supervisorSelectionSettingRespVO> getSupervisorSelectionSetting(@RequestParam("id") Integer id) {
+    public CommonResult<supervisorSelectionSettingRespVO> getSupervisorSelectionSetting(@RequestParam("id") Long id) {
         supervisorSelectionSettingDO supervisorSelectionSetting = supervisorSelectionSettingService.getSupervisorSelectionSetting(id);
         return success(BeanUtils.toBean(supervisorSelectionSetting, supervisorSelectionSettingRespVO.class));
     }
@@ -133,7 +133,7 @@ public class supervisorSelectionSettingController {
 
     @GetMapping("/getSupervisorInfo")
     @Operation(summary = "导师这个项目的信息")
-    public CommonResult<supervisorSelectionSettingDO> getSupervisorInfo(@RequestParam("supervisorId") Integer supervisorId,@RequestParam("projectId") Integer projectId) {
+    public CommonResult<supervisorSelectionSettingDO> getSupervisorInfo(@RequestParam("supervisorId") Integer supervisorId,@RequestParam("projectId") Long projectId) {
         return success(supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(Long.valueOf(supervisorId),projectId));
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supervisorSelectionSetting/vo/supervisorSelectionSettingPageReqVO.java

@@ -16,10 +16,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 public class supervisorSelectionSettingPageReqVO extends PageParam {
 
     @Schema(description = "项目id", example = "1")
-    private Integer projectId;
+    private Long projectId;
 
     @Schema(description = "导师id", example = "1")
-    private Integer supervisorId;
+    private Long supervisorId;
 
     @Schema(description = "学硕名额")
     private Integer academicSlots;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supervisorSelectionSetting/vo/supervisorSelectionSettingSaveReqVO.java

@@ -10,11 +10,11 @@ import javax.validation.constraints.*;
 public class supervisorSelectionSettingSaveReqVO {
 
     @Schema(description = "自增id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer id;
+    private Long id;
 
     @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
 //    @NotNull(message = "项目id不能为空")
-    private Integer projectId;
+    private Long projectId;
 
     @Schema(description = "导师id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
 //    @NotNull(message = "导师id不能为空")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/studentSelectSupervisorRecord/studentSelectSupervisorRecordDO.java

@@ -31,12 +31,12 @@ public class studentSelectSupervisorRecordDO extends BaseDO {
      * 选择id，自增
      */
     @TableId
-    private Integer id;
+    private Long id;
 
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Long projectId;
     /**
      * 学生id
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/studentSelectionProject/studentSelectionProjectDO.java

@@ -29,7 +29,7 @@ public class studentSelectionProjectDO extends BaseDO {
      * 项目id
      */
     @TableId
-    private Integer id;
+    private Long id;
     /**
      * 项目名称
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supervisorSelectionSetting/supervisorSelectionSettingDO.java

@@ -26,15 +26,15 @@ public class supervisorSelectionSettingDO extends BaseDO {
      * 自增id
      */
     @TableId
-    private Integer id;
+    private Long id;
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Long projectId;
     /**
      * 导师id
      */
-    private Integer supervisorId;
+    private Long supervisorId;
     /**
      * 学硕名额
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/studentSelectSupervisorRecord/studentSelectSupervisorRecordMapper.java

@@ -103,18 +103,18 @@ public interface studentSelectSupervisorRecordMapper extends BaseMapperX<student
 
     //只能查一直只有一条记录的，同意/未处理
     studentSelectSupervisorRecordDO getRecordByStudentIdAndSupervisorId(
-            @Param("projectId") Integer projectId,
+            @Param("projectId") Long projectId,
             @Param("studentId") Long studentId,
             @Param("supervisorId") Long supervisorId,
             @Param("selectType") Integer selectType);
 
     //更新待处理到撤回
     @Update("UPDATE student_select_supervisor_record SET select_type = 0 WHERE project_id = #{projectId} AND select_type = 1 AND deleted =0")
-    void updatePendingSelectType(@Param("projectId") Integer projectId);
+    void updatePendingSelectType(@Param("projectId") Long projectId);
 
-    PrintBookVO getSelectionBookById(@Param("id") Integer id);
+    PrintBookVO getSelectionBookById(@Param("id") Long id);
 
-    List<PrintBookVO> getSelectionBookListByProjectId( @Param("projectId") Integer projectId);
+    List<PrintBookVO> getSelectionBookListByProjectId( @Param("projectId") Long projectId);
 
     //获取导师历史签名
     @Select("SELECT supervisor_signature FROM student_select_supervisor_record WHERE supervisor_id=#{supervisorId} AND select_type =2 AND supervisor_signature IS NOT NULL AND supervisor_signature != '' AND deleted =0 ORDER BY supervisor_sign_date DESC LIMIT 1")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supervisorSelectionSetting/supervisorSelectionSettingMapper.java

@@ -44,7 +44,7 @@ public interface supervisorSelectionSettingMapper extends BaseMapperX<supervisor
         return selectPage(reqVO,mpjLambdaWrapperX);
     }
 
-     supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(@Param("supervisorId") Long supervisorId,@Param("projectId") Integer projectId);
+     supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(@Param("supervisorId") Long supervisorId,@Param("projectId") Long projectId);
 
 //    @Select("SELECT * FROM supervisor_selection_setting WHERE supervisor_id = #{supervisorId} AND project_id = #{projectId} AND deleted =0")
 //    supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(@Param("supervisorId") Long supervisorId,@Param("projectId") Integer projectId);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -356,7 +356,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     List<AdminUserDO> getStudentErrorAttendance();
 
     @Select("SELECT COUNT(*) FROM system_users WHERE grade =#{grade} AND supervisor_id = #{supervisorId} AND master_type = #{masterType} AND user_type = '1' AND deleted = 0")
-    Integer countStudentListBySupervisorId(@Param("grade") String grade,@Param("supervisorId") Integer supervisorId, @Param("masterType") Integer masterType);
+    Integer countStudentListBySupervisorId(@Param("grade") String grade,@Param("supervisorId") Long supervisorId, @Param("masterType") Integer masterType);
 
 
     //弹窗值

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/studentSelectSupervisorRecord/studentSelectSupervisorRecordService.java

@@ -20,7 +20,7 @@ public interface studentSelectSupervisorRecordService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Integer createStudentSelectSupervisorRecord(@Valid StudentSelectSupervisorRecordSaveReqVO createReqVO);
+    Long createStudentSelectSupervisorRecord(@Valid StudentSelectSupervisorRecordSaveReqVO createReqVO);
 
     /**
      * 更新师生互选记录
@@ -34,7 +34,7 @@ public interface studentSelectSupervisorRecordService {
      *
      * @param id 编号
      */
-    void deleteStudentSelectSupervisorRecord(Integer id);
+    void deleteStudentSelectSupervisorRecord(Long id);
 
     /**
      * 获得师生互选记录
@@ -42,7 +42,7 @@ public interface studentSelectSupervisorRecordService {
      * @param id 编号
      * @return 师生互选记录
      */
-    studentSelectSupervisorRecordDO getStudentSelectSupervisorRecord(Integer id);
+    studentSelectSupervisorRecordDO getStudentSelectSupervisorRecord(Long id);
 
     /**
      * 获得师生互选记录分页
@@ -54,14 +54,14 @@ public interface studentSelectSupervisorRecordService {
 
     List<studentSelectSupervisorRecordDO> getStudentSelectSupervisorRecordList(StudentSelectSupervisorRecordPageReqVO pageReqVO);
 
-    studentSelectSupervisorRecordDO getRecordByStudentIdAndSupervisorId( Integer projectId,Long studentId ,Long supervisorId,Integer selectType);
+    studentSelectSupervisorRecordDO getRecordByStudentIdAndSupervisorId( Long projectId,Long studentId ,Long supervisorId,Integer selectType);
 
     //更新待处理的状态为撤回
-    void updatePendingSelectType(Integer projectId);
+    void updatePendingSelectType(Long projectId);
 
-    PrintBookVO getSelectionBookById( Integer id);
+    PrintBookVO getSelectionBookById( Long id);
 
-    List<PrintBookVO> getSelectionBookListByProjectId(Integer projectId);
+    List<PrintBookVO> getSelectionBookListByProjectId(Long projectId);
 
     String getSupervisorSignatureById(Long supervisorId);
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/studentSelectSupervisorRecord/studentSelectSupervisorRecordServiceImpl.java

@@ -37,7 +37,7 @@ public class studentSelectSupervisorRecordServiceImpl implements studentSelectSu
     private PermissionService permissionService;
 
     @Override
-    public Integer createStudentSelectSupervisorRecord(StudentSelectSupervisorRecordSaveReqVO createReqVO) {
+    public Long createStudentSelectSupervisorRecord(StudentSelectSupervisorRecordSaveReqVO createReqVO) {
         // 插入
         studentSelectSupervisorRecordDO studentSelectSupervisorRecord = BeanUtils.toBean(createReqVO, studentSelectSupervisorRecordDO.class);
         studentSelectSupervisorRecordMapper.insert(studentSelectSupervisorRecord);
@@ -55,21 +55,21 @@ public class studentSelectSupervisorRecordServiceImpl implements studentSelectSu
     }
 
     @Override
-    public void deleteStudentSelectSupervisorRecord(Integer id) {
+    public void deleteStudentSelectSupervisorRecord(Long id) {
         // 校验存在
         validateStudentSelectSupervisorRecordExists(id);
         // 删除
         studentSelectSupervisorRecordMapper.deleteById(id);
     }
 
-    private void validateStudentSelectSupervisorRecordExists(Integer id) {
+    private void validateStudentSelectSupervisorRecordExists(Long id) {
         if (studentSelectSupervisorRecordMapper.selectById(id) == null) {
             throw exception(STUDENT_SELECT_SUPERVISOR_RECORD_NOT_EXISTS);
         }
     }
 
     @Override
-    public studentSelectSupervisorRecordDO getStudentSelectSupervisorRecord(Integer id) {
+    public studentSelectSupervisorRecordDO getStudentSelectSupervisorRecord(Long id) {
         return studentSelectSupervisorRecordMapper.selectById(id);
     }
 
@@ -106,22 +106,22 @@ public class studentSelectSupervisorRecordServiceImpl implements studentSelectSu
     }
 
     @Override
-    public studentSelectSupervisorRecordDO getRecordByStudentIdAndSupervisorId(Integer projectId,Long studentId , Long supervisorId, Integer selectType){
+    public studentSelectSupervisorRecordDO getRecordByStudentIdAndSupervisorId(Long projectId,Long studentId , Long supervisorId, Integer selectType){
         return studentSelectSupervisorRecordMapper.getRecordByStudentIdAndSupervisorId(projectId,studentId,supervisorId,selectType);
     }
     //更新待处理的记录为撤回
     @Override
-    public void updatePendingSelectType(Integer projectId){
+    public void updatePendingSelectType(Long projectId){
         studentSelectSupervisorRecordMapper.updatePendingSelectType(projectId);
     }
 
     @Override
-    public PrintBookVO getSelectionBookById( Integer id){
+    public PrintBookVO getSelectionBookById( Long id){
         return studentSelectSupervisorRecordMapper.getSelectionBookById(id);
     }
 
     @Override
-    public  List<PrintBookVO> getSelectionBookListByProjectId(Integer projectId){
+    public  List<PrintBookVO> getSelectionBookListByProjectId(Long projectId){
         return studentSelectSupervisorRecordMapper.getSelectionBookListByProjectId(projectId);
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/studentSelectionProject/studentSelectionProjectService.java

@@ -20,7 +20,7 @@ public interface studentSelectionProjectService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Integer createStudentSelectionProject(@Valid studentSelectionProjectSaveReqVO createReqVO);
+    Long createStudentSelectionProject(@Valid studentSelectionProjectSaveReqVO createReqVO);
 
     /**
      * 更新师生互选项目
@@ -34,7 +34,7 @@ public interface studentSelectionProjectService {
      *
      * @param id 编号
      */
-    void deleteStudentSelectionProject(Integer id);
+    void deleteStudentSelectionProject(Long id);
 
     /**
      * 获得师生互选项目
@@ -42,7 +42,7 @@ public interface studentSelectionProjectService {
      * @param id 编号
      * @return 师生互选项目
      */
-    studentSelectionProjectDO getStudentSelectionProject(Integer id);
+    studentSelectionProjectDO getStudentSelectionProject(Long id);
 
     studentSelectionProjectDO getStudentSelectionProjectByYear(Integer year);
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/studentSelectionProject/studentSelectionProjectServiceImpl.java

@@ -40,7 +40,7 @@ public class studentSelectionProjectServiceImpl implements studentSelectionProje
     private AdminUserService adminUserService;
 
     @Override
-    public Integer createStudentSelectionProject(studentSelectionProjectSaveReqVO createReqVO) {
+    public Long createStudentSelectionProject(studentSelectionProjectSaveReqVO createReqVO) {
         // 插入
         studentSelectionProjectDO studentSelectionProject = BeanUtils.toBean(createReqVO, studentSelectionProjectDO.class);
         studentSelectionProjectMapper.insert(studentSelectionProject);
@@ -59,21 +59,21 @@ public class studentSelectionProjectServiceImpl implements studentSelectionProje
     }
 
     @Override
-    public void deleteStudentSelectionProject(Integer id) {
+    public void deleteStudentSelectionProject(Long id) {
         // 校验存在
         validateStudentSelectionProjectExists(id);
         // 删除
         studentSelectionProjectMapper.deleteById(id);
     }
 
-    private void validateStudentSelectionProjectExists(Integer id) {
+    private void validateStudentSelectionProjectExists(Long id) {
         if (studentSelectionProjectMapper.selectById(id) == null) {
             throw exception(STUDENT_SELECTION_PROJECT_NOT_EXISTS);
         }
     }
 
     @Override
-    public studentSelectionProjectDO getStudentSelectionProject(Integer id) {
+    public studentSelectionProjectDO getStudentSelectionProject(Long id) {
         return studentSelectionProjectMapper.selectById(id);
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supervisorSelectionSetting/supervisorSelectionSettingService.java

@@ -20,7 +20,7 @@ public interface supervisorSelectionSettingService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Integer createSupervisorSelectionSetting(@Valid supervisorSelectionSettingSaveReqVO createReqVO);
+    Long createSupervisorSelectionSetting(@Valid supervisorSelectionSettingSaveReqVO createReqVO);
 
     /**
      * 更新导师学硕专硕名额设置
@@ -34,7 +34,7 @@ public interface supervisorSelectionSettingService {
      *
      * @param id 编号
      */
-    void deleteSupervisorSelectionSetting(Integer id);
+    void deleteSupervisorSelectionSetting(Long id);
 
     /**
      * 获得导师学硕专硕名额设置
@@ -42,7 +42,7 @@ public interface supervisorSelectionSettingService {
      * @param id 编号
      * @return 导师学硕专硕名额设置
      */
-    supervisorSelectionSettingDO getSupervisorSelectionSetting(Integer id);
+    supervisorSelectionSettingDO getSupervisorSelectionSetting(Long id);
 
     /**
      * 获得导师学硕专硕名额设置分页
@@ -52,7 +52,7 @@ public interface supervisorSelectionSettingService {
      */
     PageResult<supervisorSelectionSettingDO> getSupervisorSelectionSettingPage(supervisorSelectionSettingPageReqVO pageReqVO);
 
-    supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(Long supervisorId,Integer projectId);
+    supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(Long supervisorId,Long projectId);
 
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supervisorSelectionSetting/supervisorSelectionSettingServiceImpl.java

@@ -47,7 +47,7 @@ public class supervisorSelectionSettingServiceImpl implements supervisorSelectio
     private studentSelectionProjectService studentSelectionProjectService;
 
     @Override
-    public Integer createSupervisorSelectionSetting(supervisorSelectionSettingSaveReqVO createReqVO) {
+    public Long createSupervisorSelectionSetting(supervisorSelectionSettingSaveReqVO createReqVO) {
         // 插入
         supervisorSelectionSettingDO supervisorSelectionSetting = BeanUtils.toBean(createReqVO, supervisorSelectionSettingDO.class);
         supervisorSelectionSettingMapper.insert(supervisorSelectionSetting);
@@ -65,21 +65,21 @@ public class supervisorSelectionSettingServiceImpl implements supervisorSelectio
     }
 
     @Override
-    public void deleteSupervisorSelectionSetting(Integer id) {
+    public void deleteSupervisorSelectionSetting(Long id) {
         // 校验存在
         validateSupervisorSelectionSettingExists(id);
         // 删除
         supervisorSelectionSettingMapper.deleteById(id);
     }
 
-    private void validateSupervisorSelectionSettingExists(Integer id) {
+    private void validateSupervisorSelectionSettingExists(Long id) {
         if (supervisorSelectionSettingMapper.selectById(id) == null) {
             throw exception(SUPERVISOR_SELECTION_SETTING_NOT_EXISTS);
         }
     }
 
     @Override
-    public supervisorSelectionSettingDO getSupervisorSelectionSetting(Integer id) {
+    public supervisorSelectionSettingDO getSupervisorSelectionSetting(Long id) {
         return supervisorSelectionSettingMapper.selectById(id);
     }
 
@@ -93,7 +93,7 @@ public class supervisorSelectionSettingServiceImpl implements supervisorSelectio
         studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProject(pageReqVO.getProjectId()), studentSelectionProjectSaveReqVO.class);
 
         result.getList().forEach(re->{
-            Integer supervisorId =re.getSupervisorId();
+            Long supervisorId = re.getSupervisorId();
             Integer  occupiedAcademicSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),supervisorId,1);//占用学硕
             Integer  occupiedProfessionalSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),supervisorId,2);//占用专硕
             re.setOccupiedAcademicSlots(occupiedAcademicSlots);
@@ -109,7 +109,7 @@ public class supervisorSelectionSettingServiceImpl implements supervisorSelectio
     }
 
     @Override
-    public supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(Long supervisorId,Integer projectId){
+    public supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(Long supervisorId,Long projectId){
         return supervisorSelectionSettingMapper.getSettingBySupervisorIdAndProjectId(supervisorId,projectId);
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java

@@ -243,7 +243,7 @@ public interface AdminUserService {
     //获取三天内都缺勤的人
     List<AdminUserDO> getStudentErrorAttendance();
 
-    Integer countStudentListBySupervisorId(String grade ,Integer supervisorId,Integer masterType);
+    Integer countStudentListBySupervisorId(String grade ,Long supervisorId,Integer masterType);
 
     //是否弹窗
     PopDo getPopData();

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -1176,7 +1176,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         return userMapper.getStudentErrorAttendance();
     }
     @Override
-     public Integer countStudentListBySupervisorId(String grade ,Integer supervisorId,Integer masterType){
+     public Integer countStudentListBySupervisorId(String grade ,Long supervisorId,Integer masterType){
         return userMapper.countStudentListBySupervisorId(grade,supervisorId,masterType);
     }
 

yudao-server/src/main/resources/application-dev.yaml

@@ -140,7 +140,8 @@ spring:
 logging:
   file:
     name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
-
+  level:
+    root: OFF
 --- #################### 微信公众号相关配置 ####################
 wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
   mp:

yudao-server/src/main/resources/application-local.yaml

@@ -72,6 +72,7 @@ spring:
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
     host: 172.16.59.50  # 地址
+#    host: 127.0.0.1  # 地址
     port: 6379 # 端口
     database: 2 # 数据库索引
     password: 123456 # 密码，建议生产环境开启
@@ -158,25 +159,27 @@ logging:
   file:
     name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
   level:
+    root: OFF
     # 配置自己写的 MyBatis Mapper 打印日志
-    cn.iocoder.yudao.module.bpm.dal.mysql: debug
-    cn.iocoder.yudao.module.infra.dal.mysql: debug
-    cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper: INFO # 配置 ApiErrorLogMapper 的日志级别为 info，避免和 GlobalExceptionHandler 重复打印
-    cn.iocoder.yudao.module.infra.dal.mysql.job.JobLogMapper: INFO # 配置 JobLogMapper 的日志级别为 info
-    cn.iocoder.yudao.module.infra.dal.mysql.file.FileConfigMapper: INFO # 配置 FileConfigMapper 的日志级别为 info
-    cn.iocoder.yudao.module.pay.dal.mysql: debug
-    cn.iocoder.yudao.module.pay.dal.mysql.notify.PayNotifyTaskMapper: INFO # 配置 PayNotifyTaskMapper 的日志级别为 info
-    cn.iocoder.yudao.module.system.dal.mysql: debug
-    cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info
-    cn.iocoder.yudao.module.tool.dal.mysql: debug
-    cn.iocoder.yudao.module.member.dal.mysql: debug
-    cn.iocoder.yudao.module.trade.dal.mysql: debug
-    cn.iocoder.yudao.module.promotion.dal.mysql: debug
-    cn.iocoder.yudao.module.statistics.dal.mysql: debug
-    cn.iocoder.yudao.module.crm.dal.mysql: debug
-    cn.iocoder.yudao.module.erp.dal.mysql: debug
-    cn.iocoder.yudao.module.ai.dal.mysql: debug
-    org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示
+#    cn.iocoder.yudao.module.bpm.dal.mysql: debug
+#    cn.iocoder.yudao.module.infra.dal.mysql: debug
+#    cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper: INFO # 配置 ApiErrorLogMapper 的日志级别为 info，避免和 GlobalExceptionHandler 重复打印
+#    cn.iocoder.yudao.module.infra.dal.mysql.job.JobLogMapper: INFO # 配置 JobLogMapper 的日志级别为 info
+#    cn.iocoder.yudao.module.infra.dal.mysql.file.FileConfigMapper: INFO # 配置 FileConfigMapper 的日志级别为 info
+#    cn.iocoder.yudao.module.pay.dal.mysql: debug
+#    cn.iocoder.yudao.module.pay.dal.mysql.notify.PayNotifyTaskMapper: INFO # 配置 PayNotifyTaskMapper 的日志级别为 info
+#    cn.iocoder.yudao.module.system.dal.mysql: debug
+#    cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info
+#    cn.iocoder.yudao.module.tool.dal.mysql: debug
+#    cn.iocoder.yudao.module.member.dal.mysql: debug
+#    cn.iocoder.yudao.module.trade.dal.mysql: debug
+#    cn.iocoder.yudao.module.promotion.dal.mysql: debug
+#    cn.iocoder.yudao.module.statistics.dal.mysql: debug
+#    cn.iocoder.yudao.module.crm.dal.mysql: debug
+#    cn.iocoder.yudao.module.erp.dal.mysql: debug
+#    cn.iocoder.yudao.module.ai.dal.mysql: debug
+#    org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR
+    # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示
 
 debug: false