pms 瑞鹰看板 历史日报

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

@@ -115,4 +115,5 @@ public interface ErrorCodeConstant{
     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/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

@@ -1,5 +1,6 @@
 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;
@@ -11,6 +12,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.I
 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;
@@ -22,10 +25,14 @@ 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
@@ -35,6 +42,8 @@ public class IotRyImproveDailyReportController {
 
     @Resource
     private IotRyImproveDailyReportService iotRyImproveDailyReportService;
+    @Resource
+    private DeptService deptService;
 
     @PostMapping("/create")
     @Operation(summary = "创建瑞鹰项目启动设备整改")
@@ -82,7 +91,27 @@ public class IotRyImproveDailyReportController {
     @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(BeanUtils.toBean(pageResult, IotRyImproveDailyReportRespVO.class));
+        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")

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

@@ -285,4 +285,10 @@ public class IotRyImproveDailyReportRespVO {
     @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/stat/IotStaticController.java

@@ -28,6 +28,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;
@@ -46,6 +47,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.iotoutbound.IotOutboundDO;
 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;
@@ -70,6 +72,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 +180,9 @@ public class IotStaticController {
     private DeptUtil deptUtil;
     @Autowired
     private IotMainWorkOrderService iotMainWorkOrderService;
+    @Autowired
+    private IotRyHiDailyReportService iotRyHiDailyReportService;
+
 
     @GetMapping("/main/day")
     public CommonResult<Map<String, Object>> getMaintainDay() {
@@ -1964,6 +1970,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

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/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/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/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