pms 瑞恒日报 数据统计 总数 已填报 未填报

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -92,4 +92,7 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_RY_DAILY_REPORT_NOT_EXISTS = new ErrorCode(267, "瑞鹰日报不存在");
     ErrorCode IOT_RY_DAILY_REPORT_CURRENT_DEPTH_NOT_EXISTS = new ErrorCode(268, "未传递运行记录当前井深");
     ErrorCode IOT_SAP_STOCK_LOG_NOT_EXISTS = new ErrorCode(269, "PMS SAP 库存(sap同步的原始数据日志)不存在");
+    ErrorCode IOT_RD_DAILY_REPORT_NOT_EXISTS = new ErrorCode(270, "瑞都日报不存在");
+    ErrorCode IOT_RD_DAILY_REPORT_ITEM_NOT_EXISTS = new ErrorCode(271, "瑞都日报 (工作量)明细不存在");
+    ErrorCode IOT_DAILY_REPORT_TIME_NOT_EXISTS = new ErrorCode(272, "未传递创建时间查询参数");
 }

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

@@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProject
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportStatisticsVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojectinfo.IotProjectInfoDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask.IotProjectTaskDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
@@ -128,6 +129,14 @@ public class IotRhDailyReportController {
         return success(new PageResult<>(buildRhDailyReports(pageResult.getList()), pageResult.getTotal()));
     }
 
+    @GetMapping("/rhDailyReportStatistics")
+    @Operation(summary = "按照日期查询瑞恒日报统计数据 已填报 未填报 数量")
+    @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:query')")
+    public CommonResult<List<IotRhDailyReportStatisticsVO>> rhDailyReportStatistics(@Valid IotRhDailyReportPageReqVO pageReqVO) {
+        List<IotRhDailyReportStatisticsVO> statistics = iotRhDailyReportService.rhDailyReportStatistics(pageReqVO);
+        return success(statistics);
+    }
+
     @GetMapping("/dailyReportSummary")
     @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/IotRhDailyReportStatisticsVO.java

@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 瑞恒日报统计 已填报 未填报 Request VO")
+@Data
+public class IotRhDailyReportStatisticsVO {
+    @Schema(description = "名称 已填报 未填报")
+    private String groupName;
+
+    @Schema(description = "已填报 未填报 小队 数量")
+    private long count;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotrhdailyreport/IotRhDailyReportMapper.java

@@ -26,42 +26,6 @@ import java.util.List;
 @Mapper
 public interface IotRhDailyReportMapper extends BaseMapperX<IotRhDailyReportDO> {
 
-    /* default PageResult<IotRhDailyReportDO> selectPage(IotRhDailyReportPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<IotRhDailyReportDO>()
-                .eqIfPresent(IotRhDailyReportDO::getDeptId, reqVO.getDeptId())
-                .eqIfPresent(IotRhDailyReportDO::getProjectId, reqVO.getProjectId())
-                .inIfPresent(IotRhDailyReportDO::getProjectId, reqVO.getProjectIds())
-                .eqIfPresent(IotRhDailyReportDO::getTaskId, reqVO.getTaskId())
-                .inIfPresent(IotRhDailyReportDO::getTaskId, reqVO.getTaskIds())
-                .eqIfPresent(IotRhDailyReportDO::getProjectClassification, reqVO.getProjectClassification())
-                .eqIfPresent(IotRhDailyReportDO::getRelocationDays, reqVO.getRelocationDays())
-                .betweenIfPresent(IotRhDailyReportDO::getTransitTime, reqVO.getTransitTime())
-                .eqIfPresent(IotRhDailyReportDO::getDailyGasInjection, reqVO.getDailyGasInjection())
-                .eqIfPresent(IotRhDailyReportDO::getDailyWaterInjection, reqVO.getDailyWaterInjection())
-                .betweenIfPresent(IotRhDailyReportDO::getDailyInjectGasTime, reqVO.getDailyInjectGasTime())
-                .betweenIfPresent(IotRhDailyReportDO::getDailyInjectWaterTime, reqVO.getDailyInjectWaterTime())
-                .betweenIfPresent(IotRhDailyReportDO::getNonProductionTime, reqVO.getNonProductionTime())
-                .eqIfPresent(IotRhDailyReportDO::getNptReason, reqVO.getNptReason())
-                .betweenIfPresent(IotRhDailyReportDO::getConstructionStartDate, reqVO.getConstructionStartDate())
-                .betweenIfPresent(IotRhDailyReportDO::getConstructionEndDate, reqVO.getConstructionEndDate())
-                .eqIfPresent(IotRhDailyReportDO::getProductionStatus, reqVO.getProductionStatus())
-                .eqIfPresent(IotRhDailyReportDO::getNextPlan, reqVO.getNextPlan())
-                .eqIfPresent(IotRhDailyReportDO::getConstructionStatus, reqVO.getConstructionStatus())
-                .eqIfPresent(IotRhDailyReportDO::getPersonnel, reqVO.getPersonnel())
-                .eqIfPresent(IotRhDailyReportDO::getTotalGasInjection, reqVO.getTotalGasInjection())
-                .eqIfPresent(IotRhDailyReportDO::getTotalWaterInjection, reqVO.getTotalWaterInjection())
-                .eqIfPresent(IotRhDailyReportDO::getCumulativeCompletion, reqVO.getCumulativeCompletion())
-                .eqIfPresent(IotRhDailyReportDO::getExtProperty, reqVO.getExtProperty())
-                .eqIfPresent(IotRhDailyReportDO::getSort, reqVO.getSort())
-                .eqIfPresent(IotRhDailyReportDO::getRemark, reqVO.getRemark())
-                .eqIfPresent(IotRhDailyReportDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(IotRhDailyReportDO::getProcessInstanceId, reqVO.getProcessInstanceId())
-                .eqIfPresent(IotRhDailyReportDO::getAuditStatus, reqVO.getAuditStatus())
-                .betweenIfPresent(IotRhDailyReportDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(IotRhDailyReportDO::getCreateTime)
-                .orderByAsc(IotRhDailyReportDO::getDeptId));
-    } */
-
     /**
      * 查询 瑞恒日报列表
      * @param page
@@ -121,7 +85,7 @@ public interface IotRhDailyReportMapper extends BaseMapperX<IotRhDailyReportDO>
                 .orderByAsc(IotRhDailyReportDO::getDeptId));
     }
 
-    /* default List<IotRhDailyReportDO> selectList(IotRhDailyReportPageReqVO reqVO) {
+    default List<IotRhDailyReportDO> dailyReports(IotRhDailyReportPageReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IotRhDailyReportDO>()
                 .eqIfPresent(IotRhDailyReportDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(IotRhDailyReportDO::getProjectId, reqVO.getProjectId())
@@ -151,7 +115,7 @@ public interface IotRhDailyReportMapper extends BaseMapperX<IotRhDailyReportDO>
                 .eqIfPresent(IotRhDailyReportDO::getProcessInstanceId, reqVO.getProcessInstanceId())
                 .eqIfPresent(IotRhDailyReportDO::getAuditStatus, reqVO.getAuditStatus())
                 .betweenIfPresent(IotRhDailyReportDO::getCreateTime, reqVO.getCreateTime()));
-    } */
+    }
 
     // 修改selectList方法，使用XML实现
     List<IotRhDailyReportDO> selectListGrouped(@Param("reqVO") IotRhDailyReportPageReqVO reqVO);

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

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.pms.service.iotrhdailyreport;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportStatisticsVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrhdailyreport.IotRhDailyReportDO;
 
 import javax.validation.Valid;
@@ -55,6 +56,15 @@ public interface IotRhDailyReportService {
      */
     PageResult<IotRhDailyReportDO> getIotRhDailyReportPage(IotRhDailyReportPageReqVO pageReqVO);
 
+
+    /**
+     * 按照日期查询瑞恒日报统计数据 已填报 未填报 数量
+     *
+     * @param pageReqVO 查询参数
+     * @return 统计数据
+     */
+    List<IotRhDailyReportStatisticsVO> rhDailyReportStatistics(IotRhDailyReportPageReqVO pageReqVO);
+
     /**
      * 查询任务的实际进度
      *

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

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplateatt
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportStatisticsVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
@@ -37,7 +38,9 @@ import javax.annotation.Resource;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -361,6 +364,62 @@ public class IotRhDailyReportServiceImpl implements IotRhDailyReportService {
         return new PageResult<>(page.getRecords(), page.getTotal());
     }
 
+    @Override
+    public List<IotRhDailyReportStatisticsVO> rhDailyReportStatistics(IotRhDailyReportPageReqVO reqVO) {
+        if (reqVO.getCreateTime().length == 0) {
+            // 必须传递时间区间参数
+            throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
+        }
+        List<IotRhDailyReportStatisticsVO> results = new ArrayList<>();
+        // 查询 瑞恒157l 所有存在设备的队伍
+        // 查询瑞恒下所有部门
+        Set<Long> ids = new HashSet<>();
+        ids = deptService.getChildDeptIdListFromCache(157l);
+        ids.add(reqVO.getDeptId());
+        // 查询ids下包含的所有设备 设备对应的部门就是 小队全集
+        IotDevicePageReqVO deviceReqVO = new IotDevicePageReqVO();
+        List<IotDeviceDO> devices = iotDeviceMapper.selectSimpleList(deviceReqVO, ids);
+        // 所有需要填报日报的 瑞恒 队伍集合
+        Set<Long> deptIds = new HashSet<>();
+        if (CollUtil.isNotEmpty(devices)){
+            devices.forEach(device -> {
+                deptIds.add(device.getDeptId());
+            });
+            // 比如有20个队伍 某个时间区间D内 必须有20*D份日报 时间区间最好是1天
+            // 查询出指定时间区间内 已经填写的日报数量
+            List<IotRhDailyReportDO> dailyReports = iotRhDailyReportMapper.dailyReports(reqVO);
+            // 根据指定的时间区间 计算出天数
+            LocalDateTime[] createTimes = reqVO.getCreateTime();
+            // 获取开始时间和结束时间
+            LocalDateTime startTime = createTimes[0];
+            LocalDateTime endTime = createTimes[1];
+            // 截断到日期（忽略时分秒）
+            LocalDate startDate = startTime.toLocalDate();
+            LocalDate endDate = endTime.toLocalDate();
+            // 计算天数：日期差 + 1（包含首尾两天）
+            long days = ChronoUnit.DAYS.between(startDate, endDate) + 1;
+            // 计算指定时间区间内所有日报数量总数
+            long totalRequiredReports = (long) deptIds.size() * days;
+            // 获取【实际已报的日报数量】
+            long totalReportedReports = CollUtil.isNotEmpty(dailyReports) ? dailyReports.size() : 0l;
+            // 计算指定时间区间内未填报的日报数量
+            long notReportedCount = totalRequiredReports - totalReportedReports;
+            IotRhDailyReportStatisticsVO allReports = new IotRhDailyReportStatisticsVO();
+            allReports.setGroupName("总数");
+            allReports.setCount(totalRequiredReports);
+            IotRhDailyReportStatisticsVO haveReported = new IotRhDailyReportStatisticsVO();
+            haveReported.setGroupName("已填报");
+            haveReported.setCount(totalReportedReports);
+            IotRhDailyReportStatisticsVO notReported = new IotRhDailyReportStatisticsVO();
+            notReported.setGroupName("未填报");
+            notReported.setCount(notReportedCount);
+            results.add(allReports);
+            results.add(haveReported);
+            results.add(notReported);
+        }
+        return results;
+    }
+
     @Override
     public List<IotRhDailyReportDO> taskActualProgress(IotRhDailyReportPageReqVO reqVO) {
         if (ObjUtil.isEmpty(reqVO.getTaskId())) {