Gqingci vor 11 Stunden
Ursprung
Commit
1d77af30e3

+ 30 - 7
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/controller/MainDashboardController.java

@@ -11,7 +11,9 @@ import org.dromara.main.domain.MainExamEvaluation;
 import org.dromara.main.domain.MainPostApply;
 import org.dromara.main.mapper.MainExamEvaluationMapper;
 import org.dromara.main.mapper.MainPostApplyMapper;
+import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.SysUser;
+import org.dromara.system.mapper.SysDeptMapper;
 import org.dromara.system.mapper.SysUserMapper;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +33,7 @@ public class MainDashboardController {
     private final MainPostApplyMapper mainPostApplyMapper;
     private final MainExamEvaluationMapper mainExamEvaluationMapper;
     private final SysUserMapper sysUserMapper;
+    private final SysDeptMapper sysDeptMapper;
 
     /**
      * 岗位管理近日发布数量报表 (近7日)
@@ -66,14 +69,11 @@ public class MainDashboardController {
     }
 
     /**
-     * 测评管理今日发布数量报表
+     * 测评管理发布数量报表
      */
-    @GetMapping("/evaluationTodayStats")
-    public R<Long> evaluationTodayStats() {
-        DateTime todayStart = DateUtil.beginOfDay(new Date());
-        long count = mainExamEvaluationMapper.selectCount(new LambdaQueryWrapper<MainExamEvaluation>()
-            .ge(MainExamEvaluation::getCreateTime, todayStart));
-        
+    @GetMapping("/evaluationTotalStats")
+    public R<Long> evaluationTotalStats() {
+        long count = mainExamEvaluationMapper.selectCount(new LambdaQueryWrapper<MainExamEvaluation>());
         return R.ok(count);
     }
 
@@ -86,4 +86,27 @@ public class MainDashboardController {
         Long count = sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>());
         return R.ok(count);
     }
+
+    /**
+     * 当前租户的真实部门数量统计(排除顶级公司节点)
+     */
+    @GetMapping("/deptStats")
+    public R<Long> deptStats() {
+        Long count = sysDeptMapper.selectCount(new LambdaQueryWrapper<SysDept>()
+            .ne(SysDept::getParentId, 0L));
+        return R.ok(count);
+    }
+
+    /**
+     * 昨日加入公司(新增用户)人数统计
+     */
+    @GetMapping("/userYesterdayStats")
+    public R<Long> userYesterdayStats() {
+        DateTime yesterdayStart = DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1));
+        DateTime yesterdayEnd = DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1));
+        Long count = sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+            .ge(SysUser::getCreateTime, yesterdayStart)
+            .le(SysUser::getCreateTime, yesterdayEnd));
+        return R.ok(count);
+    }
 }

+ 0 - 17
test_mock_positions.sql

@@ -1,17 +0,0 @@
-INSERT INTO `main_position` (
-  `id`, `tenant_id`, `post_name`, `post_description`, `work_province`, `work_city`, 
-  `post_type`, `education_requirement`, `school_requirement`, `grade_requirement`, 
-  `salary_range`, `recruit_num`, `is_urgent`, `create_time`, `create_by`, `del_flag`
-) VALUES 
-(
-  900000001, '000000', '高级审计经理', '负责审计项目统筹和团队管理,有丰富的审计经验。', '浙江省', '杭州市', 
-  '全职', '本科', '双一流', '5-10年', '20-30K', 2, 0, NOW(), 'admin', '0'
-),
-(
-  900000002, '000000', '审计实习生', '协助完成基础审计底稿,学习财务审计流程,表现优异可转正。', '浙江省', '杭州市', 
-  '实习', '本科', '不限', '经验不限', '3-5K', 5, 1, NOW(), 'admin', '0'
-),
-(
-  900000003, '000000', '驻场兼职财务助理', '周末双休兼职,处理企业日常财务票据与报销整理。', '浙江省', '宁波市', 
-  '兼职', '大专', '不限', '3年及以下', '150-200/天', 3, 0, NOW(), 'admin', '0'
-);