Merge remote-tracking branch 'origin/master'

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

@@ -114,4 +114,6 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_WEBTOPO_PROJECT_DEVICE_NOT_EXISTS = new ErrorCode(288, "组态项目关联设备不存在");
     ErrorCode IOT_WEBTOPO_DEVICE_SVGNODE_EXISTS = new ErrorCode(290, "组态-svg与设备绑定已经存在");
     ErrorCode IOT_DEVICE_ASSOCIATE_NOT_EXISTS = new ErrorCode(289, "设备关联表(如：瑞都主要设备)不存在");
+    ErrorCode IOT_RY_IMPROVE_DAILY_REPORT_NOT_EXISTS = new ErrorCode(300, "瑞鹰项目启动设备整改不存在");
+    ErrorCode IOT_RY_HI_DAILY_REPORT_NOT_EXISTS = new ErrorCode(400, "瑞鹰历史日报不存在");
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/config/PmsDataPermissionConfiguration.java

@@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.iotoperationmeeting.IotOperati
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotoperationmeetingdetail.IotOperationMeetingDetailDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrddailyreport.IotRdDailyReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrhdailyreport.IotRhDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreport.IotRyImproveDailyReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotsapstock.IotSapStockDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintenance.IotMaintenancePlanDO;
@@ -71,6 +72,7 @@ public class PmsDataPermissionConfiguration {
             rule.addDeptColumn(IotHazardDO.class, "dept_id");
             rule.addDeptColumn(IotOperationMeetingDO.class, "dept_id");
             rule.addDeptColumn(IotOperationMeetingDetailDO.class, "dept_id");
+            rule.addDeptColumn(IotRyImproveDailyReportDO.class, "dept_id");
             // user
 //            rule.addUserColumn(SupplierDO.class);
             rule.addUserColumn(AdminUserDO.class, "id");

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/constant/PmsConstants.java

@@ -31,6 +31,10 @@ public interface PmsConstants {
     String RY_XJ_DAILY_REPORT = "ryXjDailyReport";
     String RY_XJ_DAILY_REPORT_APPROVAL = "ryXjReportApproval";
 
+    // 瑞鹰 项目启动设备整改 日报
+    String RY_IMPROVE_DAILY_REPORT = "ryImproveDailyReport";
+    String RY_IMPROVE_DAILY_REPORT_APPROVAL = "ryImproveReportApproval";
+
     String MAINTAIN_OUT = "maintainOut";
     String MAINTAIN_OUT_TEMPLATE = "maintain-out";
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryhidailyreport/IotRyHiDailyReportController.java

@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport;
+
+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.iotryhidailyreport.vo.IotRyHiDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport.vo.IotRyHiDailyReportRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport.vo.IotRyHiDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryhidailyreport.IotRyHiDailyReportDO;
+import cn.iocoder.yudao.module.pms.service.iotryhidailyreport.IotRyHiDailyReportService;
+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-ry-hi-daily-report")
+@Validated
+public class IotRyHiDailyReportController {
+
+    @Resource
+    private IotRyHiDailyReportService iotRyHiDailyReportService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建瑞鹰历史日报")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-hi-daily-report:create')")
+    public CommonResult<Long> createIotRyHiDailyReport(@Valid @RequestBody IotRyHiDailyReportSaveReqVO createReqVO) {
+        return success(iotRyHiDailyReportService.createIotRyHiDailyReport(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新瑞鹰历史日报")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-hi-daily-report:update')")
+    public CommonResult<Boolean> updateIotRyHiDailyReport(@Valid @RequestBody IotRyHiDailyReportSaveReqVO updateReqVO) {
+        iotRyHiDailyReportService.updateIotRyHiDailyReport(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除瑞鹰历史日报")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-hi-daily-report:delete')")
+    public CommonResult<Boolean> deleteIotRyHiDailyReport(@RequestParam("id") Long id) {
+        iotRyHiDailyReportService.deleteIotRyHiDailyReport(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得瑞鹰历史日报")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-hi-daily-report:query')")
+    public CommonResult<IotRyHiDailyReportRespVO> getIotRyHiDailyReport(@RequestParam("id") Long id) {
+        IotRyHiDailyReportDO iotRyHiDailyReport = iotRyHiDailyReportService.getIotRyHiDailyReport(id);
+        return success(BeanUtils.toBean(iotRyHiDailyReport, IotRyHiDailyReportRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得瑞鹰历史日报分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-hi-daily-report:query')")
+    public CommonResult<PageResult<IotRyHiDailyReportRespVO>> getIotRyHiDailyReportPage(@Valid IotRyHiDailyReportPageReqVO pageReqVO) {
+        PageResult<IotRyHiDailyReportDO> pageResult = iotRyHiDailyReportService.getIotRyHiDailyReportPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotRyHiDailyReportRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出瑞鹰历史日报 Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-hi-daily-report:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotRyHiDailyReportExcel(@Valid IotRyHiDailyReportPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotRyHiDailyReportDO> list = iotRyHiDailyReportService.getIotRyHiDailyReportPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "瑞鹰历史日报.xls", "数据", IotRyHiDailyReportRespVO.class,
+                        BeanUtils.toBean(list, IotRyHiDailyReportRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryhidailyreport/vo/IotRyHiDailyReportPageReqVO.java

@@ -0,0 +1,236 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport.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.math.BigDecimal;
+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 IotRyHiDailyReportPageReqVO extends PageParam {
+
+    @Schema(description = "施工队伍id", example = "23688")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "7727")
+    private Long projectId;
+
+    @Schema(description = "项目名称", example = "芋艿")
+    private String projectName;
+
+    @Schema(description = "任务id", example = "20686")
+    private Long taskId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "搬迁安装天数(D)")
+    private BigDecimal relocationDays;
+
+    @Schema(description = "上井次完井时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] latestWellDoneTime;
+
+    @Schema(description = "当前井深(m)")
+    private BigDecimal currentDepth;
+
+    @Schema(description = "日进尺(m)")
+    private BigDecimal dailyFootage;
+
+    @Schema(description = "月进尺(m)")
+    private BigDecimal monthlyFootage;
+
+    @Schema(description = "年累计进尺(m)")
+    private BigDecimal annualFootage;
+
+    @Schema(description = "当月完井数(井次) 修井")
+    private BigDecimal monthlyWellCompletions;
+
+    @Schema(description = "累计完井数(井次) 修井")
+    private BigDecimal totalCompletedWells;
+
+    @Schema(description = "累计施工井数")
+    private BigDecimal totalConstructionWells;
+
+    @Schema(description = "当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "当月用电量(kWh)")
+    private BigDecimal monthlyPowerUsage;
+
+    @Schema(description = "当日油耗(L)")
+    private BigDecimal dailyFuel;
+
+    @Schema(description = "当月油耗(吨)")
+    private BigDecimal monthlyFuel;
+
+    @Schema(description = "当日上油数量(吨)")
+    private BigDecimal dailyOilVolume;
+
+    @Schema(description = "柴油剩余数量(吨)")
+    private BigDecimal remainDieselVolume;
+
+    @Schema(description = "生产时间(H) 修井")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] productionTime;
+
+    @Schema(description = "非生产时间(H)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] nonProductionTime;
+
+    @Schema(description = "非生产时间原因", example = "不喜欢")
+    private String ryNptReason;
+
+    @Schema(description = "进尺工作时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] drillingWorkingTime;
+
+    @Schema(description = "其它生产时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] otherProductionTime;
+
+    @Schema(description = "事故非生产时间(工程质量)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] accidentTime;
+
+    @Schema(description = "修理非生产时间(设备故障)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] repairTime;
+
+    @Schema(description = "自停非生产时间(设备保养)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] selfStopTime;
+
+    @Schema(description = "复杂非生产时间(技术受限)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] complexityTime;
+
+    @Schema(description = "搬迁非生产时间(生产配合)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] relocationTime;
+
+    @Schema(description = "整改非生产时间(生产组织)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] rectificationTime;
+
+    @Schema(description = "等停非生产时间(不可抗力)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] waitingStopTime;
+
+    @Schema(description = "冬休非生产时间(待命)T")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] winterBreakTime;
+
+    @Schema(description = "甲方设计-非生产时间")
+    private BigDecimal partyaDesign;
+
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+
+    @Schema(description = "其它非生产时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] otherNptTime;
+
+    @Schema(description = "其它非生产时间原因", example = "不喜欢")
+    private String otherNptReason;
+
+    @Schema(description = "施工开始日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] constructionEndDate;
+
+    @Schema(description = "当日生产情况生产动态", example = "2")
+    private String productionStatus;
+
+    @Schema(description = "目前工序")
+    private String currentOperation;
+
+    @Schema(description = "下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工简报")
+    private String constructionBrief;
+
+    @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
+    private String rigStatus;
+
+    @Schema(description = "修井施工状态", example = "2")
+    private String repairStatus;
+
+    @Schema(description = "人员情况")
+    private String personnel;
+
+    @Schema(description = "全员数量")
+    private BigDecimal totalStaffNum;
+
+    @Schema(description = "休假人员数量")
+    private BigDecimal leaveStaffNum;
+
+    @Schema(description = "泥浆性能-密度(g/cm³)")
+    private BigDecimal mudDensity;
+
+    @Schema(description = "泥浆性能-粘度(S)")
+    private BigDecimal mudViscosity;
+
+    @Schema(description = "水平段长度(m) 适用于水平井")
+    private BigDecimal lateralLength;
+
+    @Schema(description = "井斜(°)")
+    private BigDecimal wellInclination;
+
+    @Schema(description = "方位(°)")
+    private BigDecimal azimuth;
+
+    @Schema(description = "白班跟班干部(人员id集合)")
+    private String dayShiftSupervisor;
+
+    @Schema(description = "白班跟班干部名称(人员名称集合)")
+    private String daySupervisors;
+
+    @Schema(description = "夜班跟班干部(人员id集合)")
+    private String nightShiftSupervisor;
+
+    @Schema(description = "夜班跟班干部名称(人员名称集合)")
+    private String nightSupervisors;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "1")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "5635")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "2")
+    private Integer auditStatus;
+
+    @Schema(description = "审批意见")
+    private String opinion;
+
+    @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/iotryhidailyreport/vo/IotRyHiDailyReportRespVO.java

@@ -0,0 +1,284 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport.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.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 瑞鹰历史日报 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotRyHiDailyReportRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8410")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "23688")
+    @ExcelProperty("施工队伍id")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "7727")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "项目名称", example = "芋艿")
+    @ExcelProperty("项目名称")
+    private String projectName;
+
+    @Schema(description = "任务id", example = "20686")
+    @ExcelProperty("任务id")
+    private Long taskId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    @ExcelProperty("项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "搬迁安装天数(D)")
+    @ExcelProperty("搬迁安装天数(D)")
+    private BigDecimal relocationDays;
+
+    @Schema(description = "上井次完井时间")
+    @ExcelProperty("上井次完井时间")
+    private LocalDateTime latestWellDoneTime;
+
+    @Schema(description = "当前井深(m)")
+    @ExcelProperty("当前井深(m)")
+    private BigDecimal currentDepth;
+
+    @Schema(description = "日进尺(m)")
+    @ExcelProperty("日进尺(m)")
+    private BigDecimal dailyFootage;
+
+    @Schema(description = "月进尺(m)")
+    @ExcelProperty("月进尺(m)")
+    private BigDecimal monthlyFootage;
+
+    @Schema(description = "年累计进尺(m)")
+    @ExcelProperty("年累计进尺(m)")
+    private BigDecimal annualFootage;
+
+    @Schema(description = "当月完井数(井次) 修井")
+    @ExcelProperty("当月完井数(井次) 修井")
+    private BigDecimal monthlyWellCompletions;
+
+    @Schema(description = "累计完井数(井次) 修井")
+    @ExcelProperty("累计完井数(井次) 修井")
+    private BigDecimal totalCompletedWells;
+
+    @Schema(description = "累计施工井数")
+    @ExcelProperty("累计施工井数")
+    private BigDecimal totalConstructionWells;
+
+    @Schema(description = "当日用电量(kWh)")
+    @ExcelProperty("当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "当月用电量(kWh)")
+    @ExcelProperty("当月用电量(kWh)")
+    private BigDecimal monthlyPowerUsage;
+
+    @Schema(description = "当日油耗(L)")
+    @ExcelProperty("当日油耗(L)")
+    private BigDecimal dailyFuel;
+
+    @Schema(description = "当月油耗(吨)")
+    @ExcelProperty("当月油耗(吨)")
+    private BigDecimal monthlyFuel;
+
+    @Schema(description = "当日上油数量(吨)")
+    @ExcelProperty("当日上油数量(吨)")
+    private BigDecimal dailyOilVolume;
+
+    @Schema(description = "柴油剩余数量(吨)")
+    @ExcelProperty("柴油剩余数量(吨)")
+    private BigDecimal remainDieselVolume;
+
+    @Schema(description = "生产时间(H) 修井")
+    @ExcelProperty("生产时间(H) 修井")
+    private BigDecimal productionTime;
+
+    @Schema(description = "非生产时间(H)")
+    @ExcelProperty("非生产时间(H)")
+    private BigDecimal nonProductionTime;
+
+    @Schema(description = "非生产时间原因", example = "不喜欢")
+    @ExcelProperty("非生产时间原因")
+    private String ryNptReason;
+
+    @Schema(description = "进尺工作时间")
+    @ExcelProperty("进尺工作时间")
+    private BigDecimal drillingWorkingTime;
+
+    @Schema(description = "其它生产时间")
+    @ExcelProperty("其它生产时间")
+    private BigDecimal otherProductionTime;
+
+    @Schema(description = "事故非生产时间(工程质量)")
+    @ExcelProperty("事故非生产时间(工程质量)")
+    private BigDecimal accidentTime;
+
+    @Schema(description = "修理非生产时间(设备故障)")
+    @ExcelProperty("修理非生产时间(设备故障)")
+    private BigDecimal repairTime;
+
+    @Schema(description = "自停非生产时间(设备保养)")
+    @ExcelProperty("自停非生产时间(设备保养)")
+    private BigDecimal selfStopTime;
+
+    @Schema(description = "复杂非生产时间(技术受限)")
+    @ExcelProperty("复杂非生产时间(技术受限)")
+    private BigDecimal complexityTime;
+
+    @Schema(description = "搬迁非生产时间(生产配合)")
+    @ExcelProperty("搬迁非生产时间(生产配合)")
+    private BigDecimal relocationTime;
+
+    @Schema(description = "整改非生产时间(生产组织)")
+    @ExcelProperty("整改非生产时间(生产组织)")
+    private BigDecimal rectificationTime;
+
+    @Schema(description = "等停非生产时间(不可抗力)")
+    @ExcelProperty("等停非生产时间(不可抗力)")
+    private BigDecimal waitingStopTime;
+
+    @Schema(description = "冬休非生产时间(待命)T")
+    @ExcelProperty("冬休非生产时间(待命)T")
+    private BigDecimal winterBreakTime;
+
+    @Schema(description = "甲方设计-非生产时间")
+    @ExcelProperty("甲方设计-非生产时间")
+    private BigDecimal partyaDesign;
+
+    @Schema(description = "甲方准备-非生产时间")
+    @ExcelProperty("甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+
+    @Schema(description = "甲方资源-非生产时间")
+    @ExcelProperty("甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+
+    @Schema(description = "其它非生产时间")
+    @ExcelProperty("其它非生产时间")
+    private BigDecimal otherNptTime;
+
+    @Schema(description = "其它非生产时间原因", example = "不喜欢")
+    @ExcelProperty("其它非生产时间原因")
+    private String otherNptReason;
+
+    @Schema(description = "施工开始日期")
+    @ExcelProperty("施工开始日期")
+    private LocalDateTime constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    @ExcelProperty("施工结束日期")
+    private LocalDateTime constructionEndDate;
+
+    @Schema(description = "当日生产情况生产动态", example = "2")
+    @ExcelProperty("当日生产情况生产动态")
+    private String productionStatus;
+
+    @Schema(description = "目前工序")
+    @ExcelProperty("目前工序")
+    private String currentOperation;
+
+    @Schema(description = "下步工作计划")
+    @ExcelProperty("下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工简报")
+    @ExcelProperty("施工简报")
+    private String constructionBrief;
+
+    @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
+    @ExcelProperty("施工状态(动迁 准备 施工 完工)")
+    private String rigStatus;
+
+    @Schema(description = "修井施工状态", example = "2")
+    @ExcelProperty("修井施工状态")
+    private String repairStatus;
+
+    @Schema(description = "人员情况")
+    @ExcelProperty("人员情况")
+    private String personnel;
+
+    @Schema(description = "全员数量")
+    @ExcelProperty("全员数量")
+    private BigDecimal totalStaffNum;
+
+    @Schema(description = "休假人员数量")
+    @ExcelProperty("休假人员数量")
+    private BigDecimal leaveStaffNum;
+
+    @Schema(description = "泥浆性能-密度(g/cm³)")
+    @ExcelProperty("泥浆性能-密度(g/cm³)")
+    private BigDecimal mudDensity;
+
+    @Schema(description = "泥浆性能-粘度(S)")
+    @ExcelProperty("泥浆性能-粘度(S)")
+    private BigDecimal mudViscosity;
+
+    @Schema(description = "水平段长度(m) 适用于水平井")
+    @ExcelProperty("水平段长度(m) 适用于水平井")
+    private BigDecimal lateralLength;
+
+    @Schema(description = "井斜(°)")
+    @ExcelProperty("井斜(°)")
+    private BigDecimal wellInclination;
+
+    @Schema(description = "方位(°)")
+    @ExcelProperty("方位(°)")
+    private BigDecimal azimuth;
+
+    @Schema(description = "白班跟班干部(人员id集合)")
+    @ExcelProperty("白班跟班干部(人员id集合)")
+    private String dayShiftSupervisor;
+
+    @Schema(description = "白班跟班干部名称(人员名称集合)")
+    @ExcelProperty("白班跟班干部名称(人员名称集合)")
+    private String daySupervisors;
+
+    @Schema(description = "夜班跟班干部(人员id集合)")
+    @ExcelProperty("夜班跟班干部(人员id集合)")
+    private String nightShiftSupervisor;
+
+    @Schema(description = "夜班跟班干部名称(人员名称集合)")
+    @ExcelProperty("夜班跟班干部名称(人员名称集合)")
+    private String nightSupervisors;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    @ExcelProperty("不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    @ExcelProperty("排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "1")
+    @ExcelProperty("状态(0启用 1禁用)")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "5635")
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "2")
+    @ExcelProperty("审批状态 未提交、审批中、审批通过、审批不通过、已取消")
+    private Integer auditStatus;
+
+    @Schema(description = "审批意见")
+    @ExcelProperty("审批意见")
+    private String opinion;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryhidailyreport/vo/IotRyHiDailyReportSaveReqVO.java

@@ -0,0 +1,211 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 瑞鹰历史日报新增/修改 Request VO")
+@Data
+public class IotRyHiDailyReportSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8410")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "23688")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "7727")
+    private Long projectId;
+
+    @Schema(description = "项目名称", example = "芋艿")
+    private String projectName;
+
+    @Schema(description = "任务id", example = "20686")
+    private Long taskId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "搬迁安装天数(D)")
+    private BigDecimal relocationDays;
+
+    @Schema(description = "上井次完井时间")
+    private LocalDateTime latestWellDoneTime;
+
+    @Schema(description = "当前井深(m)")
+    private BigDecimal currentDepth;
+
+    @Schema(description = "日进尺(m)")
+    private BigDecimal dailyFootage;
+
+    @Schema(description = "月进尺(m)")
+    private BigDecimal monthlyFootage;
+
+    @Schema(description = "年累计进尺(m)")
+    private BigDecimal annualFootage;
+
+    @Schema(description = "当月完井数(井次) 修井")
+    private BigDecimal monthlyWellCompletions;
+
+    @Schema(description = "累计完井数(井次) 修井")
+    private BigDecimal totalCompletedWells;
+
+    @Schema(description = "累计施工井数")
+    private BigDecimal totalConstructionWells;
+
+    @Schema(description = "当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "当月用电量(kWh)")
+    private BigDecimal monthlyPowerUsage;
+
+    @Schema(description = "当日油耗(L)")
+    private BigDecimal dailyFuel;
+
+    @Schema(description = "当月油耗(吨)")
+    private BigDecimal monthlyFuel;
+
+    @Schema(description = "当日上油数量(吨)")
+    private BigDecimal dailyOilVolume;
+
+    @Schema(description = "柴油剩余数量(吨)")
+    private BigDecimal remainDieselVolume;
+
+    @Schema(description = "生产时间(H) 修井")
+    private BigDecimal productionTime;
+
+    @Schema(description = "非生产时间(H)")
+    private BigDecimal nonProductionTime;
+
+    @Schema(description = "非生产时间原因", example = "不喜欢")
+    private String ryNptReason;
+
+    @Schema(description = "进尺工作时间")
+    private BigDecimal drillingWorkingTime;
+
+    @Schema(description = "其它生产时间")
+    private BigDecimal otherProductionTime;
+
+    @Schema(description = "事故非生产时间(工程质量)")
+    private BigDecimal accidentTime;
+
+    @Schema(description = "修理非生产时间(设备故障)")
+    private BigDecimal repairTime;
+
+    @Schema(description = "自停非生产时间(设备保养)")
+    private BigDecimal selfStopTime;
+
+    @Schema(description = "复杂非生产时间(技术受限)")
+    private BigDecimal complexityTime;
+
+    @Schema(description = "搬迁非生产时间(生产配合)")
+    private BigDecimal relocationTime;
+
+    @Schema(description = "整改非生产时间(生产组织)")
+    private BigDecimal rectificationTime;
+
+    @Schema(description = "等停非生产时间(不可抗力)")
+    private BigDecimal waitingStopTime;
+
+    @Schema(description = "冬休非生产时间(待命)T")
+    private BigDecimal winterBreakTime;
+
+    @Schema(description = "甲方设计-非生产时间")
+    private BigDecimal partyaDesign;
+
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+
+    @Schema(description = "其它非生产时间")
+    private BigDecimal otherNptTime;
+
+    @Schema(description = "其它非生产时间原因", example = "不喜欢")
+    private String otherNptReason;
+
+    @Schema(description = "施工开始日期")
+    private LocalDateTime constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    private LocalDateTime constructionEndDate;
+
+    @Schema(description = "当日生产情况生产动态", example = "2")
+    private String productionStatus;
+
+    @Schema(description = "目前工序")
+    private String currentOperation;
+
+    @Schema(description = "下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工简报")
+    private String constructionBrief;
+
+    @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
+    private String rigStatus;
+
+    @Schema(description = "修井施工状态", example = "2")
+    private String repairStatus;
+
+    @Schema(description = "人员情况")
+    private String personnel;
+
+    @Schema(description = "全员数量")
+    private BigDecimal totalStaffNum;
+
+    @Schema(description = "休假人员数量")
+    private BigDecimal leaveStaffNum;
+
+    @Schema(description = "泥浆性能-密度(g/cm³)")
+    private BigDecimal mudDensity;
+
+    @Schema(description = "泥浆性能-粘度(S)")
+    private BigDecimal mudViscosity;
+
+    @Schema(description = "水平段长度(m) 适用于水平井")
+    private BigDecimal lateralLength;
+
+    @Schema(description = "井斜(°)")
+    private BigDecimal wellInclination;
+
+    @Schema(description = "方位(°)")
+    private BigDecimal azimuth;
+
+    @Schema(description = "白班跟班干部(人员id集合)")
+    private String dayShiftSupervisor;
+
+    @Schema(description = "白班跟班干部名称(人员名称集合)")
+    private String daySupervisors;
+
+    @Schema(description = "夜班跟班干部(人员id集合)")
+    private String nightShiftSupervisor;
+
+    @Schema(description = "夜班跟班干部名称(人员名称集合)")
+    private String nightSupervisors;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "1")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "5635")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "2")
+    private Integer auditStatus;
+
+    @Schema(description = "审批意见")
+    private String opinion;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreport/IotRyImproveDailyReportController.java

@@ -0,0 +1,130 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport;
+
+import cn.hutool.core.collection.CollUtil;
+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.iotryimprovedailyreport.vo.IotRyImproveDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreport.IotRyImproveDailyReportDO;
+import cn.iocoder.yudao.module.pms.service.iotryimprovedailyreport.IotRyImproveDailyReportService;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+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.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+
+@Tag(name = "管理后台 - 瑞鹰项目启动设备整改")
+@RestController
+@RequestMapping("/pms/iot-ry-improve-daily-report")
+@Validated
+public class IotRyImproveDailyReportController {
+
+    @Resource
+    private IotRyImproveDailyReportService iotRyImproveDailyReportService;
+    @Resource
+    private DeptService deptService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建瑞鹰项目启动设备整改")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:create')")
+    public CommonResult<Long> createIotRyImproveDailyReport(@Valid @RequestBody IotRyImproveDailyReportSaveReqVO createReqVO) {
+        return success(iotRyImproveDailyReportService.createIotRyImproveDailyReport(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新瑞鹰项目启动设备整改")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:update')")
+    public CommonResult<Boolean> updateIotRyImproveDailyReport(@Valid @RequestBody IotRyImproveDailyReportSaveReqVO updateReqVO) {
+        iotRyImproveDailyReportService.updateIotRyImproveDailyReport(updateReqVO);
+        return success(true);
+    }
+
+    @PutMapping("/approval")
+    @Operation(summary = "审批日报")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:update')")
+    public CommonResult<Boolean> approvalImproveDailyReport(@Valid @RequestBody IotRyImproveDailyReportSaveReqVO updateReqVO) {
+        iotRyImproveDailyReportService.approvalImproveDailyReport(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除瑞鹰项目启动设备整改")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:delete')")
+    public CommonResult<Boolean> deleteIotRyImproveDailyReport(@RequestParam("id") Long id) {
+        iotRyImproveDailyReportService.deleteIotRyImproveDailyReport(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得瑞鹰项目启动设备整改")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:query')")
+    public CommonResult<IotRyImproveDailyReportRespVO> getIotRyImproveDailyReport(@RequestParam("id") Long id) {
+        IotRyImproveDailyReportDO iotRyImproveDailyReport = iotRyImproveDailyReportService.getIotRyImproveDailyReport(id);
+        return success(BeanUtils.toBean(iotRyImproveDailyReport, IotRyImproveDailyReportRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得瑞鹰项目启动设备整改分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:query')")
+    public CommonResult<PageResult<IotRyImproveDailyReportRespVO>> getIotRyImproveDailyReportPage(@Valid IotRyImproveDailyReportPageReqVO pageReqVO) {
+        PageResult<IotRyImproveDailyReportDO> pageResult = iotRyImproveDailyReportService.getIotRyImproveDailyReportPage(pageReqVO);
+        return success(new PageResult<>(buildRyDailyReports(pageResult.getList()), pageResult.getTotal()));
+        // return success(BeanUtils.toBean(pageResult, IotRyImproveDailyReportRespVO.class));
+    }
+
+    /**
+     * 瑞恒日报分页 设置关联查询信息
+     * @param reports
+     * @return
+     */
+    private List<IotRyImproveDailyReportRespVO> buildRyDailyReports(List<IotRyImproveDailyReportDO> reports) {
+        if (CollUtil.isEmpty(reports)) {
+            return Collections.emptyList();
+        }
+        // 设备部门信息
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(convertList(reports, IotRyImproveDailyReportDO::getDeptId));
+        // 2. 拼接数据
+        return BeanUtils.toBean(reports, IotRyImproveDailyReportRespVO.class, (reportVO) -> {
+            // 2.1 拼接部门信息
+            findAndThen(deptMap, reportVO.getDeptId(), dept -> reportVO.setDeptName(dept.getName()));
+
+        });
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出瑞鹰项目启动设备整改 Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotRyImproveDailyReportExcel(@Valid IotRyImproveDailyReportPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotRyImproveDailyReportDO> list = iotRyImproveDailyReportService.getIotRyImproveDailyReportPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "瑞鹰项目启动设备整改.xls", "数据", IotRyImproveDailyReportRespVO.class,
+                        BeanUtils.toBean(list, IotRyImproveDailyReportRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreport/vo/IotRyImproveDailyReportPageReqVO.java

@@ -0,0 +1,246 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.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.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Collection;
+
+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 IotRyImproveDailyReportPageReqVO extends PageParam {
+
+    @Schema(description = "施工队伍id", example = "32628")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "27813")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "32645")
+    private Long taskId;
+
+    @Schema(description = "日报标题")
+    private String title;
+
+    @Schema(description = "施工地点")
+    private String workLocation;
+
+    @Schema(description = "施工目的")
+    private String workPurpose;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "安全作业天数(D)")
+    private BigDecimal relocationDays;
+
+    @Schema(description = "上井次完井时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] latestWellDoneTime;
+
+    @Schema(description = "当前井深(m)")
+    private BigDecimal currentDepth;
+
+    @Schema(description = "日进尺(m)")
+    private BigDecimal dailyFootage;
+
+    @Schema(description = "月进尺(m)")
+    private BigDecimal monthlyFootage;
+
+    @Schema(description = "年累计进尺(m)")
+    private BigDecimal annualFootage;
+
+    @Schema(description = "当月完井数(井次) 修井")
+    private BigDecimal monthlyWellCompletions;
+
+    @Schema(description = "累计完井数(井次) 修井")
+    private BigDecimal totalCompletedWells;
+
+    @Schema(description = "当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "当月用电量(kWh)")
+    private BigDecimal monthlyPowerUsage;
+
+    @Schema(description = "当日油耗(L)")
+    private BigDecimal dailyFuel;
+
+    @Schema(description = "当月油耗(吨)")
+    private BigDecimal monthlyFuel;
+
+    @Schema(description = "当日上油数量(吨)")
+    private BigDecimal dailyOilVolume;
+
+    @Schema(description = "柴油剩余数量(吨)")
+    private BigDecimal remainDieselVolume;
+
+    @Schema(description = "生产时间(H) 修井")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] productionTime;
+
+    @Schema(description = "非生产时间(H)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] nonProductionTime;
+
+    @Schema(description = "非生产时间原因", example = "不好")
+    private String ryNptReason;
+
+    @Schema(description = "进尺工作时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] drillingWorkingTime;
+
+    @Schema(description = "其它生产时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] otherProductionTime;
+
+    @Schema(description = "事故非生产时间(工程质量)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] accidentTime;
+
+    @Schema(description = "修理非生产时间(设备故障)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] repairTime;
+
+    @Schema(description = "自停非生产时间(设备保养)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] selfStopTime;
+
+    @Schema(description = "复杂非生产时间(技术受限)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] complexityTime;
+
+    @Schema(description = "搬迁非生产时间(生产配合)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] relocationTime;
+
+    @Schema(description = "整改非生产时间(生产组织)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] rectificationTime;
+
+    @Schema(description = "等停非生产时间(不可抗力)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] waitingStopTime;
+
+    @Schema(description = "冬休非生产时间(待命)T")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] winterBreakTime;
+
+    @Schema(description = "甲方设计-非生产时间")
+    private BigDecimal partyaDesign;
+
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+
+    @Schema(description = "其它非生产时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] otherNptTime;
+
+    @Schema(description = "其它非生产时间原因", example = "不喜欢")
+    private String otherNptReason;
+
+    @Schema(description = "施工开始日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] constructionEndDate;
+
+    @Schema(description = "当日生产情况生产动态", example = "1")
+    private String productionStatus;
+
+    @Schema(description = "目前工序")
+    private String currentOperation;
+
+    @Schema(description = "下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工简报")
+    private String constructionBrief;
+
+    @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
+    private String rigStatus;
+
+    @Schema(description = "修井施工状态", example = "1")
+    private String repairStatus;
+
+    @Schema(description = "人员情况")
+    private String personnel;
+
+    @Schema(description = "全员数量")
+    private BigDecimal totalStaffNum;
+
+    @Schema(description = "休假人员数量")
+    private BigDecimal leaveStaffNum;
+
+    @Schema(description = "泥浆性能-密度(g/cm³)")
+    private BigDecimal mudDensity;
+
+    @Schema(description = "泥浆性能-粘度(S)")
+    private BigDecimal mudViscosity;
+
+    @Schema(description = "水平段长度(m) 适用于水平井")
+    private BigDecimal lateralLength;
+
+    @Schema(description = "井斜(°)")
+    private BigDecimal wellInclination;
+
+    @Schema(description = "方位(°)")
+    private BigDecimal azimuth;
+
+    @Schema(description = "白班跟班干部(人员id集合)")
+    private String dayShiftSupervisor;
+
+    @Schema(description = "白班跟班干部名称(人员名称集合)")
+    private String daySupervisors;
+
+    @Schema(description = "夜班跟班干部(人员id集合)")
+    private String nightShiftSupervisor;
+
+    @Schema(description = "夜班跟班干部名称(人员名称集合)")
+    private String nightSupervisors;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "1")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "19840")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    private Integer auditStatus;
+
+    @Schema(description = "审批意见")
+    private String opinion;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "部门id集合")
+    private Collection<Long> deptIds;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreport/vo/IotRyImproveDailyReportRespVO.java

@@ -0,0 +1,294 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.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.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 瑞鹰项目启动设备整改 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotRyImproveDailyReportRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21624")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "32628")
+    @ExcelProperty("施工队伍id")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "27813")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "32645")
+    @ExcelProperty("任务id")
+    private Long taskId;
+
+    @Schema(description = "日报标题")
+    @ExcelProperty("日报标题")
+    private String title;
+
+    @Schema(description = "施工地点")
+    @ExcelProperty("施工地点")
+    private String workLocation;
+
+    @Schema(description = "施工目的")
+    @ExcelProperty("施工目的")
+    private String workPurpose;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    @ExcelProperty("项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "安全作业天数(D)")
+    @ExcelProperty("安全作业天数(D)")
+    private BigDecimal relocationDays;
+
+    @Schema(description = "上井次完井时间")
+    @ExcelProperty("上井次完井时间")
+    private LocalDateTime latestWellDoneTime;
+
+    @Schema(description = "当前井深(m)")
+    @ExcelProperty("当前井深(m)")
+    private BigDecimal currentDepth;
+
+    @Schema(description = "日进尺(m)")
+    @ExcelProperty("日进尺(m)")
+    private BigDecimal dailyFootage;
+
+    @Schema(description = "月进尺(m)")
+    @ExcelProperty("月进尺(m)")
+    private BigDecimal monthlyFootage;
+
+    @Schema(description = "年累计进尺(m)")
+    @ExcelProperty("年累计进尺(m)")
+    private BigDecimal annualFootage;
+
+    @Schema(description = "当月完井数(井次) 修井")
+    @ExcelProperty("当月完井数(井次) 修井")
+    private BigDecimal monthlyWellCompletions;
+
+    @Schema(description = "累计完井数(井次) 修井")
+    @ExcelProperty("累计完井数(井次) 修井")
+    private BigDecimal totalCompletedWells;
+
+    @Schema(description = "当日用电量(kWh)")
+    @ExcelProperty("当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "当月用电量(kWh)")
+    @ExcelProperty("当月用电量(kWh)")
+    private BigDecimal monthlyPowerUsage;
+
+    @Schema(description = "当日油耗(L)")
+    @ExcelProperty("当日油耗(L)")
+    private BigDecimal dailyFuel;
+
+    @Schema(description = "当月油耗(吨)")
+    @ExcelProperty("当月油耗(吨)")
+    private BigDecimal monthlyFuel;
+
+    @Schema(description = "当日上油数量(吨)")
+    @ExcelProperty("当日上油数量(吨)")
+    private BigDecimal dailyOilVolume;
+
+    @Schema(description = "柴油剩余数量(吨)")
+    @ExcelProperty("柴油剩余数量(吨)")
+    private BigDecimal remainDieselVolume;
+
+    @Schema(description = "生产时间(H) 修井")
+    @ExcelProperty("生产时间(H) 修井")
+    private BigDecimal productionTime;
+
+    @Schema(description = "非生产时间(H)")
+    @ExcelProperty("非生产时间(H)")
+    private BigDecimal nonProductionTime;
+
+    @Schema(description = "非生产时间原因", example = "不好")
+    @ExcelProperty("非生产时间原因")
+    private String ryNptReason;
+
+    @Schema(description = "进尺工作时间")
+    @ExcelProperty("进尺工作时间")
+    private BigDecimal drillingWorkingTime;
+
+    @Schema(description = "其它生产时间")
+    @ExcelProperty("其它生产时间")
+    private BigDecimal otherProductionTime;
+
+    @Schema(description = "事故非生产时间(工程质量)")
+    @ExcelProperty("事故非生产时间(工程质量)")
+    private BigDecimal accidentTime;
+
+    @Schema(description = "修理非生产时间(设备故障)")
+    @ExcelProperty("修理非生产时间(设备故障)")
+    private BigDecimal repairTime;
+
+    @Schema(description = "自停非生产时间(设备保养)")
+    @ExcelProperty("自停非生产时间(设备保养)")
+    private BigDecimal selfStopTime;
+
+    @Schema(description = "复杂非生产时间(技术受限)")
+    @ExcelProperty("复杂非生产时间(技术受限)")
+    private BigDecimal complexityTime;
+
+    @Schema(description = "搬迁非生产时间(生产配合)")
+    @ExcelProperty("搬迁非生产时间(生产配合)")
+    private BigDecimal relocationTime;
+
+    @Schema(description = "整改非生产时间(生产组织)")
+    @ExcelProperty("整改非生产时间(生产组织)")
+    private BigDecimal rectificationTime;
+
+    @Schema(description = "等停非生产时间(不可抗力)")
+    @ExcelProperty("等停非生产时间(不可抗力)")
+    private BigDecimal waitingStopTime;
+
+    @Schema(description = "冬休非生产时间(待命)T")
+    @ExcelProperty("冬休非生产时间(待命)T")
+    private BigDecimal winterBreakTime;
+
+    @Schema(description = "甲方设计-非生产时间")
+    @ExcelProperty("甲方设计-非生产时间")
+    private BigDecimal partyaDesign;
+
+    @Schema(description = "甲方准备-非生产时间")
+    @ExcelProperty("甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+
+    @Schema(description = "甲方资源-非生产时间")
+    @ExcelProperty("甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+
+    @Schema(description = "其它非生产时间")
+    @ExcelProperty("其它非生产时间")
+    private BigDecimal otherNptTime;
+
+    @Schema(description = "其它非生产时间原因", example = "不喜欢")
+    @ExcelProperty("其它非生产时间原因")
+    private String otherNptReason;
+
+    @Schema(description = "施工开始日期")
+    @ExcelProperty("施工开始日期")
+    private LocalDateTime constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    @ExcelProperty("施工结束日期")
+    private LocalDateTime constructionEndDate;
+
+    @Schema(description = "当日生产情况生产动态", example = "1")
+    @ExcelProperty("当日生产情况生产动态")
+    private String productionStatus;
+
+    @Schema(description = "目前工序")
+    @ExcelProperty("目前工序")
+    private String currentOperation;
+
+    @Schema(description = "下步工作计划")
+    @ExcelProperty("下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工简报")
+    @ExcelProperty("施工简报")
+    private String constructionBrief;
+
+    @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
+    @ExcelProperty("施工状态(动迁 准备 施工 完工)")
+    private String rigStatus;
+
+    @Schema(description = "修井施工状态", example = "1")
+    @ExcelProperty("修井施工状态")
+    private String repairStatus;
+
+    @Schema(description = "人员情况")
+    @ExcelProperty("人员情况")
+    private String personnel;
+
+    @Schema(description = "全员数量")
+    @ExcelProperty("全员数量")
+    private BigDecimal totalStaffNum;
+
+    @Schema(description = "休假人员数量")
+    @ExcelProperty("休假人员数量")
+    private BigDecimal leaveStaffNum;
+
+    @Schema(description = "泥浆性能-密度(g/cm³)")
+    @ExcelProperty("泥浆性能-密度(g/cm³)")
+    private BigDecimal mudDensity;
+
+    @Schema(description = "泥浆性能-粘度(S)")
+    @ExcelProperty("泥浆性能-粘度(S)")
+    private BigDecimal mudViscosity;
+
+    @Schema(description = "水平段长度(m) 适用于水平井")
+    @ExcelProperty("水平段长度(m) 适用于水平井")
+    private BigDecimal lateralLength;
+
+    @Schema(description = "井斜(°)")
+    @ExcelProperty("井斜(°)")
+    private BigDecimal wellInclination;
+
+    @Schema(description = "方位(°)")
+    @ExcelProperty("方位(°)")
+    private BigDecimal azimuth;
+
+    @Schema(description = "白班跟班干部(人员id集合)")
+    @ExcelProperty("白班跟班干部(人员id集合)")
+    private String dayShiftSupervisor;
+
+    @Schema(description = "白班跟班干部名称(人员名称集合)")
+    @ExcelProperty("白班跟班干部名称(人员名称集合)")
+    private String daySupervisors;
+
+    @Schema(description = "夜班跟班干部(人员id集合)")
+    @ExcelProperty("夜班跟班干部(人员id集合)")
+    private String nightShiftSupervisor;
+
+    @Schema(description = "夜班跟班干部名称(人员名称集合)")
+    @ExcelProperty("夜班跟班干部名称(人员名称集合)")
+    private String nightSupervisors;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    @ExcelProperty("不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    @ExcelProperty("排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "1")
+    @ExcelProperty("状态(0启用 1禁用)")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "19840")
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    @ExcelProperty("审批状态 未提交、审批中、审批通过、审批不通过、已取消")
+    private Integer auditStatus;
+
+    @Schema(description = "审批意见")
+    @ExcelProperty("审批意见")
+    private String opinion;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "部门名称")
+    @ExcelProperty("部门名称")
+    private String deptName;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreport/vo/IotRyImproveDailyReportSaveReqVO.java

@@ -0,0 +1,214 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 瑞鹰项目启动设备整改新增/修改 Request VO")
+@Data
+public class IotRyImproveDailyReportSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21624")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "32628")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "27813")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "32645")
+    private Long taskId;
+
+    @Schema(description = "日报标题")
+    private String title;
+
+    @Schema(description = "施工地点")
+    private String workLocation;
+
+    @Schema(description = "施工目的")
+    private String workPurpose;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "安全作业天数(D)")
+    private BigDecimal relocationDays;
+
+    @Schema(description = "上井次完井时间")
+    private LocalDateTime latestWellDoneTime;
+
+    @Schema(description = "当前井深(m)")
+    private BigDecimal currentDepth;
+
+    @Schema(description = "日进尺(m)")
+    private BigDecimal dailyFootage;
+
+    @Schema(description = "月进尺(m)")
+    private BigDecimal monthlyFootage;
+
+    @Schema(description = "年累计进尺(m)")
+    private BigDecimal annualFootage;
+
+    @Schema(description = "当月完井数(井次) 修井")
+    private BigDecimal monthlyWellCompletions;
+
+    @Schema(description = "累计完井数(井次) 修井")
+    private BigDecimal totalCompletedWells;
+
+    @Schema(description = "当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "当月用电量(kWh)")
+    private BigDecimal monthlyPowerUsage;
+
+    @Schema(description = "当日油耗(L)")
+    private BigDecimal dailyFuel;
+
+    @Schema(description = "当月油耗(吨)")
+    private BigDecimal monthlyFuel;
+
+    @Schema(description = "当日上油数量(吨)")
+    private BigDecimal dailyOilVolume;
+
+    @Schema(description = "柴油剩余数量(吨)")
+    private BigDecimal remainDieselVolume;
+
+    @Schema(description = "生产时间(H) 修井")
+    private BigDecimal productionTime;
+
+    @Schema(description = "非生产时间(H)")
+    private BigDecimal nonProductionTime;
+
+    @Schema(description = "非生产时间原因", example = "不好")
+    private String ryNptReason;
+
+    @Schema(description = "进尺工作时间")
+    private BigDecimal drillingWorkingTime;
+
+    @Schema(description = "其它生产时间")
+    private BigDecimal otherProductionTime;
+
+    @Schema(description = "事故非生产时间(工程质量)")
+    private BigDecimal accidentTime;
+
+    @Schema(description = "修理非生产时间(设备故障)")
+    private BigDecimal repairTime;
+
+    @Schema(description = "自停非生产时间(设备保养)")
+    private BigDecimal selfStopTime;
+
+    @Schema(description = "复杂非生产时间(技术受限)")
+    private BigDecimal complexityTime;
+
+    @Schema(description = "搬迁非生产时间(生产配合)")
+    private BigDecimal relocationTime;
+
+    @Schema(description = "整改非生产时间(生产组织)")
+    private BigDecimal rectificationTime;
+
+    @Schema(description = "等停非生产时间(不可抗力)")
+    private BigDecimal waitingStopTime;
+
+    @Schema(description = "冬休非生产时间(待命)T")
+    private BigDecimal winterBreakTime;
+
+    @Schema(description = "甲方设计-非生产时间")
+    private BigDecimal partyaDesign;
+
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+
+    @Schema(description = "其它非生产时间")
+    private BigDecimal otherNptTime;
+
+    @Schema(description = "其它非生产时间原因", example = "不喜欢")
+    private String otherNptReason;
+
+    @Schema(description = "施工开始日期")
+    private LocalDateTime constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    private LocalDateTime constructionEndDate;
+
+    @Schema(description = "当日生产情况生产动态", example = "1")
+    private String productionStatus;
+
+    @Schema(description = "目前工序")
+    private String currentOperation;
+
+    @Schema(description = "下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工简报")
+    private String constructionBrief;
+
+    @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
+    private String rigStatus;
+
+    @Schema(description = "修井施工状态", example = "1")
+    private String repairStatus;
+
+    @Schema(description = "人员情况")
+    private String personnel;
+
+    @Schema(description = "全员数量")
+    private BigDecimal totalStaffNum;
+
+    @Schema(description = "休假人员数量")
+    private BigDecimal leaveStaffNum;
+
+    @Schema(description = "泥浆性能-密度(g/cm³)")
+    private BigDecimal mudDensity;
+
+    @Schema(description = "泥浆性能-粘度(S)")
+    private BigDecimal mudViscosity;
+
+    @Schema(description = "水平段长度(m) 适用于水平井")
+    private BigDecimal lateralLength;
+
+    @Schema(description = "井斜(°)")
+    private BigDecimal wellInclination;
+
+    @Schema(description = "方位(°)")
+    private BigDecimal azimuth;
+
+    @Schema(description = "白班跟班干部(人员id集合)")
+    private String dayShiftSupervisor;
+
+    @Schema(description = "白班跟班干部名称(人员名称集合)")
+    private String daySupervisors;
+
+    @Schema(description = "夜班跟班干部(人员id集合)")
+    private String nightShiftSupervisor;
+
+    @Schema(description = "夜班跟班干部名称(人员名称集合)")
+    private String nightSupervisors;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "1")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "19840")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    private Integer auditStatus;
+
+    @Schema(description = "审批意见")
+    private String opinion;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -20,6 +20,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypePageR
 import cn.iocoder.yudao.module.pms.controller.admin.failure.vo.IotFailureReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.IotInspectOrderPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.plan.vo.IotInspectPlanPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociatePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicerunlog.vo.IotDeviceRunLogPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicerunlog.vo.IotDeviceRunLogRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderPageReqVO;
@@ -28,6 +29,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotrddailyreport.vo.IotRdDai
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrydailyreport.vo.IotRyDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrydailyreport.vo.IotRyDailyReportTaskCountVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport.vo.IotRyHiDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.*;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.DeviceVO;
@@ -41,11 +43,14 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDetailDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotcountdata.IotCountDataDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceassociate.IotDeviceAssociateDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmainworkorder.IotMainWorkOrderDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotoutbound.IotOutboundDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrddailyreport.IotRdDailyReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrhdailyreport.IotRhDailyReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrydailyreport.IotRyDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryhidailyreport.IotRyHiDailyReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotsapstock.IotSapStockDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
@@ -56,6 +61,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.failure.IotFailureReportMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDetailMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectPlanMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotdeviceassociate.IotDeviceAssociateMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicerunlog.IotDeviceRunLogMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmainworkorder.IotMainWorkOrderMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillMapper;
@@ -70,6 +76,7 @@ import cn.iocoder.yudao.module.pms.service.DeviceServiceImpl;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectOrderService;
 import cn.iocoder.yudao.module.pms.service.iotmainworkorder.IotMainWorkOrderService;
 import cn.iocoder.yudao.module.pms.service.iotrydailyreport.IotRyDailyReportService;
+import cn.iocoder.yudao.module.pms.service.iotryhidailyreport.IotRyHiDailyReportService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -177,6 +184,11 @@ public class IotStaticController {
     private DeptUtil deptUtil;
     @Autowired
     private IotMainWorkOrderService iotMainWorkOrderService;
+    @Autowired
+    private IotRyHiDailyReportService iotRyHiDailyReportService;
+    @Resource
+    private IotDeviceAssociateMapper iotDeviceAssociateMapper;
+
 
     @GetMapping("/main/day")
     public CommonResult<Map<String, Object>> getMaintainDay() {
@@ -1450,6 +1462,120 @@ public class IotStaticController {
 
     }
 
+    @Operation(summary = "瑞都 近1周的设备利用率")
+    @GetMapping("/rd/device/sevenDayUtilization")
+    @PermitAll
+    public CommonResult<Map<String, Object>> rdSevenDayUtilization() {
+
+        List<String> lastSevenDays = getLastSevenDays();
+        String first = lastSevenDays.get(0);
+        String last = lastSevenDays.get(lastSevenDays.size() - 1);
+        LocalDateTime startOfDay = getStartOfDay(last);
+        LocalDateTime endOfDay = getEndOfDay(first);
+        LocalDateTime[] createTime = new LocalDateTime[]{startOfDay, endOfDay};
+
+        IotRdDailyReportPageReqVO iotRdDailyReportPageReqVO = new IotRdDailyReportPageReqVO();
+        iotRdDailyReportPageReqVO.setCreateTime(createTime);
+        iotRdDailyReportPageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        PageResult<IotRdDailyReportDO> pageReports = iotRdDailyReportMapper.selectPage(iotRdDailyReportPageReqVO);
+        if (ObjUtil.isEmpty(pageReports)) {
+            return buildEmptyResult(lastSevenDays);
+        }
+        List<IotRdDailyReportDO> reports = pageReports.getList();
+        if (CollUtil.isEmpty(reports)) {
+            return buildEmptyResult(lastSevenDays);
+        }
+
+        // 计算最近7天公司整体的设备利用率
+        Set<Long> allRhChildDeptIds = deptService.getChildDeptIdListFromCache(163l);
+
+        // 设备利用率逻辑调整 只筛选 压裂 连油 主设备 rq_iot_device_associate
+        // 队伍日报中关联的主设备数量 /（队伍下所有主设备数量-封存设备数量）
+        Set<Long> mainDeviceIds = new HashSet<>();
+        Set<Long> fcMainDeviceIds = new HashSet<>();
+        // key设备id   value设备所属部门id
+        Map<Long, Long> mainDeviceIdPair = new HashMap<>();
+        IotDeviceAssociatePageReqVO deviceAssocReqVO = new IotDeviceAssociatePageReqVO();
+        deviceAssocReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        deviceAssocReqVO.setDeptIds(allRhChildDeptIds);
+        PageResult<IotDeviceAssociateDO> pageResult = iotDeviceAssociateMapper.selectPage(deviceAssocReqVO);
+        if (ObjUtil.isNotEmpty(pageResult)) {
+            List<IotDeviceAssociateDO> deviceAssociates = pageResult.getList();
+            // 查询出所有瑞都压裂 连油主设备
+            deviceAssociates.forEach(assoc -> {
+                mainDeviceIds.add(assoc.getDeviceId());
+                mainDeviceIdPair.put(assoc.getDeviceId(), assoc.getDeptId());
+            });
+        }
+        // 所有压裂连油主设备
+        Set<Long> abDeviceIds = new HashSet<>();
+        // 查询瑞都 压裂 连油 主设备详情信息
+        IotDevicePageReqVO deviceReqVO = new IotDevicePageReqVO();
+        deviceReqVO.setDeviceIds(new ArrayList<>(mainDeviceIds));
+        List<IotDeviceDO> mainDevices = iotDeviceMapper.selectListAlone(deviceReqVO);
+        // 筛选出 封存 的主设备
+        if (CollUtil.isNotEmpty(mainDevices)) {
+            mainDevices.forEach(device -> {
+                if ("fc".equals(device.getDeviceStatus())) {
+                    fcMainDeviceIds.add(device.getId());
+                } else {
+                    abDeviceIds.add(device.getId());
+                }
+            });
+        }
+
+        // key日期2026-06-08   value日期对应的日报数量
+        Map<String, Set<Long>> dateReportDeviceIdPair = new HashMap<>();
+        reports.forEach(report -> {
+            // 按照日期维度统计各 工作量数据 累计用电量 累计油耗 累计注气量 累计注水量
+            LocalDateTime reportLocalDate = report.getCreateTime();
+            // 将日期格式转换成 字符串
+            String reportDateStr = LocalDateTimeUtil.format(reportLocalDate, DatePattern.NORM_DATE_PATTERN);
+            // 统计日报关联施工AB类设备的利用率
+            Set<Long> reportDeviceIds = report.getDeviceIds();
+            if (CollUtil.isNotEmpty(reportDeviceIds)) {
+                if (dateReportDeviceIdPair.containsKey(reportDateStr)) {
+                    Set<Long> tempDeviceIds = dateReportDeviceIdPair.get(reportDateStr);
+                    tempDeviceIds.addAll(reportDeviceIds);
+                    dateReportDeviceIdPair.put(reportDateStr, tempDeviceIds);
+                } else {
+                    dateReportDeviceIdPair.put(reportDateStr, reportDeviceIds);
+                }
+            }
+        });
+        // 计算每天的设备利用率
+        Map<String, BigDecimal> dateReportUtilizationPair = new HashMap<>();
+        if (CollUtil.isNotEmpty(dateReportDeviceIdPair)) {
+            dateReportDeviceIdPair.forEach((reportDateStr, deviceIds) -> {
+                // 计算每天的所有日报涉及到的压裂连油主设备
+                // 1. 求交集：实际使用的A B类设备
+                Set<Long> utilizedDeviceIds = deviceIds.stream()
+                        .filter(abDeviceIds::contains)
+                        .collect(Collectors.toSet());
+                if (CollUtil.isNotEmpty(abDeviceIds)) {
+                    BigDecimal deviceUtilization = new BigDecimal((double) utilizedDeviceIds.size() / abDeviceIds.size())
+                            .setScale(4, RoundingMode.HALF_UP);
+                    dateReportUtilizationPair.put(reportDateStr, deviceUtilization);
+                }
+            });
+        }
+        // 5. 按日期升序补全最近7天，缺失填0
+        List<String> sortedDays = lastSevenDays.stream()
+                .sorted()                                      // yyyy-MM-dd 字符串自然升序
+                .collect(Collectors.toList());
+        LinkedHashMap<String, BigDecimal> fillMap = new LinkedHashMap<>();
+        sortedDays.forEach(day ->
+                fillMap.put(day, dateReportUtilizationPair.getOrDefault(day, BigDecimal.ZERO))
+        );
+
+        LinkedList<Object> xAxis = new LinkedList<>(fillMap.keySet());
+        LinkedList<Object> fillData = new LinkedList<>(fillMap.values());
+
+        ImmutableMap<String, Serializable> fillResult = ImmutableMap.of("name", "设备利用率~~en**device utilization", "data", fillData);
+        return success(ImmutableMap.of("xAxis", xAxis, "series", ImmutableList.of(fillResult)));
+
+    }
+
     /**
      * 无日报时直接返回全0序列
      */
@@ -1964,6 +2090,135 @@ public class IotStaticController {
         return success(ImmutableMap.of("xAxis", xAxis, "series", ImmutableList.of(monthResult, yearResult)));
     }
 
+    /**
+     * 查询瑞鹰历史日报数据
+     * 钻井：进尺 完井数
+     * @return
+     */
+    @GetMapping("/ry/hiZjDailyReports")
+    @PermitAll
+    public CommonResult<Map<String, Object>> hiZjDailyReports() {
+        // 查询历史数据
+        IotRyHiDailyReportPageReqVO pageReqVO = new IotRyHiDailyReportPageReqVO();
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        PageResult<IotRyHiDailyReportDO> pageReports = iotRyHiDailyReportService.getIotRyHiDailyReportPage(pageReqVO);
+        if (ObjUtil.isEmpty(pageReports)) {
+            return success(emptyResult());
+        }
+        List<IotRyHiDailyReportDO> reports = pageReports.getList();
+        if (CollUtil.isEmpty(reports)) {
+            return success(emptyResult());
+        }
+        // 将历史日报数据按照年份 为维度 统计 进尺、完井数
+        // key年份  value 钻井累计进尺m
+        Map<Integer, BigDecimal> footagePair = new HashMap<>();
+        // key年份  value 钻井累计完井数
+        Map<Integer, BigDecimal> zjWellsPair = new HashMap<>();
+        // key年份  value 修井累计完井数
+        Map<Integer, BigDecimal> xjWellsPair = new HashMap<>();
+
+        reports.forEach(report -> {
+            LocalDateTime reportDate = report.getCreateTime();
+            Integer year = reportDate.getYear();
+            String classification = report.getProjectClassification();
+            BigDecimal footage = report.getAnnualFootage();
+            BigDecimal completedWells = report.getTotalCompletedWells();
+            if ("1".equals(classification)) {
+                // 钻井
+                if (footagePair.containsKey(year)) {
+                    BigDecimal existFootage = footagePair.get(year);
+                    BigDecimal tempFootage = existFootage.add(footage);
+                    footagePair.put(year, tempFootage);
+                } else {
+                    footagePair.put(year, footage);
+                }
+                if (zjWellsPair.containsKey(year)) {
+                    BigDecimal existWells = zjWellsPair.get(year);
+                    BigDecimal tempWells = existWells.add(completedWells);
+                    zjWellsPair.put(year, tempWells);
+                } else {
+                    zjWellsPair.put(year, completedWells);
+                }
+            }
+        });
+
+        LinkedList<Object> xAxis = new LinkedList<>();
+        LinkedList<Object> footageData = new LinkedList<>();
+        LinkedList<Object> wellsData = new LinkedList<>();
+
+        footagePair.forEach((k,v)->{
+            xAxis.add(k);
+            footageData.add(v);
+            if (zjWellsPair.containsKey(k)) {
+                BigDecimal wells = zjWellsPair.get(k);
+                wellsData.add(wells);
+            }
+        });
+        ImmutableMap<String, Serializable> footageResult = ImmutableMap.of("name", "累计进尺~~en**footage", "data", footageData);
+        ImmutableMap<String, Serializable> wellsResult = ImmutableMap.of("name", "累计完井数~~en**finishedWells", "data", wellsData);
+        return success(ImmutableMap.of("xAxis", xAxis, "series", ImmutableList.of(footageResult, wellsResult)));
+    }
+
+    /**
+     * 查询瑞鹰历史日报数据
+     * 修井：完井数
+     * @return
+     */
+    @GetMapping("/ry/hiXjDailyReports")
+    @PermitAll
+    public CommonResult<Map<String, Object>> hiXjDailyReports() {
+        // 查询历史数据
+        IotRyHiDailyReportPageReqVO pageReqVO = new IotRyHiDailyReportPageReqVO();
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        PageResult<IotRyHiDailyReportDO> pageReports = iotRyHiDailyReportService.getIotRyHiDailyReportPage(pageReqVO);
+        if (ObjUtil.isEmpty(pageReports)) {
+            return success(emptyResult());
+        }
+        List<IotRyHiDailyReportDO> reports = pageReports.getList();
+        if (CollUtil.isEmpty(reports)) {
+            return success(emptyResult());
+        }
+        // 将历史日报数据按照年份 为维度 统计 进尺、完井数
+        // key年份  value 修井累计完井数
+        Map<Integer, BigDecimal> xjWellsPair = new HashMap<>();
+
+        reports.forEach(report -> {
+            LocalDateTime reportDate = report.getCreateTime();
+            Integer year = reportDate.getYear();
+            String classification = report.getProjectClassification();
+            BigDecimal footage = report.getAnnualFootage();
+            BigDecimal completedWells = report.getTotalCompletedWells();
+            if ("2".equals(classification)) {
+                // 修井
+                if (xjWellsPair.containsKey(year)) {
+                    BigDecimal existWells = xjWellsPair.get(year);
+                    BigDecimal tempWells = existWells.add(completedWells);
+                    xjWellsPair.put(year, tempWells);
+                } else {
+                    xjWellsPair.put(year, completedWells);
+                }
+            }
+        });
+        LinkedList<Object> xAxis = new LinkedList<>();
+        LinkedList<Object> wellsData = new LinkedList<>();
+        xjWellsPair.forEach((k,v)->{
+            xAxis.add(k);
+            wellsData.add(v);
+        });
+        ImmutableMap<String, Serializable> wellsResult = ImmutableMap.of("name", "累计完井数~~en**finishedWells", "data", wellsData);
+        return success(ImmutableMap.of("xAxis", xAxis, "series", ImmutableList.of(wellsResult)));
+    }
+
+    /**
+     * 空数据返回结构
+     */
+    private Map<String, Object> emptyResult() {
+        return ImmutableMap.of(
+                "xAxis", Collections.emptyList(),
+                "series", Collections.emptyList()
+        );
+    }
+
     /**
      * 瑞恒 设备利用率 按项目部统计
      * @return
@@ -3014,6 +3269,158 @@ public class IotStaticController {
         return success(resultNptCounts);
     }
 
+    /**
+     * 瑞都 生产异常 数量
+     * 无工作量 井场待命 维修设备 物资影响 异常/复杂
+     * @return
+     */
+    @GetMapping("/rd/device/productionAbnormality")
+    @PermitAll
+    public CommonResult<List<NptCountVo>> productionAbnormality(IotRdDailyReportPageReqVO reqVO) {
+        if (ObjUtil.isEmpty(reqVO.getCreateTime())) {
+            throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
+        }
+        if (reqVO.getCreateTime().length < 2) {
+            throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
+        }
+        // 查询瑞鹰 158l 所有项目部
+        Set<Long> childDeptIds = deptService.getChildDeptIdListFromCache(158l);
+        Map<Long, DeptDO> allDeptPair = deptService.getDeptMap(childDeptIds);
+        Set<String> projectDeptNames = new HashSet<>();
+        Set<Long> projectDeptIds = new HashSet<>();
+        // key项目部id   value项目部名称
+        Map<Long, String> projectPair = new HashMap<>();
+        // 队伍id 集合
+        Set<Long> crewIds = new HashSet<>();
+        if (CollUtil.isNotEmpty(allDeptPair)) {
+            allDeptPair.forEach((deptId, dept) -> {
+                if ("2".equals(dept.getType())) {
+                    projectDeptIds.add(deptId);
+                    projectDeptNames.add(dept.getName());
+                    projectPair.put(deptId, dept.getName());
+                }
+                if ("3".equals(dept.getType())) {
+                    // 队伍
+                    crewIds.add(dept.getId());
+                }
+            });
+        }
+        // 查询出指定时间区间内 已经填写的日报数量
+        List<IotRdDailyReportDO> dailyReports = iotRdDailyReportMapper.dailyReports(reqVO);
+
+        List<NptCountVo> resultNptCounts = new ArrayList<>();
+        // no 无工作量
+        Map<String, Integer> noStatusPair = new HashMap<>();
+        // xcdm 井场待命
+        Map<String, Integer> dmStatusPair = new HashMap<>();
+        // wxz 维修设备
+        Map<String, Integer> wxStatusPair = new HashMap<>();
+        // wz 物资影响
+        Map<String, Integer> wzStatusPair = new HashMap<>();
+        // yc 异常/复杂
+        Map<String, Integer> ycStatusPair = new HashMap<>();
+
+        if (CollUtil.isNotEmpty(dailyReports)) {
+            // 整理出每个项目部下的队伍填报的日报数量
+            dailyReports.forEach(report -> {
+                String rdStatus = report.getRdStatus();
+                if ("no".equals(rdStatus)) {
+                    if (noStatusPair.containsKey("no")) {
+                        Integer tempNum = noStatusPair.get("no");
+                        noStatusPair.put("no", ++tempNum);
+                    } else {
+                        noStatusPair.put("no", 1);
+                    }
+                }
+                if ("xcdm".equals(rdStatus)) {
+                    if (dmStatusPair.containsKey("xcdm")) {
+                        Integer tempNum = dmStatusPair.get("xcdm");
+                        dmStatusPair.put("xcdm", ++tempNum);
+                    } else {
+                        dmStatusPair.put("xcdm", 1);
+                    }
+                }
+                if ("wxz".equals(rdStatus)) {
+                    if (wxStatusPair.containsKey("wxz")) {
+                        Integer tempNum = wxStatusPair.get("wxz");
+                        wxStatusPair.put("wxz", ++tempNum);
+                    } else {
+                        wxStatusPair.put("wxz", 1);
+                    }
+                }
+                if ("wz".equals(rdStatus)) {
+                    if (wzStatusPair.containsKey("wz")) {
+                        Integer tempNum = wzStatusPair.get("wz");
+                        wzStatusPair.put("wz", ++tempNum);
+                    } else {
+                        wzStatusPair.put("wz", 1);
+                    }
+                }
+                if ("yc".equals(rdStatus)) {
+                    if (ycStatusPair.containsKey("yc")) {
+                        Integer tempNum = ycStatusPair.get("yc");
+                        ycStatusPair.put("yc", ++tempNum);
+                    } else {
+                        ycStatusPair.put("yc", 1);
+                    }
+                }
+            });
+        }
+        // 无工作量
+        NptCountVo noVo = new NptCountVo();
+        noVo.setNptName("no");
+        if (CollUtil.isNotEmpty(noStatusPair)) {
+            Integer noStatusNum = noStatusPair.get("no");
+            noVo.setTeamCount(noStatusNum);
+        } else {
+            noVo.setTeamCount(0);
+        }
+        resultNptCounts.add(noVo);
+        // 井场待命
+        NptCountVo dmVo = new NptCountVo();
+        dmVo.setNptName("xcdm");
+        if (CollUtil.isNotEmpty(dmStatusPair)) {
+            Integer dmStatusNum = dmStatusPair.get("xcdm");
+            dmVo.setTeamCount(dmStatusNum);
+        } else {
+            dmVo.setTeamCount(0);
+        }
+        resultNptCounts.add(dmVo);
+        // 维修设备
+        NptCountVo wxVo = new NptCountVo();
+        wxVo.setNptName("wxz");
+        if (CollUtil.isNotEmpty(wxStatusPair)) {
+            Integer wxStatusNum = wxStatusPair.get("wxz");
+            wxVo.setTeamCount(wxStatusNum);
+        } else {
+            wxVo.setTeamCount(0);
+        }
+        resultNptCounts.add(wxVo);
+        // 物资影响
+        NptCountVo wzVo = new NptCountVo();
+        wzVo.setNptName("wz");
+        if (CollUtil.isNotEmpty(wzStatusPair)) {
+            Integer wzStatusNum = wzStatusPair.get("wz");
+            wzVo.setTeamCount(wzStatusNum);
+        } else {
+            wzVo.setTeamCount(0);
+        }
+        resultNptCounts.add(wzVo);
+        // 异常/复杂
+        NptCountVo ycVo = new NptCountVo();
+        ycVo.setNptName("yc");
+        if (CollUtil.isNotEmpty(ycStatusPair)) {
+            Integer ycStatusNum = ycStatusPair.get("yc");
+            ycVo.setTeamCount(ycStatusNum);
+        } else {
+            ycVo.setTeamCount(0);
+        }
+        resultNptCounts.add(ycVo);
+        // 按照每种非生产时间队伍数量 降序排列
+        resultNptCounts.sort(Comparator.comparingInt(NptCountVo::getTeamCount).reversed());
+        return success(resultNptCounts);
+    }
+
     /**
      * 瑞鹰 设备利用率 按 队伍 统计
      * @return
@@ -3191,9 +3598,29 @@ public class IotStaticController {
         Map<Long, Long> deviceIdToDeptIdMap = new HashMap<>();
         // key项目部id     value项目部下包含的队伍的 压裂 连油 设备数量
         Map<Long, Integer> projectDevicePair = new HashMap<>();
+
+        // 设备利用率逻辑调整 只筛选 压裂 连油 主设备 rq_iot_device_associate
+        // 队伍日报中关联的主设备数量 /（队伍下所有主设备数量-封存设备数量）
+        Set<Long> mainDeviceIds = new HashSet<>();
+        Set<Long> fcMainDeviceIds = new HashSet<>();
+        // key设备id   value设备所属部门id
+        Map<Long, Long> mainDeviceIdPair = new HashMap<>();
+        IotDeviceAssociatePageReqVO deviceAssocReqVO = new IotDeviceAssociatePageReqVO();
+        deviceAssocReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        deviceAssocReqVO.setDeptIds(childDeptIds);
+        PageResult<IotDeviceAssociateDO> pageResult = iotDeviceAssociateMapper.selectPage(deviceAssocReqVO);
+        if (ObjUtil.isNotEmpty(pageResult)) {
+            List<IotDeviceAssociateDO> deviceAssociates = pageResult.getList();
+            // 查询出所有瑞都压裂 连油主设备
+            deviceAssociates.forEach(assoc -> {
+                mainDeviceIds.add(assoc.getDeviceId());
+                mainDeviceIdPair.put(assoc.getDeviceId(), assoc.getDeptId());
+            });
+        }
+
         if (CollUtil.isNotEmpty(allDeptPair)) {
             allDeptPair.forEach((deptId, dept) -> {
-                if (dept.getName().contains("项目部") ) {
+                if ("2".equals(dept.getType())) {
                     projectDeptIds.add(deptId);
                     projectDeptNames.add(dept.getName());
                     projectPair.put(deptId, dept.getName());
@@ -3351,67 +3778,242 @@ public class IotStaticController {
             });
         }
         // 日报应用前先模拟数据
-        rates.clear();
-        ProjectUtilizationRateVo ylk = new ProjectUtilizationRateVo();
-        ylk.setProjectDeptId(331l);
-        ylk.setProjectDeptName("伊拉克项目部");
-        ylk.setTeamCount(4);
-        ylk.setCumulativeDays(1216l);
-        ylk.setConstructionDays(646);
-        ylk.setUtilizationRate(0.5313);
-        ProjectUtilizationRateVo xj = new ProjectUtilizationRateVo();
-        xj.setProjectDeptId(329l);
-        xj.setProjectDeptName("新疆项目部");
-        xj.setTeamCount(2);
-        xj.setCumulativeDays(852l);
-        xj.setConstructionDays(387);
-        xj.setUtilizationRate(0.4542);
-        ProjectUtilizationRateVo db = new ProjectUtilizationRateVo();
-        db.setProjectDeptId(326l);
-        db.setProjectDeptName("东部项目部");
-        db.setTeamCount(3);
-        db.setCumulativeDays(912l);
-        db.setConstructionDays(261);
-        db.setUtilizationRate(0.2862);
-        ProjectUtilizationRateVo qh = new ProjectUtilizationRateVo();
-        qh.setProjectDeptId(327l);
-        qh.setProjectDeptName("青海项目部");
-        qh.setTeamCount(1);
-        qh.setCumulativeDays(304l);
-        qh.setConstructionDays(179);
-        qh.setUtilizationRate(0.5888);
-        ProjectUtilizationRateVo xnyl = new ProjectUtilizationRateVo();
-        xnyl.setProjectDeptId(325l);
-        xnyl.setProjectDeptName("西南压裂项目部");
-        xnyl.setTeamCount(1);
-        xnyl.setCumulativeDays(304l);
-        xnyl.setConstructionDays(252);
-        xnyl.setUtilizationRate(0.8289);
-        ProjectUtilizationRateVo xnly = new ProjectUtilizationRateVo();
-        xnly.setProjectDeptId(330l);
-        xnly.setProjectDeptName("西南连续油管项目部");
-        xnly.setTeamCount(3);
-        xnly.setCumulativeDays(912l);
-        xnly.setConstructionDays(443);
-        xnly.setUtilizationRate(0.4857);
-        ProjectUtilizationRateVo lby = new ProjectUtilizationRateVo();
-        lby.setProjectDeptId(349l);
-        lby.setProjectDeptName("利比亚项目部");
-        lby.setTeamCount(1);
-        lby.setCumulativeDays(304l);
-        lby.setConstructionDays(21);
-        lby.setUtilizationRate(0.0691);
-        rates.add(ylk);
-        rates.add(xj);
-        rates.add(db);
-        rates.add(qh);
-        rates.add(xnyl);
-        rates.add(xnly);
-        rates.add(lby);
         rates.sort(Comparator.comparingDouble(ProjectUtilizationRateVo::getUtilizationRate).reversed());
         return success(rates);
     }
 
+    /**
+     * 瑞都 时间区间内整体的 设备利用率
+     * @return
+     */
+    @GetMapping("/rd/device/totalUtilizationRate")
+    @PermitAll
+    public CommonResult<BigDecimal> rdTotalUtilizationRate(IotRdDailyReportPageReqVO reqVO) {
+        if (ObjUtil.isEmpty(reqVO.getCreateTime())) {
+            throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
+        }
+        if (reqVO.getCreateTime().length < 2) {
+            throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
+        }
+        // 计算公司整体的设备利用率
+        BigDecimal totalDeviceUtilization = BigDecimal.ZERO;
+
+        // 查询瑞都 163l 所有项目部
+        Set<Long> childDeptIds = deptService.getChildDeptIdListFromCache(163l);
+        Map<Long, DeptDO> allDeptPair = deptService.getDeptMap(childDeptIds);
+        Set<String> projectDeptNames = new HashSet<>();
+        Set<Long> projectDeptIds = new HashSet<>();
+        // key项目部id   value项目部名称
+        Map<Long, String> projectPair = new HashMap<>();
+        // key项目部id   value项目部包含的队伍id集合
+        Map<Long, Set<Long>> projectTeamPair = new HashMap<>();
+        // 设备ID到其所属部门ID的映射
+        Map<Long, Long> deviceIdToDeptIdMap = new HashMap<>();
+
+        // 20260611 设备利用率逻辑调整 只筛选 压裂 连油 主设备 rq_iot_device_associate
+        // 队伍日报中关联的主设备数量 /（队伍下所有主设备数量-封存设备数量）
+        Set<Long> mainDeviceIds = new HashSet<>();
+        Set<Long> fcMainDeviceIds = new HashSet<>();
+        // key设备id   value设备所属部门id
+        Map<Long, Long> mainDeviceIdPair = new HashMap<>();
+        IotDeviceAssociatePageReqVO deviceAssocReqVO = new IotDeviceAssociatePageReqVO();
+        deviceAssocReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        deviceAssocReqVO.setDeptIds(childDeptIds);
+        PageResult<IotDeviceAssociateDO> pageResult = iotDeviceAssociateMapper.selectPage(deviceAssocReqVO);
+        if (ObjUtil.isNotEmpty(pageResult)) {
+            List<IotDeviceAssociateDO> deviceAssociates = pageResult.getList();
+            // 查询出所有瑞都压裂 连油主设备
+            deviceAssociates.forEach(assoc -> {
+                mainDeviceIds.add(assoc.getDeviceId());
+                mainDeviceIdPair.put(assoc.getDeviceId(), assoc.getDeptId());
+            });
+        }
+        // 过滤掉 封存 的 压裂 连油 主设备id集合
+        Set<Long> abDeviceIds = new HashSet<>();
+
+        if (CollUtil.isNotEmpty(allDeptPair)) {
+            allDeptPair.forEach((deptId, dept) -> {
+                if ("2".equals(dept.getType())) {
+                    projectDeptIds.add(deptId);
+                    projectDeptNames.add(dept.getName());
+                    projectPair.put(deptId, dept.getName());
+                }
+            });
+            // 遍历所有部门
+            allDeptPair.forEach((deptId, dept) -> {
+                // 找出每个项目部下的队伍
+                if (projectPair.containsKey(dept.getParentId())) {
+                    // 获得当前部门的上级项目部
+                    projectPair.forEach((projectDeptId, projectDept) -> {
+                        if (projectDeptId.equals(dept.getParentId())) {
+                            if (projectTeamPair.containsKey(projectDeptId)) {
+                                Set<Long> teamIds = projectTeamPair.get(projectDeptId);
+                                teamIds.add(deptId);
+                                projectTeamPair.put(projectDeptId, teamIds);
+                            } else {
+                                Set<Long> teamIds = new HashSet<>();
+                                teamIds.add(deptId);
+                                projectTeamPair.put(projectDeptId, teamIds);
+                            }
+                        }
+                    });
+                }
+            });
+
+            IotDevicePageReqVO deviceReqVO = new IotDevicePageReqVO();
+            deviceReqVO.setDeviceIds(new ArrayList<>(mainDeviceIds));
+            List<IotDeviceDO> utilizeDevices = iotDeviceMapper.selectListAlone(deviceReqVO);
+            // 筛选出项目部下包含的队伍的设备数量
+            // 过滤掉 封存 的 压裂 连油 主设备
+            if (CollUtil.isNotEmpty(utilizeDevices)) {
+                utilizeDevices.forEach(device -> {
+                    if ("fc".equals(device.getDeviceStatus())) {
+                        fcMainDeviceIds.add(device.getId());
+                    } else {
+                        abDeviceIds.add(device.getId());
+                    }
+                });
+            }
+        }
+        // 查询出指定时间区间内 已经填写的日报 再根据设备id 进行筛选 通过设备id 建立项目部 与 日报数量之间的关联
+        // 判断日报中 device_ids 字段中每个设备 是否属于需要统计的 压裂 连油 设备
+        List<IotRdDailyReportDO> dailyReports = iotRdDailyReportMapper.dailyReports(reqVO);
+        // key项目部id     value项目部包含的队伍指定时间区域内日报数量
+        Map<Long, Integer> projectReportPair = new HashMap<>();
+        // 日报涉及到的施工设备id集合
+        Set<Long> reportDeviceIds = new HashSet<>();
+        if (CollUtil.isNotEmpty(dailyReports)) {
+            // 整理出每个项目部下的队伍填报的日报数量
+            dailyReports.forEach(report -> {
+                // 筛选出日报中施工的 设备id集合
+                if (CollUtil.isNotEmpty(report.getDeviceIds())) {
+                    reportDeviceIds.addAll(report.getDeviceIds());
+                }
+                if (CollUtil.isNotEmpty(projectTeamPair)) {
+                    projectTeamPair.forEach((projectDeptId, teamDeptIds) -> {
+                        Set<Long> tempDeviceIds = report.getDeviceIds();
+                        // 判断 集合 tempDeviceIds 中的任意的 ‘设备id’ 是否包含在 集合 teamDeptIds 中
+                        // 判断tempDeviceIds中的任意设备所属部门是否在当前项目部的队伍部门中
+                        boolean hasMatchingDevice = CollUtil.isNotEmpty(tempDeviceIds) && tempDeviceIds.stream()
+                                .map(deviceIdToDeptIdMap::get) // 通过映射表获取设备所属部门ID
+                                .filter(Objects::nonNull) // 过滤掉非统计范围内的设备（避免空指针）
+                                .anyMatch(teamDeptIds::contains); // 任意设备所属部门在队伍部门中则匹配
+                        if (hasMatchingDevice) {
+                            if (projectReportPair.containsKey(projectDeptId)) {
+                                Integer tempCount = projectReportPair.get(projectDeptId);
+                                projectReportPair.put(projectDeptId, ++tempCount);
+                            } else {
+                                projectReportPair.put(projectDeptId, 1);
+                            }
+                        }
+                    });
+                }
+            });
+
+            // 计算公司整体的设备利用率
+            // 指定时间范围内 日报中所有施工的设备数量/总设备数量 (A B类)
+            // abDeviceIds所有AB类设备  reportDeviceIds日报中用到的所有设备 交集求出日报中使用到的AB类设备
+            if (CollUtil.isNotEmpty(abDeviceIds) && CollUtil.isNotEmpty(reportDeviceIds)) {
+                // 1. 求交集：实际使用的A B类设备
+                Set<Long> utilizedDeviceIds = reportDeviceIds.stream()
+                        .filter(abDeviceIds::contains)
+                        .collect(Collectors.toSet());
+                // 2. 计算设备利用率（实际使用设备数 / 总设备数）
+                // 转换为BigDecimal进行计算，保留4位小数
+                totalDeviceUtilization = BigDecimal.valueOf(utilizedDeviceIds.size())
+                        .divide(BigDecimal.valueOf(abDeviceIds.size()), 4, RoundingMode.HALF_UP);
+            }
+        }
+
+        return success(totalDeviceUtilization);
+    }
+
+    /**
+     * 瑞都 时间区间内整体的 工作量统计
+     * 压裂层数 连油井数
+     * @return
+     */
+    @GetMapping("/rd/device/workloadStatistics")
+    @PermitAll
+    public CommonResult<Map<String, Object>> rdWorkloadStatistics(IotRdDailyReportPageReqVO reqVO) {
+        if (ObjUtil.isEmpty(reqVO.getCreateTime())) {
+            throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
+        }
+        if (reqVO.getCreateTime().length < 2) {
+            throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
+        }
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("layers", 0.0);
+        result.put("wells", 0.0);
+
+        // 查询出指定时间区间内 已经填写的日报 再根据设备id 进行筛选 通过设备id 建立项目部 与 日报数量之间的关联
+        // 判断日报中 device_ids 字段中每个设备 是否属于需要统计的 压裂 连油 设备
+        List<IotRdDailyReportDO> dailyReports = iotRdDailyReportMapper.dailyReports(reqVO);
+        // 日报涉及到的施工设备id集合
+        Set<Long> reportDeviceIds = new HashSet<>();
+        // key工作量标识   value累计 段数 累计施工-层
+        Map<String, BigDecimal> cumulativeWorkingLayersPair = new HashMap<>();
+        // 连油井数
+        Set<Long> cumulativeWells = new HashSet<>();
+        if (CollUtil.isNotEmpty(dailyReports)) {
+            // 整理出每个项目部下的队伍填报的日报数量
+            dailyReports.forEach(report -> {
+                // 筛选出日报中施工的 设备id集合
+                if (CollUtil.isNotEmpty(report.getDeviceIds())) {
+                    reportDeviceIds.addAll(report.getDeviceIds());
+                }
+                // 设置每个任务的工作量数据  单位相同的工作量值作合并处理
+                List<IotTaskAttrModelProperty> taskAttrs = report.getExtProperty();
+                // 段数 累计施工-层
+                BigDecimal tempTotalCumulativeWorkingLayers = BigDecimal.ZERO;
+                if (CollUtil.isNotEmpty(taskAttrs)) {
+                    for (IotTaskAttrModelProperty attr : taskAttrs) {
+                        // 工作量单位
+                        String unit = attr.getUnit();
+                        // 工作量属性的实际值
+                        String actualValueStr = attr.getActualValue();
+                        // 处理实际值：避免null或非数字字符串导致的异常
+                        BigDecimal actualValue = BigDecimal.ZERO;
+                        if (StrUtil.isNotBlank(actualValueStr)) {
+                            try {
+                                actualValue = new BigDecimal(actualValueStr);
+                            } catch (NumberFormatException e) {
+                                // 若字符串格式错误，默认按0处理（可根据业务调整）
+                                actualValue = BigDecimal.ZERO;
+                            }
+                        }
+                        if ("段数".equals(unit)) {
+                            // 累计施工层
+                            tempTotalCumulativeWorkingLayers = tempTotalCumulativeWorkingLayers.add(actualValue);
+                            if (cumulativeWorkingLayersPair.containsKey("cumulativeWorkingLayers")) {
+                                BigDecimal tempWorkingLayer = cumulativeWorkingLayersPair.get("cumulativeWorkingLayers");
+                                cumulativeWorkingLayersPair.put("cumulativeWorkingLayers", tempTotalCumulativeWorkingLayers.add(tempWorkingLayer));
+                            } else {
+                                cumulativeWorkingLayersPair.put("cumulativeWorkingLayers", tempTotalCumulativeWorkingLayers);
+                            }
+                        }
+                    }
+                }
+                if (ObjUtil.isNotEmpty(report.getTaskId()) && "wg".equals(report.getRdStatus())) {
+                    cumulativeWells.add(report.getTaskId());
+                }
+            });
+
+        }
+        // 压裂层数
+        if (CollUtil.isNotEmpty(cumulativeWorkingLayersPair)) {
+            cumulativeWorkingLayersPair.forEach((key, layers) -> {
+                result.put("layers", layers);
+            });
+        }
+        // 连油井数 完工 的任务井
+        if (CollUtil.isNotEmpty(cumulativeWells)) {
+            result.put("wells", cumulativeWells.size());
+        }
+        return success(result);
+    }
+
     /**
      * 瑞都 设备利用率 按 项目部 统计
      * @return

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotryhidailyreport/IotRyHiDailyReportDO.java

@@ -0,0 +1,293 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotryhidailyreport;
+
+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.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瑞鹰历史日报 DO
+ *
+ * @author ruiqi
+ */
+@TableName("rq_iot_ry_hi_daily_report")
+@KeySequence("rq_iot_ry_hi_daily_report_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotRyHiDailyReportDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 施工队伍id
+     */
+    private Long deptId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 任务id
+     */
+    private Long taskId;
+    /**
+     * 项目类别(钻井 修井 注氮 酸化压裂... )
+     */
+    private String projectClassification;
+    /**
+     * 搬迁安装天数(D)
+     */
+    private BigDecimal relocationDays;
+    /**
+     * 上井次完井时间
+     */
+    private LocalDateTime latestWellDoneTime;
+    /**
+     * 当前井深(m)
+     */
+    private BigDecimal currentDepth;
+    /**
+     * 日进尺(m)
+     */
+    private BigDecimal dailyFootage;
+    /**
+     * 月进尺(m)
+     */
+    private BigDecimal monthlyFootage;
+    /**
+     * 年累计进尺(m)
+     */
+    private BigDecimal annualFootage;
+    /**
+     * 当月完井数(井次) 修井
+     */
+    private BigDecimal monthlyWellCompletions;
+    /**
+     * 累计完井数(井次) 修井
+     */
+    private BigDecimal totalCompletedWells;
+    /**
+     * 累计施工井数
+     */
+    private BigDecimal totalConstructionWells;
+    /**
+     * 当日用电量(kWh)
+     */
+    private BigDecimal dailyPowerUsage;
+    /**
+     * 当月用电量(kWh)
+     */
+    private BigDecimal monthlyPowerUsage;
+    /**
+     * 当日油耗(L)
+     */
+    private BigDecimal dailyFuel;
+    /**
+     * 当月油耗(吨)
+     */
+    private BigDecimal monthlyFuel;
+    /**
+     * 当日上油数量(吨)
+     */
+    private BigDecimal dailyOilVolume;
+    /**
+     * 柴油剩余数量(吨)
+     */
+    private BigDecimal remainDieselVolume;
+    /**
+     * 生产时间(H) 修井
+     */
+    private BigDecimal productionTime;
+    /**
+     * 非生产时间(H)
+     */
+    private BigDecimal nonProductionTime;
+    /**
+     * 非生产时间原因
+     */
+    private String ryNptReason;
+    /**
+     * 进尺工作时间
+     */
+    private BigDecimal drillingWorkingTime;
+    /**
+     * 其它生产时间
+     */
+    private BigDecimal otherProductionTime;
+    /**
+     * 事故非生产时间(工程质量)
+     */
+    private BigDecimal accidentTime;
+    /**
+     * 修理非生产时间(设备故障)
+     */
+    private BigDecimal repairTime;
+    /**
+     * 自停非生产时间(设备保养)
+     */
+    private BigDecimal selfStopTime;
+    /**
+     * 复杂非生产时间(技术受限)
+     */
+    private BigDecimal complexityTime;
+    /**
+     * 搬迁非生产时间(生产配合)
+     */
+    private BigDecimal relocationTime;
+    /**
+     * 整改非生产时间(生产组织)
+     */
+    private BigDecimal rectificationTime;
+    /**
+     * 等停非生产时间(不可抗力)
+     */
+    private BigDecimal waitingStopTime;
+    /**
+     * 冬休非生产时间(待命)T
+     */
+    private BigDecimal winterBreakTime;
+    /**
+     * 甲方设计-非生产时间
+     */
+    private BigDecimal partyaDesign;
+    /**
+     * 甲方准备-非生产时间
+     */
+    private BigDecimal partyaPrepare;
+    /**
+     * 甲方资源-非生产时间
+     */
+    private BigDecimal partyaResource;
+    /**
+     * 其它非生产时间
+     */
+    private BigDecimal otherNptTime;
+    /**
+     * 其它非生产时间原因
+     */
+    private String otherNptReason;
+    /**
+     * 施工开始日期
+     */
+    private LocalDateTime constructionStartDate;
+    /**
+     * 施工结束日期
+     */
+    private LocalDateTime constructionEndDate;
+    /**
+     * 当日生产情况生产动态
+     */
+    private String productionStatus;
+    /**
+     * 目前工序
+     */
+    private String currentOperation;
+    /**
+     * 下步工作计划
+     */
+    private String nextPlan;
+    /**
+     * 施工简报
+     */
+    private String constructionBrief;
+    /**
+     * 施工状态(动迁 准备 施工 完工)
+     */
+    private String rigStatus;
+    /**
+     * 修井施工状态
+     */
+    private String repairStatus;
+    /**
+     * 人员情况
+     */
+    private String personnel;
+    /**
+     * 全员数量
+     */
+    private BigDecimal totalStaffNum;
+    /**
+     * 休假人员数量
+     */
+    private BigDecimal leaveStaffNum;
+    /**
+     * 泥浆性能-密度(g/cm³)
+     */
+    private BigDecimal mudDensity;
+    /**
+     * 泥浆性能-粘度(S)
+     */
+    private BigDecimal mudViscosity;
+    /**
+     * 水平段长度(m) 适用于水平井
+     */
+    private BigDecimal lateralLength;
+    /**
+     * 井斜(°)
+     */
+    private BigDecimal wellInclination;
+    /**
+     * 方位(°)
+     */
+    private BigDecimal azimuth;
+    /**
+     * 白班跟班干部(人员id集合)
+     */
+    private String dayShiftSupervisor;
+    /**
+     * 白班跟班干部名称(人员名称集合)
+     */
+    private String daySupervisors;
+    /**
+     * 夜班跟班干部(人员id集合)
+     */
+    private String nightShiftSupervisor;
+    /**
+     * 夜班跟班干部名称(人员名称集合)
+     */
+    private String nightSupervisors;
+    /**
+     * 不同专业公司的扩展属性值
+     */
+    private String extProperty;
+    /**
+     * 排序值
+     */
+    private Integer sort;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+    /**
+     * 流程实例id
+     */
+    private String processInstanceId;
+    /**
+     * 审批状态 未提交、审批中、审批通过、审批不通过、已取消
+     */
+    private Integer auditStatus;
+    /**
+     * 审批意见
+     */
+    private String opinion;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotryimprovedailyreport/IotRyImproveDailyReportDO.java

@@ -0,0 +1,297 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreport;
+
+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.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瑞鹰项目启动设备整改 DO
+ *
+ * @author ruiqi
+ */
+@TableName("rq_iot_ry_improve_daily_report")
+@KeySequence("rq_iot_ry_improve_daily_report_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotRyImproveDailyReportDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 施工队伍id
+     */
+    private Long deptId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 任务id
+     */
+    private Long taskId;
+    /**
+     * 日报标题
+     */
+    private String title;
+    /**
+     * 施工地点
+     */
+    private String workLocation;
+    /**
+     * 施工目的
+     */
+    private String workPurpose;
+    /**
+     * 项目类别(钻井 修井 注氮 酸化压裂... )
+     */
+    private String projectClassification;
+    /**
+     * 安全作业天数(D)
+     */
+    private BigDecimal relocationDays;
+    /**
+     * 上井次完井时间
+     */
+    private LocalDateTime latestWellDoneTime;
+    /**
+     * 当前井深(m)
+     */
+    private BigDecimal currentDepth;
+    /**
+     * 日进尺(m)
+     */
+    private BigDecimal dailyFootage;
+    /**
+     * 月进尺(m)
+     */
+    private BigDecimal monthlyFootage;
+    /**
+     * 年累计进尺(m)
+     */
+    private BigDecimal annualFootage;
+    /**
+     * 当月完井数(井次) 修井
+     */
+    private BigDecimal monthlyWellCompletions;
+    /**
+     * 累计完井数(井次) 修井
+     */
+    private BigDecimal totalCompletedWells;
+    /**
+     * 当日用电量(kWh)
+     */
+    private BigDecimal dailyPowerUsage;
+    /**
+     * 当月用电量(kWh)
+     */
+    private BigDecimal monthlyPowerUsage;
+    /**
+     * 当日油耗(L)
+     */
+    private BigDecimal dailyFuel;
+    /**
+     * 当月油耗(吨)
+     */
+    private BigDecimal monthlyFuel;
+    /**
+     * 当日上油数量(吨)
+     */
+    private BigDecimal dailyOilVolume;
+    /**
+     * 柴油剩余数量(吨)
+     */
+    private BigDecimal remainDieselVolume;
+    /**
+     * 生产时间(H) 修井
+     */
+    private BigDecimal productionTime;
+    /**
+     * 非生产时间(H)
+     */
+    private BigDecimal nonProductionTime;
+    /**
+     * 非生产时间原因
+     */
+    private String ryNptReason;
+    /**
+     * 进尺工作时间
+     */
+    private BigDecimal drillingWorkingTime;
+    /**
+     * 其它生产时间
+     */
+    private BigDecimal otherProductionTime;
+    /**
+     * 事故非生产时间(工程质量)
+     */
+    private BigDecimal accidentTime;
+    /**
+     * 修理非生产时间(设备故障)
+     */
+    private BigDecimal repairTime;
+    /**
+     * 自停非生产时间(设备保养)
+     */
+    private BigDecimal selfStopTime;
+    /**
+     * 复杂非生产时间(技术受限)
+     */
+    private BigDecimal complexityTime;
+    /**
+     * 搬迁非生产时间(生产配合)
+     */
+    private BigDecimal relocationTime;
+    /**
+     * 整改非生产时间(生产组织)
+     */
+    private BigDecimal rectificationTime;
+    /**
+     * 等停非生产时间(不可抗力)
+     */
+    private BigDecimal waitingStopTime;
+    /**
+     * 冬休非生产时间(待命)T
+     */
+    private BigDecimal winterBreakTime;
+    /**
+     * 甲方设计-非生产时间
+     */
+    private BigDecimal partyaDesign;
+    /**
+     * 甲方准备-非生产时间
+     */
+    private BigDecimal partyaPrepare;
+    /**
+     * 甲方资源-非生产时间
+     */
+    private BigDecimal partyaResource;
+    /**
+     * 其它非生产时间
+     */
+    private BigDecimal otherNptTime;
+    /**
+     * 其它非生产时间原因
+     */
+    private String otherNptReason;
+    /**
+     * 施工开始日期
+     */
+    private LocalDateTime constructionStartDate;
+    /**
+     * 施工结束日期
+     */
+    private LocalDateTime constructionEndDate;
+    /**
+     * 当日生产情况生产动态
+     */
+    private String productionStatus;
+    /**
+     * 目前工序
+     */
+    private String currentOperation;
+    /**
+     * 下步工作计划
+     */
+    private String nextPlan;
+    /**
+     * 施工简报
+     */
+    private String constructionBrief;
+    /**
+     * 施工状态(动迁 准备 施工 完工)
+     */
+    private String rigStatus;
+    /**
+     * 修井施工状态
+     */
+    private String repairStatus;
+    /**
+     * 人员情况
+     */
+    private String personnel;
+    /**
+     * 全员数量
+     */
+    private BigDecimal totalStaffNum;
+    /**
+     * 休假人员数量
+     */
+    private BigDecimal leaveStaffNum;
+    /**
+     * 泥浆性能-密度(g/cm³)
+     */
+    private BigDecimal mudDensity;
+    /**
+     * 泥浆性能-粘度(S)
+     */
+    private BigDecimal mudViscosity;
+    /**
+     * 水平段长度(m) 适用于水平井
+     */
+    private BigDecimal lateralLength;
+    /**
+     * 井斜(°)
+     */
+    private BigDecimal wellInclination;
+    /**
+     * 方位(°)
+     */
+    private BigDecimal azimuth;
+    /**
+     * 白班跟班干部(人员id集合)
+     */
+    private String dayShiftSupervisor;
+    /**
+     * 白班跟班干部名称(人员名称集合)
+     */
+    private String daySupervisors;
+    /**
+     * 夜班跟班干部(人员id集合)
+     */
+    private String nightShiftSupervisor;
+    /**
+     * 夜班跟班干部名称(人员名称集合)
+     */
+    private String nightSupervisors;
+    /**
+     * 不同专业公司的扩展属性值
+     */
+    private String extProperty;
+    /**
+     * 排序值
+     */
+    private Integer sort;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+    /**
+     * 流程实例id
+     */
+    private String processInstanceId;
+    /**
+     * 审批状态 未提交、审批中、审批通过、审批不通过、已取消
+     */
+    private Integer auditStatus;
+    /**
+     * 审批意见
+     */
+    private String opinion;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotryhidailyreport/IotRyHiDailyReportMapper.java

@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotryhidailyreport;
+
+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.iotryhidailyreport.vo.IotRyHiDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryhidailyreport.IotRyHiDailyReportDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 瑞鹰历史日报 Mapper
+ *
+ * @author ruiqi
+ */
+@Mapper
+public interface IotRyHiDailyReportMapper extends BaseMapperX<IotRyHiDailyReportDO> {
+
+    default PageResult<IotRyHiDailyReportDO> selectPage(IotRyHiDailyReportPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotRyHiDailyReportDO>()
+                .eqIfPresent(IotRyHiDailyReportDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotRyHiDailyReportDO::getProjectId, reqVO.getProjectId())
+                .likeIfPresent(IotRyHiDailyReportDO::getProjectName, reqVO.getProjectName())
+                .eqIfPresent(IotRyHiDailyReportDO::getTaskId, reqVO.getTaskId())
+                .eqIfPresent(IotRyHiDailyReportDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotRyHiDailyReportDO::getRelocationDays, reqVO.getRelocationDays())
+                .betweenIfPresent(IotRyHiDailyReportDO::getLatestWellDoneTime, reqVO.getLatestWellDoneTime())
+                .eqIfPresent(IotRyHiDailyReportDO::getCurrentDepth, reqVO.getCurrentDepth())
+                .eqIfPresent(IotRyHiDailyReportDO::getDailyFootage, reqVO.getDailyFootage())
+                .eqIfPresent(IotRyHiDailyReportDO::getMonthlyFootage, reqVO.getMonthlyFootage())
+                .eqIfPresent(IotRyHiDailyReportDO::getAnnualFootage, reqVO.getAnnualFootage())
+                .eqIfPresent(IotRyHiDailyReportDO::getMonthlyWellCompletions, reqVO.getMonthlyWellCompletions())
+                .eqIfPresent(IotRyHiDailyReportDO::getTotalCompletedWells, reqVO.getTotalCompletedWells())
+                .eqIfPresent(IotRyHiDailyReportDO::getTotalConstructionWells, reqVO.getTotalConstructionWells())
+                .eqIfPresent(IotRyHiDailyReportDO::getDailyPowerUsage, reqVO.getDailyPowerUsage())
+                .eqIfPresent(IotRyHiDailyReportDO::getMonthlyPowerUsage, reqVO.getMonthlyPowerUsage())
+                .eqIfPresent(IotRyHiDailyReportDO::getDailyFuel, reqVO.getDailyFuel())
+                .eqIfPresent(IotRyHiDailyReportDO::getMonthlyFuel, reqVO.getMonthlyFuel())
+                .eqIfPresent(IotRyHiDailyReportDO::getDailyOilVolume, reqVO.getDailyOilVolume())
+                .eqIfPresent(IotRyHiDailyReportDO::getRemainDieselVolume, reqVO.getRemainDieselVolume())
+                .betweenIfPresent(IotRyHiDailyReportDO::getProductionTime, reqVO.getProductionTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getNonProductionTime, reqVO.getNonProductionTime())
+                .eqIfPresent(IotRyHiDailyReportDO::getRyNptReason, reqVO.getRyNptReason())
+                .betweenIfPresent(IotRyHiDailyReportDO::getDrillingWorkingTime, reqVO.getDrillingWorkingTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getOtherProductionTime, reqVO.getOtherProductionTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getAccidentTime, reqVO.getAccidentTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getRepairTime, reqVO.getRepairTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getSelfStopTime, reqVO.getSelfStopTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getComplexityTime, reqVO.getComplexityTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getRelocationTime, reqVO.getRelocationTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getRectificationTime, reqVO.getRectificationTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getWaitingStopTime, reqVO.getWaitingStopTime())
+                .betweenIfPresent(IotRyHiDailyReportDO::getWinterBreakTime, reqVO.getWinterBreakTime())
+                .eqIfPresent(IotRyHiDailyReportDO::getPartyaDesign, reqVO.getPartyaDesign())
+                .eqIfPresent(IotRyHiDailyReportDO::getPartyaPrepare, reqVO.getPartyaPrepare())
+                .eqIfPresent(IotRyHiDailyReportDO::getPartyaResource, reqVO.getPartyaResource())
+                .betweenIfPresent(IotRyHiDailyReportDO::getOtherNptTime, reqVO.getOtherNptTime())
+                .eqIfPresent(IotRyHiDailyReportDO::getOtherNptReason, reqVO.getOtherNptReason())
+                .betweenIfPresent(IotRyHiDailyReportDO::getConstructionStartDate, reqVO.getConstructionStartDate())
+                .betweenIfPresent(IotRyHiDailyReportDO::getConstructionEndDate, reqVO.getConstructionEndDate())
+                .eqIfPresent(IotRyHiDailyReportDO::getProductionStatus, reqVO.getProductionStatus())
+                .eqIfPresent(IotRyHiDailyReportDO::getCurrentOperation, reqVO.getCurrentOperation())
+                .eqIfPresent(IotRyHiDailyReportDO::getNextPlan, reqVO.getNextPlan())
+                .eqIfPresent(IotRyHiDailyReportDO::getConstructionBrief, reqVO.getConstructionBrief())
+                .eqIfPresent(IotRyHiDailyReportDO::getRigStatus, reqVO.getRigStatus())
+                .eqIfPresent(IotRyHiDailyReportDO::getRepairStatus, reqVO.getRepairStatus())
+                .eqIfPresent(IotRyHiDailyReportDO::getPersonnel, reqVO.getPersonnel())
+                .eqIfPresent(IotRyHiDailyReportDO::getTotalStaffNum, reqVO.getTotalStaffNum())
+                .eqIfPresent(IotRyHiDailyReportDO::getLeaveStaffNum, reqVO.getLeaveStaffNum())
+                .eqIfPresent(IotRyHiDailyReportDO::getMudDensity, reqVO.getMudDensity())
+                .eqIfPresent(IotRyHiDailyReportDO::getMudViscosity, reqVO.getMudViscosity())
+                .eqIfPresent(IotRyHiDailyReportDO::getLateralLength, reqVO.getLateralLength())
+                .eqIfPresent(IotRyHiDailyReportDO::getWellInclination, reqVO.getWellInclination())
+                .eqIfPresent(IotRyHiDailyReportDO::getAzimuth, reqVO.getAzimuth())
+                .eqIfPresent(IotRyHiDailyReportDO::getDayShiftSupervisor, reqVO.getDayShiftSupervisor())
+                .eqIfPresent(IotRyHiDailyReportDO::getDaySupervisors, reqVO.getDaySupervisors())
+                .eqIfPresent(IotRyHiDailyReportDO::getNightShiftSupervisor, reqVO.getNightShiftSupervisor())
+                .eqIfPresent(IotRyHiDailyReportDO::getNightSupervisors, reqVO.getNightSupervisors())
+                .eqIfPresent(IotRyHiDailyReportDO::getExtProperty, reqVO.getExtProperty())
+                .eqIfPresent(IotRyHiDailyReportDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotRyHiDailyReportDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotRyHiDailyReportDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotRyHiDailyReportDO::getProcessInstanceId, reqVO.getProcessInstanceId())
+                .eqIfPresent(IotRyHiDailyReportDO::getAuditStatus, reqVO.getAuditStatus())
+                .eqIfPresent(IotRyHiDailyReportDO::getOpinion, reqVO.getOpinion())
+                .betweenIfPresent(IotRyHiDailyReportDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotRyHiDailyReportDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotryimprovedailyreport/IotRyImproveDailyReportMapper.java

@@ -0,0 +1,91 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotryimprovedailyreport;
+
+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.iotryimprovedailyreport.vo.IotRyImproveDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreport.IotRyImproveDailyReportDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 瑞鹰项目启动设备整改 Mapper
+ *
+ * @author ruiqi
+ */
+@Mapper
+public interface IotRyImproveDailyReportMapper extends BaseMapperX<IotRyImproveDailyReportDO> {
+
+    default PageResult<IotRyImproveDailyReportDO> selectPage(IotRyImproveDailyReportPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotRyImproveDailyReportDO>()
+                // .eqIfPresent(IotRyImproveDailyReportDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotRyImproveDailyReportDO::getDeptId, reqVO.getDeptIds())
+                .eqIfPresent(IotRyImproveDailyReportDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(IotRyImproveDailyReportDO::getTaskId, reqVO.getTaskId())
+                .eqIfPresent(IotRyImproveDailyReportDO::getTitle, reqVO.getTitle())
+                .eqIfPresent(IotRyImproveDailyReportDO::getWorkLocation, reqVO.getWorkLocation())
+                .eqIfPresent(IotRyImproveDailyReportDO::getWorkPurpose, reqVO.getWorkPurpose())
+                .eqIfPresent(IotRyImproveDailyReportDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotRyImproveDailyReportDO::getRelocationDays, reqVO.getRelocationDays())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getLatestWellDoneTime, reqVO.getLatestWellDoneTime())
+                .eqIfPresent(IotRyImproveDailyReportDO::getCurrentDepth, reqVO.getCurrentDepth())
+                .eqIfPresent(IotRyImproveDailyReportDO::getDailyFootage, reqVO.getDailyFootage())
+                .eqIfPresent(IotRyImproveDailyReportDO::getMonthlyFootage, reqVO.getMonthlyFootage())
+                .eqIfPresent(IotRyImproveDailyReportDO::getAnnualFootage, reqVO.getAnnualFootage())
+                .eqIfPresent(IotRyImproveDailyReportDO::getMonthlyWellCompletions, reqVO.getMonthlyWellCompletions())
+                .eqIfPresent(IotRyImproveDailyReportDO::getTotalCompletedWells, reqVO.getTotalCompletedWells())
+                .eqIfPresent(IotRyImproveDailyReportDO::getDailyPowerUsage, reqVO.getDailyPowerUsage())
+                .eqIfPresent(IotRyImproveDailyReportDO::getMonthlyPowerUsage, reqVO.getMonthlyPowerUsage())
+                .eqIfPresent(IotRyImproveDailyReportDO::getDailyFuel, reqVO.getDailyFuel())
+                .eqIfPresent(IotRyImproveDailyReportDO::getMonthlyFuel, reqVO.getMonthlyFuel())
+                .eqIfPresent(IotRyImproveDailyReportDO::getDailyOilVolume, reqVO.getDailyOilVolume())
+                .eqIfPresent(IotRyImproveDailyReportDO::getRemainDieselVolume, reqVO.getRemainDieselVolume())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getProductionTime, reqVO.getProductionTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getNonProductionTime, reqVO.getNonProductionTime())
+                .eqIfPresent(IotRyImproveDailyReportDO::getRyNptReason, reqVO.getRyNptReason())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getDrillingWorkingTime, reqVO.getDrillingWorkingTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getOtherProductionTime, reqVO.getOtherProductionTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getAccidentTime, reqVO.getAccidentTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getRepairTime, reqVO.getRepairTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getSelfStopTime, reqVO.getSelfStopTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getComplexityTime, reqVO.getComplexityTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getRelocationTime, reqVO.getRelocationTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getRectificationTime, reqVO.getRectificationTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getWaitingStopTime, reqVO.getWaitingStopTime())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getWinterBreakTime, reqVO.getWinterBreakTime())
+                .eqIfPresent(IotRyImproveDailyReportDO::getPartyaDesign, reqVO.getPartyaDesign())
+                .eqIfPresent(IotRyImproveDailyReportDO::getPartyaPrepare, reqVO.getPartyaPrepare())
+                .eqIfPresent(IotRyImproveDailyReportDO::getPartyaResource, reqVO.getPartyaResource())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getOtherNptTime, reqVO.getOtherNptTime())
+                .eqIfPresent(IotRyImproveDailyReportDO::getOtherNptReason, reqVO.getOtherNptReason())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getConstructionStartDate, reqVO.getConstructionStartDate())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getConstructionEndDate, reqVO.getConstructionEndDate())
+                .eqIfPresent(IotRyImproveDailyReportDO::getProductionStatus, reqVO.getProductionStatus())
+                .eqIfPresent(IotRyImproveDailyReportDO::getCurrentOperation, reqVO.getCurrentOperation())
+                .eqIfPresent(IotRyImproveDailyReportDO::getNextPlan, reqVO.getNextPlan())
+                .eqIfPresent(IotRyImproveDailyReportDO::getConstructionBrief, reqVO.getConstructionBrief())
+                .eqIfPresent(IotRyImproveDailyReportDO::getRigStatus, reqVO.getRigStatus())
+                .eqIfPresent(IotRyImproveDailyReportDO::getRepairStatus, reqVO.getRepairStatus())
+                .eqIfPresent(IotRyImproveDailyReportDO::getPersonnel, reqVO.getPersonnel())
+                .eqIfPresent(IotRyImproveDailyReportDO::getTotalStaffNum, reqVO.getTotalStaffNum())
+                .eqIfPresent(IotRyImproveDailyReportDO::getLeaveStaffNum, reqVO.getLeaveStaffNum())
+                .eqIfPresent(IotRyImproveDailyReportDO::getMudDensity, reqVO.getMudDensity())
+                .eqIfPresent(IotRyImproveDailyReportDO::getMudViscosity, reqVO.getMudViscosity())
+                .eqIfPresent(IotRyImproveDailyReportDO::getLateralLength, reqVO.getLateralLength())
+                .eqIfPresent(IotRyImproveDailyReportDO::getWellInclination, reqVO.getWellInclination())
+                .eqIfPresent(IotRyImproveDailyReportDO::getAzimuth, reqVO.getAzimuth())
+                .eqIfPresent(IotRyImproveDailyReportDO::getDayShiftSupervisor, reqVO.getDayShiftSupervisor())
+                .eqIfPresent(IotRyImproveDailyReportDO::getDaySupervisors, reqVO.getDaySupervisors())
+                .eqIfPresent(IotRyImproveDailyReportDO::getNightShiftSupervisor, reqVO.getNightShiftSupervisor())
+                .eqIfPresent(IotRyImproveDailyReportDO::getNightSupervisors, reqVO.getNightSupervisors())
+                .eqIfPresent(IotRyImproveDailyReportDO::getExtProperty, reqVO.getExtProperty())
+                .eqIfPresent(IotRyImproveDailyReportDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotRyImproveDailyReportDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotRyImproveDailyReportDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotRyImproveDailyReportDO::getProcessInstanceId, reqVO.getProcessInstanceId())
+                .eqIfPresent(IotRyImproveDailyReportDO::getAuditStatus, reqVO.getAuditStatus())
+                .eqIfPresent(IotRyImproveDailyReportDO::getOpinion, reqVO.getOpinion())
+                .betweenIfPresent(IotRyImproveDailyReportDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotRyImproveDailyReportDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/dailyreport/CreateRyImproveDailyReportOrderJob.java

@@ -0,0 +1,196 @@
+package cn.iocoder.yudao.module.pms.job.dailyreport;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.ObjUtil;
+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.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.module.pms.constant.PmsConstants;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreport.IotRyImproveDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotryimprovedailyreport.IotRyImproveDailyReportMapper;
+import cn.iocoder.yudao.module.pms.message.PmsMessage;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import cn.iocoder.yudao.module.system.service.dict.DictDataService;
+import cn.iocoder.yudao.module.system.service.permission.RoleService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.module.pms.framework.config.MultiThreadConfiguration.PMS_THREAD_POOL_TASK_EXECUTOR;
+
+/**
+ * 瑞鹰 项目启动设备整改 日报定时任务
+ * 每天 22:00 生成日报
+ */
+@Component
+@Slf4j
+public class CreateRyImproveDailyReportOrderJob implements JobHandler {
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Resource(name = PMS_THREAD_POOL_TASK_EXECUTOR)
+    private ThreadPoolTaskExecutor pmsThreadPoolTaskExecutor;
+    @Resource
+    private PmsMessage pmsMessage;
+    @Resource
+    private DeptService deptService;
+
+    @Resource
+    private DictDataService dictDataService;
+    @Resource
+    private AdminUserService adminUserService;
+    @Resource
+    private RoleService roleService;
+    @Resource
+    private UserRoleMapper userRoleMapper;
+    @Resource
+    private IotRyImproveDailyReportMapper iotRyImproveDailyReportMapper;
+
+    @Override
+    @TenantIgnore
+    public String execute(String param) throws Exception {
+        // 查询数据字典中 需要生成 瑞鹰项目启动设备整改 日报的部门
+        // 筛选部门下具有 角色 '项目启动设备整改RY' 的 人员 设置为 日报的创建人
+        // 修井 施工状态 字典数据
+        Set<Long> departmentIds = new HashSet<>();
+        List<DictDataDO> improveReportDeptDictData = dictDataService.getDictDataListByDictType("rq_iot_improve_report_dept");
+        if (CollUtil.isNotEmpty(improveReportDeptDictData)) {
+            improveReportDeptDictData.forEach(data -> {
+                departmentIds.add(Long.valueOf(data.getValue()));
+            });
+        }
+
+        if (CollUtil.isNotEmpty(departmentIds)) {
+            Set<Long> projectDeptIds = new HashSet<>();
+            projectDeptIds.addAll(departmentIds);
+            List<AdminUserDO> receivedMsgUsers = adminUserService.getUserListByDeptIds(projectDeptIds);
+            Set<Long> userIds = new HashSet<>();
+            if (CollUtil.isNotEmpty(receivedMsgUsers)) {
+                receivedMsgUsers.forEach(user -> {
+                    userIds.add(user.getId());
+                });
+            }
+            RoleDO role = roleService.getRoleByCode("项目启动设备整改RY");
+            if (ObjUtil.isNotEmpty(role)) {
+                Set<Long> roleIds = new HashSet<>();
+                roleIds.add(role.getId());
+                List<UserRoleDO> userRoles = userRoleMapper.selectListByRoleIds(roleIds);
+                if (CollUtil.isNotEmpty(userRoles)) {
+                    // 提取有审批角色的所有用户ID（去重+空值过滤）
+                    Set<Long> roleUserIds = userRoles.stream()
+                            .map(UserRoleDO::getUserId)
+                            .filter(Objects::nonNull) // 过滤空userId
+                            .collect(Collectors.toSet());
+                    // 计算两个集合的交集，得到最终目标用户ID
+                    Set<Long> targetUserIds = userIds.stream()
+                            .filter(roleUserIds::contains)
+                            .collect(Collectors.toSet());
+                    // 从 targetUserIds 随机选择1个用户作为日报的 创建人
+                    List<Long> targetUserIdList = new ArrayList<>(targetUserIds);
+                    if (CollUtil.isNotEmpty(targetUserIdList)) {
+                        Long creatorId = targetUserIdList.get(0);
+                        // 当天已经生成 瑞鹰项目启动设备整改 日报的队伍deptId集合
+                        Set<Long> currentDayReportedDeptIds = new HashSet<>();
+                        // 查询所有 '瑞鹰项目启动设备整改日报' 以‘部门-时间’ 为唯一键 当天创建时间 内没有生成过日报
+                        LocalDateTime currentDate = LocalDateTime.now();
+                        String currentFormatDateStr = LocalDateTimeUtil.format(currentDate, "yyyy-MM-dd");
+                        IotRyImproveDailyReportPageReqVO ryReqVO = new IotRyImproveDailyReportPageReqVO();
+                        ryReqVO.setDeptIds(departmentIds);
+                        ryReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+                        PageResult<IotRyImproveDailyReportDO> pageReports = iotRyImproveDailyReportMapper.selectPage(ryReqVO);
+                        if (ObjUtil.isNotEmpty(pageReports)) {
+                            List<IotRyImproveDailyReportDO> improveDailyReports = pageReports.getList();
+                            if (CollUtil.isNotEmpty(improveDailyReports)) {
+                                improveDailyReports.forEach(report -> {
+                                    // 查询当天生成的日报
+                                    LocalDateTime createDate = report.getCreateTime();
+                                    String formatDateStr = LocalDateTimeUtil.format(createDate, "yyyy-MM-dd");
+                                    if (formatDateStr.equals(currentFormatDateStr)) {
+                                        currentDayReportedDeptIds.add(report.getDeptId());
+                                    }
+                                });
+                            }
+                        }
+                        // 如果当天的 瑞鹰项目启动设备整改 日报记录中不包含 数据字典中配置的部门id 则生成队伍日报记录
+                        Set<Long> tobeReportDeptIds = departmentIds.stream()
+                                .filter(deptId -> !currentDayReportedDeptIds.contains(deptId))
+                                .collect(Collectors.toSet());
+                        List<IotRyImproveDailyReportDO> tobeAddedReports = new ArrayList<>();
+                        if (CollUtil.isNotEmpty(tobeReportDeptIds)) {
+                            // 查询这些部门对象集合
+                            Map<Long, DeptDO> deptMap = deptService.getDeptMap(tobeReportDeptIds);
+                            for (Long tobeReportDeptId : tobeReportDeptIds) {
+                                IotRyImproveDailyReportDO improveReport = new IotRyImproveDailyReportDO();
+                                improveReport.setDeptId(tobeReportDeptId);
+                                improveReport.setStatus(0);
+                                improveReport.setAuditStatus(0);
+                                improveReport.setCreateTime(LocalDateTime.now());
+                                improveReport.setCreator(creatorId.toString());
+                                tobeAddedReports.add(improveReport);
+                            }
+                            if (CollUtil.isNotEmpty(tobeAddedReports)) {
+                                iotRyImproveDailyReportMapper.insertBatch(tobeAddedReports);
+
+                                // 异步发送消息提醒 钉钉 站内信
+                                // 查询所有日报的创建人 userId 集合
+                                Set<Long> msgUserIds = new HashSet<>(convertList(tobeAddedReports, report -> Long.valueOf(report.getCreator())));
+                                Map<Long, AdminUserRespDTO> users = adminUserApi.getUserMap(msgUserIds);
+                                // 建立日报与 用户手机号的 对应关系
+                                Map<Long, String> reportMobilePair = new HashMap<>();
+                                tobeAddedReports.forEach(report -> {
+                                    if (users.containsKey(Long.valueOf(report.getCreator()))) {
+                                        AdminUserRespDTO user = users.get(Long.valueOf(report.getCreator()));
+                                        reportMobilePair.put(report.getId(), user.getMobile());
+                                    }
+                                });
+                                // 异步多线程发送 站内信 钉钉 消息
+                                tobeAddedReports.forEach(report -> {
+                                    CountDownLatch latch = new CountDownLatch(tobeAddedReports.size());
+                                    // deptMap 部门集合   taskWellNamePair任务集合
+                                    Long deptId = report.getDeptId();
+                                    DeptDO dept = deptMap.get(deptId);
+                                    String msgTitle = dept.getName();
+                                    String finalMsgTitle = msgTitle;
+                                    pmsThreadPoolTaskExecutor.execute(() -> {
+                                        try {
+                                            // 用户 没有维护 手机号 也可以发送站内信消息
+                                            String mobile = StrUtil.EMPTY;
+                                            if (reportMobilePair.containsKey(report.getId())) {
+                                                mobile = reportMobilePair.get(report.getId());
+                                            }
+                                            pmsMessage.sendMessage(report.getId(), finalMsgTitle, PmsConstants.RY_XJ_DAILY_REPORT,
+                                                    Long.valueOf(report.getCreator()), mobile);
+                                        } finally {
+                                            latch.countDown();
+                                        }
+                                    });
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return "创建成功";
+    }
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/message/PmsMessage.java

@@ -110,6 +110,14 @@ public class PmsMessage {
                 msg = "您有新的修井生产日报 " + name + "需要填报，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             }
 
+            // 瑞鹰项目启动设备整改
+            if (PmsConstants.RY_IMPROVE_DAILY_REPORT.equals(businessType)) {
+                msg = "您有新的项目启动设备整改日报 " + name + "需要填报，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
+            }
+            if (PmsConstants.RY_IMPROVE_DAILY_REPORT_APPROVAL.equals(businessType)) {
+                msg = "您有新的项目启动设备整改日报 " + name + "需要审批，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
+            }
+
             if (PmsConstants.GENERATE_OPERATION.equals(businessType)) {
                 msg = "您有新的运行记录工单 " + name + "，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrddailyreport/IotRdDailyReportServiceImpl.java

@@ -1126,8 +1126,6 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
         // key工作量标识   value累计 台次 当日泵车台次
         Map<String, BigDecimal> cumulativePumpTripsPair = new HashMap<>();
 
-
-
         // 查询 瑞都 施工状态 字典数据 筛选出施工设备为 LY 的记录
         Set<String> lyStatuses = new HashSet<>();
         List<DictDataDO> rdStatuses = dictDataService.getDictDataListByDictType("rdStatus");

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotryhidailyreport/IotRyHiDailyReportService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.service.iotryhidailyreport;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport.vo.IotRyHiDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport.vo.IotRyHiDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryhidailyreport.IotRyHiDailyReportDO;
+
+import javax.validation.Valid;
+
+/**
+ * 瑞鹰历史日报 Service 接口
+ *
+ * @author ruiqi
+ */
+public interface IotRyHiDailyReportService {
+
+    /**
+     * 创建瑞鹰历史日报
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotRyHiDailyReport(@Valid IotRyHiDailyReportSaveReqVO createReqVO);
+
+    /**
+     * 更新瑞鹰历史日报
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotRyHiDailyReport(@Valid IotRyHiDailyReportSaveReqVO updateReqVO);
+
+    /**
+     * 删除瑞鹰历史日报
+     *
+     * @param id 编号
+     */
+    void deleteIotRyHiDailyReport(Long id);
+
+    /**
+     * 获得瑞鹰历史日报
+     *
+     * @param id 编号
+     * @return 瑞鹰历史日报
+     */
+    IotRyHiDailyReportDO getIotRyHiDailyReport(Long id);
+
+    /**
+     * 获得瑞鹰历史日报分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 瑞鹰历史日报分页
+     */
+    PageResult<IotRyHiDailyReportDO> getIotRyHiDailyReportPage(IotRyHiDailyReportPageReqVO pageReqVO);
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotryhidailyreport/IotRyHiDailyReportServiceImpl.java

@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.pms.service.iotryhidailyreport;
+
+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.iotryhidailyreport.vo.IotRyHiDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryhidailyreport.vo.IotRyHiDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryhidailyreport.IotRyHiDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotryhidailyreport.IotRyHiDailyReportMapper;
+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_RY_HI_DAILY_REPORT_NOT_EXISTS;
+
+
+/**
+ * 瑞鹰历史日报 Service 实现类
+ *
+ * @author ruiqi
+ */
+@Service
+@Validated
+public class IotRyHiDailyReportServiceImpl implements IotRyHiDailyReportService {
+
+    @Resource
+    private IotRyHiDailyReportMapper iotRyHiDailyReportMapper;
+
+    @Override
+    public Long createIotRyHiDailyReport(IotRyHiDailyReportSaveReqVO createReqVO) {
+        // 插入
+        IotRyHiDailyReportDO iotRyHiDailyReport = BeanUtils.toBean(createReqVO, IotRyHiDailyReportDO.class);
+        iotRyHiDailyReportMapper.insert(iotRyHiDailyReport);
+        // 返回
+        return iotRyHiDailyReport.getId();
+    }
+
+    @Override
+    public void updateIotRyHiDailyReport(IotRyHiDailyReportSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotRyHiDailyReportExists(updateReqVO.getId());
+        // 更新
+        IotRyHiDailyReportDO updateObj = BeanUtils.toBean(updateReqVO, IotRyHiDailyReportDO.class);
+        iotRyHiDailyReportMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotRyHiDailyReport(Long id) {
+        // 校验存在
+        validateIotRyHiDailyReportExists(id);
+        // 删除
+        iotRyHiDailyReportMapper.deleteById(id);
+    }
+
+    private void validateIotRyHiDailyReportExists(Long id) {
+        if (iotRyHiDailyReportMapper.selectById(id) == null) {
+            throw exception(IOT_RY_HI_DAILY_REPORT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public IotRyHiDailyReportDO getIotRyHiDailyReport(Long id) {
+        return iotRyHiDailyReportMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotRyHiDailyReportDO> getIotRyHiDailyReportPage(IotRyHiDailyReportPageReqVO pageReqVO) {
+        return iotRyHiDailyReportMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotryimprovedailyreport/IotRyImproveDailyReportService.java

@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.pms.service.iotryimprovedailyreport;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreport.IotRyImproveDailyReportDO;
+
+import javax.validation.Valid;
+
+/**
+ * 瑞鹰项目启动设备整改 Service 接口
+ *
+ * @author ruiqi
+ */
+public interface IotRyImproveDailyReportService {
+
+    /**
+     * 创建瑞鹰项目启动设备整改
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotRyImproveDailyReport(@Valid IotRyImproveDailyReportSaveReqVO createReqVO);
+
+    /**
+     * 更新瑞鹰项目启动设备整改
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotRyImproveDailyReport(@Valid IotRyImproveDailyReportSaveReqVO updateReqVO);
+
+    /**
+     * 删除瑞鹰项目启动设备整改
+     *
+     * @param id 编号
+     */
+    void deleteIotRyImproveDailyReport(Long id);
+
+    /**
+     * 获得瑞鹰项目启动设备整改
+     *
+     * @param id 编号
+     * @return 瑞鹰项目启动设备整改
+     */
+    IotRyImproveDailyReportDO getIotRyImproveDailyReport(Long id);
+
+    /**
+     * 获得瑞鹰项目启动设备整改分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 瑞鹰项目启动设备整改分页
+     */
+    PageResult<IotRyImproveDailyReportDO> getIotRyImproveDailyReportPage(IotRyImproveDailyReportPageReqVO pageReqVO);
+
+    /**
+     * 审批日报
+     *
+     * @param updateReqVO 日报对象
+     * @return
+     */
+    void approvalImproveDailyReport(IotRyImproveDailyReportSaveReqVO updateReqVO);
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotryimprovedailyreport/IotRyImproveDailyReportServiceImpl.java

@@ -0,0 +1,295 @@
+package cn.iocoder.yudao.module.pms.service.iotryimprovedailyreport;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.pms.constant.PmsConstants;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreport.IotRyImproveDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotryimprovedailyreport.IotRyImproveDailyReportMapper;
+import cn.iocoder.yudao.module.pms.message.PmsMessage;
+import cn.iocoder.yudao.module.supplier.enums.common.SupplierAuditStatusEnum;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import cn.iocoder.yudao.module.system.service.permission.RoleService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_RY_IMPROVE_DAILY_REPORT_NOT_EXISTS;
+import static cn.iocoder.yudao.module.pms.framework.config.MultiThreadConfiguration.PMS_THREAD_POOL_TASK_EXECUTOR;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.DEPT_NOT_FOUND;
+
+/**
+ * 瑞鹰项目启动设备整改 Service 实现类
+ *
+ * @author ruiqi
+ */
+@Service
+@Validated
+public class IotRyImproveDailyReportServiceImpl implements IotRyImproveDailyReportService {
+
+    @Resource
+    private IotRyImproveDailyReportMapper iotRyImproveDailyReportMapper;
+    @Resource
+    private DeptService deptService;
+    @Resource
+    private AdminUserService adminUserService;
+    @Resource
+    private RoleService roleService;
+    @Resource
+    private UserRoleMapper userRoleMapper;
+    @Resource
+    private AdminUserApi adminUserApi;
+    @Resource(name = PMS_THREAD_POOL_TASK_EXECUTOR)
+    private ThreadPoolTaskExecutor pmsThreadPoolTaskExecutor;
+    @Resource
+    private PmsMessage pmsMessage;
+
+    @Override
+    public Long createIotRyImproveDailyReport(IotRyImproveDailyReportSaveReqVO createReqVO) {
+        // 创建人为当前登录人
+        Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        DeptDO dept = deptService.getDept(loginUserDeptId);
+        if (ObjUtil.isEmpty(dept)) {
+            throw exception(DEPT_NOT_FOUND);
+        }
+        // 插入
+        IotRyImproveDailyReportDO iotRyImproveDailyReport = BeanUtils.toBean(createReqVO, IotRyImproveDailyReportDO.class);
+        // 新增时 status = 1 填报完成 audit_status = 10审批中
+        iotRyImproveDailyReport.setDeptId(dept.getId());
+        iotRyImproveDailyReport.setStatus(1);
+        iotRyImproveDailyReport.setAuditStatus(10);
+        iotRyImproveDailyReport.setCreator(loginUserDeptId.toString());
+        iotRyImproveDailyReportMapper.insert(iotRyImproveDailyReport);
+        // 查找当前登录人的上级项目部审批人 发送审批通知
+        DataPermissionUtils.executeIgnore(() -> {
+            // 伊拉克项目部公共账号 填报 在当前部门内部查找 具有 审批权限 ‘项目部日报审批RY’ ‘项目部日报审批RYXJ’ 的人员
+            Set<Long> projectIds = new HashSet<>();
+            projectIds.add(dept.getId());
+            List<AdminUserDO> receivedMsgUsers = adminUserService.getUserListByDeptIds(projectIds);
+            if (CollUtil.isNotEmpty(receivedMsgUsers)) {
+                Set<Long> userIds = new HashSet<>();
+                receivedMsgUsers.forEach(user -> {
+                    userIds.add(user.getId());
+                });
+                RoleDO role = roleService.getRoleByCode("项目部日报审批RY");
+                RoleDO xjRole = roleService.getRoleByCode("项目部日报审批RYXJ");
+                if (ObjUtil.isNotEmpty(role) || ObjUtil.isNotEmpty(xjRole)) {
+                    Set<Long> roleIds = new HashSet<>();
+                    if (ObjUtil.isNotEmpty(role)) {
+                        roleIds.add(role.getId());
+                    }
+                    if (ObjUtil.isNotEmpty(xjRole)) {
+                        roleIds.add(xjRole.getId());
+                    }
+                    List<UserRoleDO> userRoles = userRoleMapper.selectListByRoleIds(roleIds);
+                    if (CollUtil.isNotEmpty(userRoles)) {
+                        // 提取有审批角色的所有用户ID（去重+空值过滤）
+                        Set<Long> roleUserIds = userRoles.stream()
+                                .map(UserRoleDO::getUserId)
+                                .filter(Objects::nonNull) // 过滤空userId
+                                .collect(Collectors.toSet());
+                        // 计算两个集合的交集，得到最终目标用户ID
+                        Set<Long> targetUserIds = userIds.stream()
+                                .filter(roleUserIds::contains)
+                                .collect(Collectors.toSet());
+                        if (CollUtil.isNotEmpty(targetUserIds)) {
+                            Map<Long, AdminUserRespDTO> users = adminUserApi.getUserMap(targetUserIds);
+                            if (CollUtil.isNotEmpty(users)) {
+                                String msgTitle = iotRyImproveDailyReport.getTitle();
+                                CountDownLatch latch = new CountDownLatch(users.size());
+                                String finalMsgTitle = msgTitle;
+                                String constant = PmsConstants.RY_IMPROVE_DAILY_REPORT_APPROVAL;
+                                users.forEach((userId, user) -> {
+                                    pmsThreadPoolTaskExecutor.execute(() -> {
+                                        try {
+                                            String mobile = user.getMobile();
+                                            // 没有手机号也可以发送站内信消息
+                                            if (StrUtil.isNotBlank(finalMsgTitle)) {
+                                                pmsMessage.sendMessage(iotRyImproveDailyReport.getId(), finalMsgTitle, constant,
+                                                        userId, mobile);
+                                            }
+                                        } finally {
+                                            latch.countDown();
+                                        }
+                                    });
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        });
+        // 返回
+        return iotRyImproveDailyReport.getId();
+    }
+
+    @Override
+    public void updateIotRyImproveDailyReport(IotRyImproveDailyReportSaveReqVO updateReqVO) {
+        // 校验存在
+        IotRyImproveDailyReportDO existReport = validateIotRyImproveDailyReportExists(updateReqVO.getId());
+        DeptDO dept = deptService.getDept(existReport.getDeptId());
+        if (ObjUtil.isEmpty(dept)) {
+            throw exception(DEPT_NOT_FOUND);
+        }
+        // 更新
+        IotRyImproveDailyReportDO updateObj = BeanUtils.toBean(updateReqVO, IotRyImproveDailyReportDO.class);
+        // 提交 待审批
+        updateObj.setStatus(1);
+        updateObj.setAuditStatus(10);
+        iotRyImproveDailyReportMapper.updateById(updateObj);
+        // 钉钉 站内信 提醒项目部人员审批
+        // 查找当前登录人的上级项目部审批人 发送审批通知
+        DataPermissionUtils.executeIgnore(() -> {
+            // 伊拉克项目部公共账号 填报 在当前部门内部查找 具有 审批权限 ‘项目部日报审批RY’ ‘项目部日报审批RYXJ’ 的人员
+            Set<Long> projectIds = new HashSet<>();
+            projectIds.add(dept.getId());
+            List<AdminUserDO> receivedMsgUsers = adminUserService.getUserListByDeptIds(projectIds);
+            if (CollUtil.isNotEmpty(receivedMsgUsers)) {
+                Set<Long> userIds = new HashSet<>();
+                receivedMsgUsers.forEach(user -> {
+                    userIds.add(user.getId());
+                });
+                RoleDO role = roleService.getRoleByCode("项目部日报审批RY");
+                RoleDO xjRole = roleService.getRoleByCode("项目部日报审批RYXJ");
+                if (ObjUtil.isNotEmpty(role) || ObjUtil.isNotEmpty(xjRole)) {
+                    Set<Long> roleIds = new HashSet<>();
+                    if (ObjUtil.isNotEmpty(role)) {
+                        roleIds.add(role.getId());
+                    }
+                    if (ObjUtil.isNotEmpty(xjRole)) {
+                        roleIds.add(xjRole.getId());
+                    }
+                    List<UserRoleDO> userRoles = userRoleMapper.selectListByRoleIds(roleIds);
+                    if (CollUtil.isNotEmpty(userRoles)) {
+                        // 提取有审批角色的所有用户ID（去重+空值过滤）
+                        Set<Long> roleUserIds = userRoles.stream()
+                                .map(UserRoleDO::getUserId)
+                                .filter(Objects::nonNull) // 过滤空userId
+                                .collect(Collectors.toSet());
+                        // 计算两个集合的交集，得到最终目标用户ID
+                        Set<Long> targetUserIds = userIds.stream()
+                                .filter(roleUserIds::contains)
+                                .collect(Collectors.toSet());
+                        if (CollUtil.isNotEmpty(targetUserIds)) {
+                            Map<Long, AdminUserRespDTO> users = adminUserApi.getUserMap(targetUserIds);
+                            if (CollUtil.isNotEmpty(users)) {
+                                String msgTitle = updateObj.getTitle();
+                                CountDownLatch latch = new CountDownLatch(users.size());
+                                String finalMsgTitle = msgTitle;
+                                String constant = PmsConstants.RY_IMPROVE_DAILY_REPORT_APPROVAL;
+                                users.forEach((userId, user) -> {
+                                    pmsThreadPoolTaskExecutor.execute(() -> {
+                                        try {
+                                            String mobile = user.getMobile();
+                                            // 没有手机号也可以发送站内信消息
+                                            if (StrUtil.isNotBlank(finalMsgTitle)) {
+                                                pmsMessage.sendMessage(updateObj.getId(), finalMsgTitle, constant,
+                                                        userId, mobile);
+                                            }
+                                        } finally {
+                                            latch.countDown();
+                                        }
+                                    });
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    public void deleteIotRyImproveDailyReport(Long id) {
+        // 校验存在
+        validateIotRyImproveDailyReportExists(id);
+        // 删除
+        iotRyImproveDailyReportMapper.deleteById(id);
+    }
+
+    private IotRyImproveDailyReportDO validateIotRyImproveDailyReportExists(Long id) {
+        IotRyImproveDailyReportDO improveDailyReport = iotRyImproveDailyReportMapper.selectById(id);
+        if (ObjUtil.isEmpty(improveDailyReport)) {
+            throw exception(IOT_RY_IMPROVE_DAILY_REPORT_NOT_EXISTS);
+        }
+        return improveDailyReport;
+    }
+
+    @Override
+    public IotRyImproveDailyReportDO getIotRyImproveDailyReport(Long id) {
+        return iotRyImproveDailyReportMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotRyImproveDailyReportDO> getIotRyImproveDailyReportPage(IotRyImproveDailyReportPageReqVO pageReqVO) {
+        // 查询选择部门下面所有子部门
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+            pageReqVO.setDeptIds(ids);
+        }
+        return iotRyImproveDailyReportMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public void approvalImproveDailyReport(IotRyImproveDailyReportSaveReqVO updateReqVO) {
+        // 审核瑞恒日报
+        // 如果审批拒绝 修改日报 填报状态 status = 0 填写中  审批状态 auditStatus = 30
+        // 审批通过 设置 日报审批状态 auditStatus = 20
+        IotRyImproveDailyReportDO dailyReport = validateIotRyImproveDailyReportExists(updateReqVO.getId());
+        dailyReport.setAuditStatus(updateReqVO.getAuditStatus());
+        dailyReport.setOpinion(updateReqVO.getOpinion());
+        dailyReport.setConstructionBrief(updateReqVO.getConstructionBrief());
+        if (SupplierAuditStatusEnum.REJECT.getStatus().equals(updateReqVO.getAuditStatus())) {
+            dailyReport.setStatus(0);
+            // 审批拒绝后需要向 日报填报人 发送消息提醒 驳回到日报创建人
+            Long deptId = dailyReport.getDeptId();
+            // 当前日报创建人
+            String creator = dailyReport.getCreator();
+            // 消息标题
+            String msgTitle = dailyReport.getTitle();
+            // 查询当前部门 deptId 部门下的人员
+            Set<Long> deptIds = new HashSet<>();
+            deptIds.add(deptId);
+            List<AdminUserDO> users = adminUserService.getUserListByDeptIds(deptIds);
+            AdminUserDO user = adminUserService.getUser(Long.valueOf(creator));
+            if (ObjUtil.isNotEmpty(user)) {
+                // AdminUserDO user = users.get(0);
+                String mobile = user.getMobile();
+                String finalMsgTitle = msgTitle;
+                String constant = PmsConstants.RY_IMPROVE_DAILY_REPORT;
+
+                // 没有手机号 可以发送站内信消息
+                if (StrUtil.isNotBlank(finalMsgTitle) && StrUtil.isNotBlank(creator)) {
+                    pmsThreadPoolTaskExecutor.execute(() -> {
+                        pmsMessage.sendMessage(dailyReport.getId(), finalMsgTitle, constant, Long.valueOf(creator), mobile);
+                    });
+                }
+            }
+        }
+        // 更新瑞鹰项目启动设备整改 日报 状态
+        iotRyImproveDailyReportMapper.updateById(dailyReport);
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotOpeationFillMapper.xml

@@ -1372,7 +1372,7 @@
         <foreach collection="teams" item="item" open="(" separator="," close=")">
             #{item.id}
         </foreach>
-        AND asset_class IN (159, 160, 122, 106, 157, 158, 308, 108)
+        AND asset_class IN (159, 160, 122, 106, 157, 158, 308, 108,229)
         AND deleted = 0
         ) AS d
         ) AS temp