人事管理-人数统计bug修复

ruoyi-psa/src/main/java/com/ruoyi/employment/controller/EmploymentApprovalController.java

@@ -188,4 +188,19 @@ public class EmploymentApprovalController extends BaseController
     {
         return AjaxResult.success(employmentApprovalService.getCurrentUserApproval());
     }
+
+
+    @PreAuthorize("@ss.hasRole('admin') or @ss.hasRole('project-manager') or @ss.hasRole('hr') or @ss.hasRole('general-manager') or @ss.hasRole('common')")
+    @GetMapping("/getTodayBirthdayCount")
+    public AjaxResult getTodayBirthdayCount()
+    {
+        return AjaxResult.success(employmentApprovalService.countTodayBirthday());
+    }
+
+    @PreAuthorize("@ss.hasRole('admin') or @ss.hasRole('project-manager') or @ss.hasRole('hr') or @ss.hasRole('general-manager') or @ss.hasRole('common')")
+    @GetMapping("/getQuarterBirthdayCount")
+    public AjaxResult getQuarterBirthdayCount()
+    {
+        return AjaxResult.success(employmentApprovalService.countCurrentQuarterBirthday());
+    }
 }

ruoyi-psa/src/main/java/com/ruoyi/employment/mapper/EmploymentApprovalMapper.java

@@ -94,4 +94,9 @@ public interface EmploymentApprovalMapper
 
 
     public EmploymentApprovalDTO selectApprovalWithUser(Long userId);
+
+
+    public Long countTodayBirthday();
+
+    public Long countCurrentQuarterBirthday();
 }

ruoyi-psa/src/main/java/com/ruoyi/employment/service/IEmploymentApprovalService.java

@@ -87,4 +87,9 @@ public interface IEmploymentApprovalService
 
 
     public EmploymentApprovalDTO getCurrentUserApproval();
+
+
+    public Long countTodayBirthday();
+
+    public Long countCurrentQuarterBirthday();
 }

ruoyi-psa/src/main/java/com/ruoyi/employment/service/impl/EmploymentApprovalServiceImpl.java

@@ -188,4 +188,13 @@ public class EmploymentApprovalServiceImpl implements IEmploymentApprovalService
         return employmentApprovalMapper.selectApprovalWithUser(loginUser.getUserId());
     }
 
+    @Override
+    public Long countTodayBirthday() {
+        return employmentApprovalMapper.countTodayBirthday();
+    }
+    @Override
+    public Long countCurrentQuarterBirthday() {
+        return employmentApprovalMapper.countCurrentQuarterBirthday();
+    }
+
 }