Merge remote-tracking branch 'origin/master'

xuhy

2025-12-31 ffef20d703aaa9b60c9234dd0b42f3d006426dc7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java

@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.api;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.model.*;
@@ -31,8 +32,9 @@
    private final TLargeVolunteerService largeVolunteerService;
    private final TLargeKeyGridUserService largeKeyGridUserService;
    private final TLargeKeyPersonnelTypeService largeKeyPersonnelTypeService;
    private final THelpNeedsService tHelpNeedsService;
    @Autowired
    public DataStatisticsController(TAppealServicesService appealServicesService, TOldsterWarningService oldsterWarningService, THtmlConfigService htmlConfigService, TLargeDeptService largeDeptService, TLargeUserService largeUserService, TLargeOrganizationService largeOrganizationService, TLargeResourceService largeResourceService, TLargeSocialWorkerService largeSocialWorkerService, TLargeVolunteerService largeVolunteerService, TLargeKeyGridUserService largeKeyGridUserService, TLargeKeyPersonnelTypeService largeKeyPersonnelTypeService) {
    public DataStatisticsController(TAppealServicesService appealServicesService, TOldsterWarningService oldsterWarningService, THtmlConfigService htmlConfigService, TLargeDeptService largeDeptService, TLargeUserService largeUserService, TLargeOrganizationService largeOrganizationService, TLargeResourceService largeResourceService, TLargeSocialWorkerService largeSocialWorkerService, TLargeVolunteerService largeVolunteerService, TLargeKeyGridUserService largeKeyGridUserService, TLargeKeyPersonnelTypeService largeKeyPersonnelTypeService, THelpNeedsService tHelpNeedsService) {
        this.appealServicesService = appealServicesService;
        this.oldsterWarningService = oldsterWarningService;
        this.htmlConfigService = htmlConfigService;
@@ -44,6 +46,7 @@
        this.largeVolunteerService = largeVolunteerService;
        this.largeKeyGridUserService = largeKeyGridUserService;
        this.largeKeyPersonnelTypeService = largeKeyPersonnelTypeService;
        this.tHelpNeedsService = tHelpNeedsService;
    }

    /**
@@ -77,9 +80,18 @@
        long appealServicesCount = appealServicesService.count();
        // 养老告警事件
        long warningCount = oldsterWarningService.count();
        // 随手拍
        long photoCount = appealServicesService.count(new LambdaQueryWrapper<TAppealServices>().eq(TAppealServices::getAppealType,2));
        // 诉求服务
        long appealCount = appealServicesService.count(new LambdaQueryWrapper<TAppealServices>().eq(TAppealServices::getAppealType,1));
        // 助需
        long helpNeedsCount = tHelpNeedsService.count();
        Map<String,Long> map = new HashMap<>();
        map.put("appealServicesCount",appealServicesCount);
        map.put("appealServicesCount",appealServicesCount+photoCount+appealCount+helpNeedsCount);
        map.put("warningCount",warningCount);
        map.put("photoCount",photoCount);
        map.put("appealCount",appealCount);
        map.put("helpNeedsCount",helpNeedsCount);
        return R.ok(map);
    }