pms 瑞恒 移动端 日报 年月日 汇总统计

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrddailyreport/IotRdDailyReportController.java

@@ -970,7 +970,6 @@ public class IotRdDailyReportController {
             }
         }
         List<IotRdDailyReportSummaryYearRespVO> reportSummaries = iotRdDailyReportService.reportSummary(pageReqVO);
-        // 设置日报的关联信息 部门(施工队伍) 项目 任务 带班干部 日报填报人
         return success(reportSummaries);
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/IotRhDailyReportController.java

@@ -609,6 +609,50 @@ public class IotRhDailyReportController {
         // return success(new PageResult<>(rhDailyReports, pageResult.getTotal()));
     }
 
+    @GetMapping("/reportSummary")
+    @Operation(summary = "移动端 瑞恒日报汇总 分别按照 年 月 日 汇总")
+    @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:query')")
+    public CommonResult<List<IotRhDailyReportSummaryYearRespVO>> reportSummary(@Valid IotRhDailyReportPageReqVO pageReqVO) {
+        // 根据查询参数筛选出 符合条件 的记录id 再传入 分页查询
+        Set<Long> projectIds = new HashSet<>();
+        Set<Long> taskIds = new HashSet<>();
+        // 移动端搜索条件 标识 合同名称 任务井号 ... 移动端兼容：searchKey 不为空时 自动填充未填的 contractName / taskName
+        String searchKey = pageReqVO.getSearchKey();
+        if (StrUtil.isNotBlank(searchKey)) {
+            if (StrUtil.isBlank(pageReqVO.getContractName())) {
+                pageReqVO.setContractName(searchKey);
+            }
+            if (StrUtil.isBlank(pageReqVO.getTaskName())) {
+                pageReqVO.setTaskName(searchKey);
+            }
+        }
+
+        if (StrUtil.isNotBlank(pageReqVO.getContractName())) {
+            IotProjectInfoPageReqVO reqVO = new IotProjectInfoPageReqVO();
+            reqVO.setContractName(pageReqVO.getContractName());
+            List<IotProjectInfoDO> projects = iotProjectInfoService.getIotProjectInfos(reqVO);
+            if (CollUtil.isNotEmpty(projects)) {
+                projects.forEach(project -> {
+                    projectIds.add(project.getId());
+                });
+                pageReqVO.setProjectIds(projectIds);
+            }
+        }
+        if (StrUtil.isNotBlank(pageReqVO.getTaskName())) {
+            IotProjectTaskPageReqVO reqVO = new IotProjectTaskPageReqVO();
+            reqVO.setSearchKey(pageReqVO.getTaskName());
+            List<IotProjectTaskDO> tasks = iotProjectTaskService.projectTasks(reqVO);
+            if (CollUtil.isNotEmpty(tasks)) {
+                tasks.forEach(task -> {
+                    taskIds.add(task.getId());
+                });
+                pageReqVO.setTaskIds(taskIds);
+            }
+        }
+        List<IotRhDailyReportSummaryYearRespVO> reportSummaries = iotRhDailyReportService.reportSummary(pageReqVO);
+        return success(reportSummaries);
+    }
+
     @GetMapping("/taskActualProgress")
     @Operation(summary = "查询日报所属任务的实际进度")
     @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:query')")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportShortRespVO.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 瑞恒日报 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotRhDailyReportShortRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13853")
+    private Long id;
+
+    @Schema(description = "日报名称", example = "塔河项目部/2025-10-17日报填报")
+    @ExcelProperty("日报名称")
+    private String reportName;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    private Integer auditStatus;
+
+    @Schema(description = "项目id", example = "32587")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "15678")
+    private Long taskId;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportSummaryDayRespVO.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 瑞都日报 移动端汇总日报 天维度 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotRhDailyReportSummaryDayRespVO {
+
+    @Schema(description = "等级 年 月 日 ")
+    private String level;
+
+    @Schema(description = "星期几")
+    private String weekDay;
+
+    @Schema(description = "天 几号", example = "15")
+    private String day;
+
+    @Schema(description = "天下包含已填写日报数量")
+    private String filledCount;
+
+    @Schema(description = "天下包含未填写日报数量")
+    private String unfilledCount;
+
+    @Schema(description = "天下包含多少份日报")
+    private Integer reportCount;
+
+    @Schema(description = "日报列表")
+    private List<IotRhDailyReportShortRespVO> reports;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportSummaryMonthRespVO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 瑞恒日报 移动端汇总日报 月维度 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotRhDailyReportSummaryMonthRespVO {
+
+    @Schema(description = "等级 年 月 日 ")
+    private String level;
+
+    @Schema(description = "月")
+    private String month;
+
+    @Schema(description = "月下包含日报的天个数")
+    private Integer dayCount;
+
+    @Schema(description = "月下包含多少份日报")
+    private Integer reportCount;
+
+    @Schema(description = "月下包含日报的天汇总列表")
+    private List<IotRhDailyReportSummaryDayRespVO> days;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportSummaryYearRespVO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 瑞恒日报 移动端汇总日报 年维度 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotRhDailyReportSummaryYearRespVO {
+
+    @Schema(description = "年")
+    private String year;
+
+    @Schema(description = "年下包含日报的月份个数")
+    private Integer monthCount;
+
+    @Schema(description = "年下包含日报的个数")
+    private Integer reportCount;
+
+    @Schema(description = "等级 年 月 日 ")
+    private String level;
+
+    @Schema(description = "年下包含日报的月份列表")
+    private List<IotRhDailyReportSummaryMonthRespVO> months;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrhdailyreport/IotRhDailyReportService.java

@@ -206,4 +206,12 @@ public interface IotRhDailyReportService {
      * @return 瑞恒日报 非生产时效分析 列表
      */
     List<IotRhDailyReportPolylineVO> monthPolylineStatistics(IotRhDailyReportPageReqVO pageReqVO);
+
+    /**
+     * 瑞恒日报 按照 年 月 日 汇总
+     *
+     * @param pageReqVO 无分页查询
+     * @return 瑞恒日报 按照年 月 日 列表
+     */
+    List<IotRhDailyReportSummaryYearRespVO> reportSummary(IotRhDailyReportPageReqVO pageReqVO);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrhdailyreport/IotRhDailyReportServiceImpl.java

@@ -2303,6 +2303,160 @@ public class IotRhDailyReportServiceImpl implements IotRhDailyReportService {
         return result;
     }
 
+    @Override
+    public List<IotRhDailyReportSummaryYearRespVO> reportSummary(IotRhDailyReportPageReqVO pageReqVO) {
+        // 查询选择部门下面所有子部门
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+            pageReqVO.setDeptIds(ids);
+        }
+        // searchKey 兼容移动端查询的情况
+        if (StrUtil.isNotBlank(pageReqVO.getSearchKey())) {
+            if (CollUtil.isEmpty(pageReqVO.getProjectIds()) && CollUtil.isEmpty(pageReqVO.getTaskIds())) {
+                return new ArrayList<>();
+            }
+        } else {
+            // PC 端 AND 检查：各自条件必须匹配到对应 ID
+            if (StrUtil.isNotBlank(pageReqVO.getContractName()) && CollUtil.isEmpty(pageReqVO.getProjectIds())) {
+                return new ArrayList<>();
+            }
+            if (StrUtil.isNotBlank(pageReqVO.getTaskName()) && CollUtil.isEmpty(pageReqVO.getTaskIds())) {
+                return new ArrayList<>();
+            }
+        }
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        PageResult<IotRhDailyReportDO> pageReports = iotRhDailyReportMapper.selectPage(pageReqVO);
+        List<IotRhDailyReportDO> dailyReports = pageReports.getList();
+        if (CollUtil.isEmpty(dailyReports)) {
+            return Collections.emptyList();
+        }
+        // 查询每个日报关联的部门名称
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(convertList(dailyReports, IotRhDailyReportDO::getDeptId));
+
+        // 按照 年 月 日 汇总统计 日报数据
+        List<IotRhDailyReportSummaryYearRespVO> result = new ArrayList<>();
+        // 1. 按年 -> 月 -> 日 分组，过滤 createTime 为空的数据
+        Map<String, Map<String, Map<String, List<IotRhDailyReportDO>>>> grouped = dailyReports.stream()
+                .filter(r -> r.getCreateTime() != null)
+                .collect(Collectors.groupingBy(
+                        r -> String.valueOf(r.getCreateTime().getYear()),
+                        Collectors.groupingBy(
+                                r -> String.valueOf(r.getCreateTime().getMonthValue()),
+                                Collectors.groupingBy(
+                                        r -> String.valueOf(r.getCreateTime().getDayOfMonth())
+                                )
+                        )
+                ));
+        // 2. 遍历年份
+        for (Map.Entry<String, Map<String, Map<String, List<IotRhDailyReportDO>>>> yearEntry : grouped.entrySet()) {
+            String year = yearEntry.getKey();
+            Map<String, Map<String, List<IotRhDailyReportDO>>> monthMap = yearEntry.getValue();
+
+            IotRhDailyReportSummaryYearRespVO yearVO = new IotRhDailyReportSummaryYearRespVO();
+            yearVO.setYear(year);
+            yearVO.setLevel("year");
+            List<IotRhDailyReportSummaryMonthRespVO> monthVOList = new ArrayList<>();
+            int yearReportCount = 0;
+
+            // 3. 遍历月份
+            for (Map.Entry<String, Map<String, List<IotRhDailyReportDO>>> monthEntry : monthMap.entrySet()) {
+                String month = monthEntry.getKey();
+                Map<String, List<IotRhDailyReportDO>> dayMap = monthEntry.getValue();
+
+                IotRhDailyReportSummaryMonthRespVO monthVO = new IotRhDailyReportSummaryMonthRespVO();
+                monthVO.setMonth(month);
+                monthVO.setLevel("month");
+                List<IotRhDailyReportSummaryDayRespVO> dayVOList = new ArrayList<>();
+                int monthReportCount = 0;
+
+                // 4. 遍历日
+                for (Map.Entry<String, List<IotRhDailyReportDO>> dayEntry : dayMap.entrySet()) {
+                    String day = dayEntry.getKey();
+                    List<IotRhDailyReportDO> dayReports = dayEntry.getValue();
+
+                    IotRhDailyReportSummaryDayRespVO dayVO = new IotRhDailyReportSummaryDayRespVO();
+                    dayVO.setDay(day);
+                    dayVO.setLevel("day");
+
+                    // 统计已填报（status=1）和未填报（status=0）数量
+                    long filled = dayReports.stream()
+                            .filter(r -> r.getStatus() != null && r.getStatus() == 1)
+                            .count();
+                    long unfilled = dayReports.stream()
+                            .filter(r -> r.getStatus() != null && r.getStatus() == 0)
+                            .count();
+                    dayVO.setFilledCount(String.valueOf(filled));
+                    dayVO.setUnfilledCount(String.valueOf(unfilled));
+                    dayVO.setReportCount(dayReports.size());
+
+                    // 计算星期几（基于该天第一个日报的 createTime）
+                    if (!dayReports.isEmpty()) {
+                        LocalDateTime dateTime = dayReports.get(0).getCreateTime();
+                        // 转换为中文星期几，如 "星期一"
+                        String weekDay = dateTime.getDayOfWeek().getDisplayName(java.time.format.TextStyle.FULL, java.util.Locale.CHINESE);
+                        dayVO.setWeekDay(weekDay);
+                    }
+
+                    // 构建日报简要列表（仅 id 和 reportName）
+                    List<IotRhDailyReportShortRespVO> reportVOList = dayReports.stream()
+                            .map(r -> {
+                                IotRhDailyReportShortRespVO respVO = new IotRhDailyReportShortRespVO();
+                                respVO.setId(r.getId());
+                                // 根据 createTime deptId 设置日报名称
+                                LocalDateTime createTime = r.getCreateTime();
+                                Long deptId = r.getDeptId();
+                                if (ObjUtil.isNotEmpty(deptId) && deptMap.containsKey(deptId) && ObjUtil.isNotEmpty(createTime)) {
+                                    DeptDO dept = deptMap.get(deptId);
+                                    if (ObjUtil.isNotEmpty(dept)) {
+                                        String deptName = dept.getName();
+                                        String createTimeStr = LocalDateTimeUtil.format(createTime, DatePattern.NORM_DATE_PATTERN);
+                                        String reportTitle = StrUtil.join(" ", deptName, createTimeStr, "日报");
+                                        respVO.setReportName(reportTitle);
+                                    }
+                                }
+                                respVO.setProjectId(r.getProjectId());
+                                respVO.setTaskId(r.getTaskId());
+                                respVO.setAuditStatus(r.getAuditStatus());
+                                return respVO;
+                            })
+                            .collect(Collectors.toList());
+                    dayVO.setReports(reportVOList);
+
+                    dayVOList.add(dayVO);
+                    monthReportCount += dayReports.size();
+                }
+
+                monthVO.setDays(dayVOList);
+                monthVO.setDayCount(dayVOList.size());      // 该月下有日报的天数
+                monthVO.setReportCount(monthReportCount);   // 该月日报总数
+                monthVOList.add(monthVO);
+                yearReportCount += monthReportCount;
+            }
+
+            yearVO.setMonths(monthVOList);
+            yearVO.setMonthCount(monthVOList.size());       // 该年下有日报的月份数
+            yearVO.setReportCount(yearReportCount);         // 该年日报总数
+            result.add(yearVO);
+        }
+
+        // 5. 排序：年份降序、月份降序、日降序（最新在前）—— 使用数字比较
+        result.sort((y1, y2) -> Integer.compare(Integer.parseInt(y2.getYear()), Integer.parseInt(y1.getYear())));
+        for (IotRhDailyReportSummaryYearRespVO yearVO : result) {
+            if (CollUtil.isNotEmpty(yearVO.getMonths())) {
+                yearVO.getMonths().sort((m1, m2) -> Integer.compare(Integer.parseInt(m2.getMonth()), Integer.parseInt(m1.getMonth())));
+                for (IotRhDailyReportSummaryMonthRespVO monthVO : yearVO.getMonths()) {
+                    if (CollUtil.isNotEmpty(monthVO.getDays())) {
+                        // 日排序：降序，数字比较
+                        monthVO.getDays().sort((d1, d2) -> Integer.compare(Integer.parseInt(d2.getDay()), Integer.parseInt(d1.getDay())));
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
     private void adjustMonthStatisticsTime(IotRhDailyReportPageReqVO pageReqVO) {
         LocalDateTime[] times = pageReqVO.getCreateTime();
         if (times == null || times.length < 2 || times[0] == null || times[1] == null) {