xuhy
2025-12-16 2ee5451fd30b1d78b459eccc0b7771366617b896
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -131,7 +131,8 @@
                .eq(TLargeKeyGridUser::getUserType, 2));
        Map<String,Long> map = new HashMap<>();
        map.put("keyCount",keyCount);
        map.put("gridCount",gridCount);
        map.put("gridCount",17079L);
//        map.put("gridCount",gridCount);
        return R.ok(map);
    }
@@ -142,7 +143,8 @@
    @GetMapping(value = "/keyPersonnelSituation")
    public R<List<TLargeKeyPersonnelType>> keyPersonnelSituation() {
        List<TLargeKeyPersonnelType> list = largeKeyPersonnelTypeService.list();
        List<TLargeKeyGridUser> largeKeyGridUsers = largeKeyGridUserService.list();
        List<TLargeKeyGridUser> largeKeyGridUsers = largeKeyGridUserService.list(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
                .eq(TLargeKeyGridUser::getUserType, 1));
        for (TLargeKeyPersonnelType largeKeyPersonnelType : list) {
            if(largeKeyPersonnelType.getShowType() == 2 && !CollectionUtils.isEmpty(largeKeyGridUsers)){
                // 查询真实的汇总数据