pms 瑞鹰日报 已填报 未填报 统计数量及详情

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

@@ -96,4 +96,5 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_RD_DAILY_REPORT_ITEM_NOT_EXISTS = new ErrorCode(271, "瑞都日报 (工作量)明细不存在");
     ErrorCode IOT_DAILY_REPORT_TIME_NOT_EXISTS = new ErrorCode(272, "未传递创建时间查询参数");
     ErrorCode IOT_DAILY_REPORT_DEPT_NOT_EXISTS = new ErrorCode(273, "未选择项目部");
+    ErrorCode IOT_DEPT_TYPE_NOT_EXISTS = new ErrorCode(274, "部门类型不存在");
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/depttype/IotDeptTypeController.java

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.pms.controller.admin.depttype;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypeRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypeSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.depttype.IotDeptTypeDO;
+import cn.iocoder.yudao.module.pms.service.depttype.IotDeptTypeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 部门类型")
+@RestController
+@RequestMapping("/pms/iot-dept-type")
+@Validated
+public class IotDeptTypeController {
+
+    @Resource
+    private IotDeptTypeService iotDeptTypeService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建部门类型")
+    @PreAuthorize("@ss.hasPermission('pms:iot-dept-type:create')")
+    public CommonResult<Long> createIotDeptType(@Valid @RequestBody IotDeptTypeSaveReqVO createReqVO) {
+        return success(iotDeptTypeService.createIotDeptType(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新部门类型")
+    @PreAuthorize("@ss.hasPermission('pms:iot-dept-type:update')")
+    public CommonResult<Boolean> updateIotDeptType(@Valid @RequestBody IotDeptTypeSaveReqVO updateReqVO) {
+        iotDeptTypeService.updateIotDeptType(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除部门类型")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-dept-type:delete')")
+    public CommonResult<Boolean> deleteIotDeptType(@RequestParam("id") Long id) {
+        iotDeptTypeService.deleteIotDeptType(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得部门类型")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-dept-type:query')")
+    public CommonResult<IotDeptTypeRespVO> getIotDeptType(@RequestParam("id") Long id) {
+        IotDeptTypeDO iotDeptType = iotDeptTypeService.getIotDeptType(id);
+        return success(BeanUtils.toBean(iotDeptType, IotDeptTypeRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得部门类型分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-dept-type:query')")
+    public CommonResult<PageResult<IotDeptTypeRespVO>> getIotDeptTypePage(@Valid IotDeptTypePageReqVO pageReqVO) {
+        PageResult<IotDeptTypeDO> pageResult = iotDeptTypeService.getIotDeptTypePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotDeptTypeRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出部门类型 Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-dept-type:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotDeptTypeExcel(@Valid IotDeptTypePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotDeptTypeDO> list = iotDeptTypeService.getIotDeptTypePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "部门类型.xls", "数据", IotDeptTypeRespVO.class,
+                        BeanUtils.toBean(list, IotDeptTypeRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/depttype/vo/IotDeptTypePageReqVO.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.pms.controller.admin.depttype.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 部门类型分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotDeptTypePageReqVO extends PageParam {
+
+    @Schema(description = "部门ID", example = "22428")
+    private Long deptId;
+
+    @Schema(description = "部门名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "部门状态（zj钻井 xj修井）", example = "2")
+    private String type;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/depttype/vo/IotDeptTypeRespVO.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.pms.controller.admin.depttype.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 部门类型 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotDeptTypeRespVO {
+
+    @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8853")
+    @ExcelProperty("部门id")
+    private Long id;
+
+    @Schema(description = "部门ID", example = "22428")
+    @ExcelProperty("部门ID")
+    private Long deptId;
+
+    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @ExcelProperty("部门名称")
+    private String name;
+
+    @Schema(description = "部门状态（zj钻井 xj修井）", example = "2")
+    @ExcelProperty("部门状态（zj钻井 xj修井）")
+    private String type;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/depttype/vo/IotDeptTypeSaveReqVO.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.pms.controller.admin.depttype.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Schema(description = "管理后台 - 部门类型新增/修改 Request VO")
+@Data
+public class IotDeptTypeSaveReqVO {
+
+    @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8853")
+    private Long id;
+
+    @Schema(description = "部门ID", example = "22428")
+    private Long deptId;
+
+    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @NotEmpty(message = "部门名称不能为空")
+    private String name;
+
+    @Schema(description = "部门状态（zj钻井 xj修井）", example = "2")
+    private String type;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/IotRyDailyReportController.java

@@ -91,6 +91,22 @@ public class IotRyDailyReportController {
         return success(BeanUtils.toBean(iotRyDailyReport, IotRyDailyReportRespVO.class));
     }
 
+    @GetMapping("/ryDailyReportStatistics")
+    @Operation(summary = "按照日期查询瑞鹰日报统计数据 已填报 未填报 数量")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-daily-report:query')")
+    public CommonResult<List<IotRyDailyReportStatisticsVO>> ryDailyReportStatistics(@Valid IotRyDailyReportPageReqVO pageReqVO) {
+        List<IotRyDailyReportStatisticsVO> statistics = iotRyDailyReportService.ryDailyReportStatistics(pageReqVO);
+        return success(statistics);
+    }
+
+    @GetMapping("/ryUnReportDetails")
+    @Operation(summary = "按照日期查询瑞鹰日报统计数据 未填报队伍明细")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-daily-report:query')")
+    public CommonResult<List<IotRyDailyReportStatisticsVO>> ryUnReportDetails(@Valid IotRyDailyReportPageReqVO pageReqVO) {
+        List<IotRyDailyReportStatisticsVO> statistics = iotRyDailyReportService.ryUnReportedDetails(pageReqVO);
+        return success(statistics);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得瑞鹰日报分页")
     @PreAuthorize("@ss.hasPermission('pms:iot-ry-daily-report:query')")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/depttype/IotDeptTypeDO.java

@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.depttype;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 部门类型 DO
+ *
+ * @author rq
+ */
+@TableName("system_dept_type")
+@KeySequence("system_dept_type_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotDeptTypeDO extends BaseDO {
+
+    /**
+     * 部门id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+    /**
+     * 部门名称
+     */
+    private String name;
+    /**
+     * 部门状态（zj钻井 xj修井）
+     */
+    private String type;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/depttype/IotDeptTypeMapper.java

@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.depttype;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.depttype.IotDeptTypeDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 部门类型 Mapper
+ *
+ * @author rq
+ */
+@Mapper
+public interface IotDeptTypeMapper extends BaseMapperX<IotDeptTypeDO> {
+
+    default PageResult<IotDeptTypeDO> selectPage(IotDeptTypePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotDeptTypeDO>()
+                .eqIfPresent(IotDeptTypeDO::getDeptId, reqVO.getDeptId())
+                .likeIfPresent(IotDeptTypeDO::getName, reqVO.getName())
+                .eqIfPresent(IotDeptTypeDO::getType, reqVO.getType())
+                .betweenIfPresent(IotDeptTypeDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotDeptTypeDO::getId));
+    }
+
+    default List<IotDeptTypeDO> selectList(IotDeptTypePageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotDeptTypeDO>()
+                .eqIfPresent(IotDeptTypeDO::getDeptId, reqVO.getDeptId())
+                .likeIfPresent(IotDeptTypeDO::getName, reqVO.getName())
+                .eqIfPresent(IotDeptTypeDO::getType, reqVO.getType())
+                .betweenIfPresent(IotDeptTypeDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotDeptTypeDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/depttype/IotDeptTypeService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.service.depttype;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypeSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.depttype.IotDeptTypeDO;
+
+import javax.validation.Valid;
+
+/**
+ * 部门类型 Service 接口
+ *
+ * @author rq
+ */
+public interface IotDeptTypeService {
+
+    /**
+     * 创建部门类型
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotDeptType(@Valid IotDeptTypeSaveReqVO createReqVO);
+
+    /**
+     * 更新部门类型
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotDeptType(@Valid IotDeptTypeSaveReqVO updateReqVO);
+
+    /**
+     * 删除部门类型
+     *
+     * @param id 编号
+     */
+    void deleteIotDeptType(Long id);
+
+    /**
+     * 获得部门类型
+     *
+     * @param id 编号
+     * @return 部门类型
+     */
+    IotDeptTypeDO getIotDeptType(Long id);
+
+    /**
+     * 获得部门类型分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 部门类型分页
+     */
+    PageResult<IotDeptTypeDO> getIotDeptTypePage(IotDeptTypePageReqVO pageReqVO);
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/depttype/IotDeptTypeServiceImpl.java

@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.pms.service.depttype;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypeSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.depttype.IotDeptTypeDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.depttype.IotDeptTypeMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEPT_TYPE_NOT_EXISTS;
+
+/**
+ * 部门类型 Service 实现类
+ *
+ * @author rq
+ */
+@Service
+@Validated
+public class IotDeptTypeServiceImpl implements IotDeptTypeService {
+
+    @Resource
+    private IotDeptTypeMapper iotDeptTypeMapper;
+
+    @Override
+    public Long createIotDeptType(IotDeptTypeSaveReqVO createReqVO) {
+        // 插入
+        IotDeptTypeDO iotDeptType = BeanUtils.toBean(createReqVO, IotDeptTypeDO.class);
+        iotDeptTypeMapper.insert(iotDeptType);
+        // 返回
+        return iotDeptType.getId();
+    }
+
+    @Override
+    public void updateIotDeptType(IotDeptTypeSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotDeptTypeExists(updateReqVO.getId());
+        // 更新
+        IotDeptTypeDO updateObj = BeanUtils.toBean(updateReqVO, IotDeptTypeDO.class);
+        iotDeptTypeMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotDeptType(Long id) {
+        // 校验存在
+        validateIotDeptTypeExists(id);
+        // 删除
+        iotDeptTypeMapper.deleteById(id);
+    }
+
+    private void validateIotDeptTypeExists(Long id) {
+        if (iotDeptTypeMapper.selectById(id) == null) {
+            throw exception(IOT_DEPT_TYPE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public IotDeptTypeDO getIotDeptType(Long id) {
+        return iotDeptTypeMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotDeptTypeDO> getIotDeptTypePage(IotDeptTypePageReqVO pageReqVO) {
+        return iotDeptTypeMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrydailyreport/IotRyDailyReportService.java

@@ -126,4 +126,12 @@ public interface IotRyDailyReportService {
      * @return 统计数据
      */
     List<IotRyDailyReportStatisticsVO> ryDailyReportStatistics(IotRyDailyReportPageReqVO pageReqVO);
+
+    /**
+     * 按照日期查询瑞鹰日报统计数据 未填报队伍明细
+     *
+     * @param pageReqVO 查询参数
+     * @return 未填报队伍明细
+     */
+    List<IotRyDailyReportStatisticsVO> ryUnReportedDetails(IotRyDailyReportPageReqVO pageReqVO);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrydailyreport/IotRyDailyReportServiceImpl.java

@@ -6,15 +6,18 @@ import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplateattrs.vo.IotDeviceProperty;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrydailyreport.vo.*;
 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.depttype.IotDeptTypeDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask.IotProjectTaskDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrydailyreport.IotRyDailyReportDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.depttype.IotDeptTypeMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotprojecttask.IotProjectTaskMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotrydailyreport.IotRyDailyReportMapper;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
@@ -33,9 +36,11 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -61,6 +66,8 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
     private IotDeviceMapper iotDeviceMapper;
     @Resource
     private DeptService deptService;
+    @Resource
+    private IotDeptTypeMapper iotDeptTypeMapper;
 
     @Override
     public Long createIotRyDailyReport(IotRyDailyReportSaveReqVO createReqVO) {
@@ -363,6 +370,23 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
         // 所有需要填报日报的 瑞鹰 队伍集合
         Set<Long> deptIds = new HashSet<>();
         if (CollUtil.isNotEmpty(devices)){
+            // 1钻井  2修井
+            String projectClassification = pageReqVO.getProjectClassification();
+            // 查询钻井部门 修井 部门
+            IotDeptTypePageReqVO reqVO = new IotDeptTypePageReqVO();
+            if ("1".equals(projectClassification)) {
+                reqVO.setType("zj");
+            } else {
+                reqVO.setType("xj");
+            }
+            List<IotDeptTypeDO> deptTypes = iotDeptTypeMapper.selectList(reqVO);
+            List<Long> zjOrXjDeptIds = new ArrayList<>();
+            if (CollUtil.isNotEmpty(deptTypes)) {
+                deptTypes.forEach(dept -> {
+                    zjOrXjDeptIds.add(dept.getDeptId());
+                });
+            }
+
             devices.forEach(device -> {
                 deptIds.add(device.getDeptId());
             });
@@ -375,7 +399,7 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
             if (CollUtil.isNotEmpty(allDepts)) {
                 allDepts.forEach((deptId, dept) -> {
                     // 将不属于 队伍 的组织部门过滤掉
-                    if ("3".equals(dept.getType())) {
+                    if ("3".equals(dept.getType()) && zjOrXjDeptIds.contains(deptId)) {
                         filteredDepts.put(deptId, dept);
                     }
                 });
@@ -416,11 +440,152 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
         return results;
     }
 
+    @Override
+    public List<IotRyDailyReportStatisticsVO> ryUnReportedDetails(IotRyDailyReportPageReqVO pageReqVO) {
+        // 查询所有未填报日报的队伍名称 40001队, 40005队...
+        // 首先必须传递了日期范围
+        if (pageReqVO.getCreateTime().length == 0) {
+            // 必须传递时间区间参数
+            throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
+        }
+        List<IotRyDailyReportStatisticsVO> results = new ArrayList<>();
+        List<IotDeviceDO> devices = devices();
+        // 所有需要填报日报的 瑞鹰 队伍集合
+        Set<Long> deptIds = new HashSet<>();
+        List<String> reportDates = new ArrayList<>();
+        if (CollUtil.isNotEmpty(devices)){
+            // 1钻井  2修井
+            String projectClassification = pageReqVO.getProjectClassification();
+            // 查询钻井部门 修井 部门
+            IotDeptTypePageReqVO reqVO = new IotDeptTypePageReqVO();
+            if ("1".equals(projectClassification)) {
+                reqVO.setType("zj");
+            } else {
+                reqVO.setType("xj");
+            }
+            List<IotDeptTypeDO> deptTypes = iotDeptTypeMapper.selectList(reqVO);
+            List<Long> zjOrXjDeptIds = new ArrayList<>();
+            if (CollUtil.isNotEmpty(deptTypes)) {
+                deptTypes.forEach(dept -> {
+                    zjOrXjDeptIds.add(dept.getDeptId());
+                });
+            }
+
+            devices.forEach(device -> {
+                deptIds.add(device.getDeptId());
+            });
+            // 根据指定的时间区间 计算出天数
+            LocalDateTime[] createTimes = pageReqVO.getCreateTime();
+            // 获取开始时间和结束时间
+            LocalDateTime startTime = createTimes[0];
+            LocalDateTime endTime = createTimes[1];
+            // 截断到日期（忽略时分秒）
+            LocalDate startDate = startTime.toLocalDate();
+            LocalDate endDate = endTime.toLocalDate();
+            // 将时间区间拆分成具体的每天 计算每天未填报日报的队伍明细
+            Set<LocalDate> dateSet = new HashSet<>();
+            LocalDate currentDate = startDate;
+            // 循环添加从开始日期到结束日期的所有日期（包含两端）
+            while (!currentDate.isAfter(endDate)) {
+                dateSet.add(currentDate);
+                currentDate = currentDate.plusDays(1); // 日期加1天
+            }
+            // 转换为字符串格式的日期集合（如：2025-10-06）
+            reportDates = dateSet.stream()
+                    .map(date -> date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+                    .collect(Collectors.toList());
+            // 比如有20个队伍 某个时间区间D内 必须有20*D份日报 时间区间最好是1天
+            // 查询出指定时间区间内 已经填写的日报数量
+            List<IotRyDailyReportDO> dailyReports = iotRyDailyReportMapper.dailyReports(pageReqVO);
+            // 已经填报的队伍名称集合
+            Map<String, List<String>> reportedDeptNames = new HashMap<>();
+            // 未填报的队伍名称集合
+            Map<String, List<String>> unReportedDeptNames = new HashMap<>();
+            // 查询所有部门信息
+            Map<Long, DeptDO> allDepts = deptService.getDeptMap(deptIds);
+            // 过滤后的所有部门信息
+            Map<Long, DeptDO> filteredDepts = new HashMap<>();
+            // 过滤掉部门中的 ‘项目部’
+            if (CollUtil.isNotEmpty(allDepts)) {
+                allDepts.forEach((deptId, dept) -> {
+                    if ("3".equals(dept.getType()) && zjOrXjDeptIds.contains(deptId)) {
+                        filteredDepts.put(deptId, dept);
+                    }
+                });
+            }
+            if (CollUtil.isNotEmpty(dailyReports)) {
+                // 组装每天填写的日报集合 从而统计出每天未填写日报的队伍
+                dailyReports.forEach(report -> {
+                    Long tempDeptId = report.getDeptId();
+                    if (filteredDepts.containsKey(tempDeptId)) {
+                        String deptName = filteredDepts.get(tempDeptId).getName();
+                        LocalDateTime createTime = report.getCreateTime();
+                        LocalDate tempDate = createTime.toLocalDate();
+                        String tempReportDate = tempDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                        if (reportedDeptNames.containsKey(tempReportDate)) {
+                            List<String> tempDeptNames = reportedDeptNames.get(tempReportDate);
+                            tempDeptNames.add(deptName);
+                            reportedDeptNames.put(tempReportDate, tempDeptNames);
+                        } else {
+                            List<String> tempDeptNames = new ArrayList<>();
+                            tempDeptNames.add(deptName);
+                            reportedDeptNames.put(tempReportDate, tempDeptNames);
+                        }
+                    }
+                });
+            }
+            // 遍历所有时间区间的日期 组装每个日期中 未填写日报的队伍名称集合
+            if (CollUtil.isNotEmpty(reportDates)) {
+                reportDates.forEach(dateStr -> {
+                    // 对时间区间内每个日期 都经过已经填报日报的过滤
+                    if (reportedDeptNames.containsKey(dateStr)) {
+                        List<String> tempReportedDeptNames = reportedDeptNames.get(dateStr);
+                        filteredDepts.forEach((deptId, dept) -> {
+                            if (!tempReportedDeptNames.contains(dept.getName())) {
+                                if (unReportedDeptNames.containsKey(dateStr)) {
+                                    List<String> tempDeptNames = unReportedDeptNames.get(dateStr);
+                                    tempDeptNames.add(dept.getName());
+                                    unReportedDeptNames.put(dateStr, tempDeptNames);
+                                } else {
+                                    List<String> tempDeptNames = new ArrayList<>();
+                                    tempDeptNames.add(dept.getName());
+                                    unReportedDeptNames.put(dateStr, tempDeptNames);
+                                }
+                            }
+                        });
+                    } else {
+                        // 当天没有任何队伍填写日报
+                        filteredDepts.forEach((deptId, dept) -> {
+                            List<String> tempDeptNames = new ArrayList<>();
+                            tempDeptNames.add(dept.getName());
+                            unReportedDeptNames.put(dateStr, tempDeptNames);
+                        });
+                    }
+                });
+            }
+            // 将集合中的未填报日报的队伍集合转换成 逗号 分隔的字符串
+            if (CollUtil.isNotEmpty(unReportedDeptNames)) {
+                unReportedDeptNames.forEach((reportDate, deptList) -> {
+                    IotRyDailyReportStatisticsVO dailyReportVO = new IotRyDailyReportStatisticsVO();
+                    dailyReportVO.setReportDate(reportDate);
+                    dailyReportVO.setDeptNames(deptList.stream().collect(Collectors.joining(",")));
+                    dailyReportVO.setCount(deptList.size());
+                    results.add(dailyReportVO);
+                });
+                // 使用Comparator进行排序
+                results.sort(Comparator
+                        .comparing(IotRyDailyReportStatisticsVO::getReportDate,
+                                Comparator.nullsLast(Comparator.reverseOrder())));
+            }
+        }
+        return results;
+    }
+
     private List<IotDeviceDO> devices() {
         // 查询 瑞鹰158l 所有存在设备的队伍
         // 查询 瑞鹰 下所有部门
         Set<Long> ids = new HashSet<>();
-        ids = deptService.getChildDeptIdListFromCache(157l);
+        ids = deptService.getChildDeptIdListFromCache(158l);
         ids.add(158l);
         // 查询ids下包含的所有设备 设备对应的部门就是 小队全集
         IotDevicePageReqVO deviceReqVO = new IotDevicePageReqVO();