Merge branch 'master' into dev

zjk

2026-07-31 8665daa7aa863f96d0d8f27c167edae1efc38022

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDashboardServiceImpl.java

@@ -5,6 +5,7 @@
import com.ruoyi.system.dto.SysDashboardOverviewRequest;
import com.ruoyi.system.mapper.SysDashboardMapper;
import com.ruoyi.system.service.ISysDashboardService;
import com.ruoyi.system.service.ISysVisitorRecordService;
import com.ruoyi.system.vo.SysDashboardOverviewVO;
import com.ruoyi.system.vo.SysDashboardRegisterSummaryVO;
import com.ruoyi.system.vo.SysDashboardStatusSummaryVO;
@@ -44,9 +45,13 @@
    @Autowired
    private SysDashboardMapper dashboardMapper;

    @Autowired
    private ISysVisitorRecordService visitorRecordService;

    @Override
    public SysDashboardOverviewVO overview(SysDashboardOverviewRequest request)
    {
        visitorRecordService.refreshVisitorStatus();
        DateRange range = resolveDateRange(request);
        SysDashboardOverviewVO overview = new SysDashboardOverviewVO();
        overview.setPeriodType(range.getPeriodType());
@@ -56,7 +61,8 @@
                dashboardMapper.selectRegisterSummary("APPOINTMENT", range.getBeginTime(), range.getEndTime())));
        overview.setOnsiteAppointment(defaultRegisterSummary(
                dashboardMapper.selectRegisterSummary("ONSITE", range.getBeginTime(), range.getEndTime())));
        overview.setStatusSummary(defaultStatusSummary(dashboardMapper.selectStatusSummary()));
        overview.setStatusSummary(defaultStatusSummary(
                dashboardMapper.selectStatusSummary(range.getBeginTime(), range.getEndTime())));
        overview.setTrend(buildTrend(range, dashboardMapper.selectTrendDaily(range.getBeginTime(), range.getEndTime())));
        return overview;
    }