pms 瑞鹰 瑞鹰项目启动设备整改

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

@@ -114,4 +114,5 @@ 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, "瑞鹰项目启动设备整改不存在");
 }

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

@@ -30,6 +30,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/iotryimprovedailyreport/IotRyImproveDailyReportController.java

@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport;
+
+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 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-improve-daily-report")
+@Validated
+public class IotRyImproveDailyReportController {
+
+    @Resource
+    private IotRyImproveDailyReportService iotRyImproveDailyReportService;
+
+    @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(BeanUtils.toBean(pageResult, IotRyImproveDailyReportRespVO.class));
+    }
+
+    @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,239 @@
+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 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;
+
+}

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

@@ -0,0 +1,288 @@
+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;
+
+}

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/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/iotryimprovedailyreport/IotRyImproveDailyReportMapper.java

@@ -0,0 +1,90 @@
+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())
+                .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/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/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,285 @@
+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.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) {
+        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);
+                    });
+                }
+            }
+        }
+    }
+
+}