pms 5#国日报 代码初始化

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

@@ -117,4 +117,5 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_RY_IMPROVE_DAILY_REPORT_NOT_EXISTS = new ErrorCode(300, "瑞鹰项目启动设备整改不存在");
     ErrorCode IOT_RY_HI_DAILY_REPORT_NOT_EXISTS = new ErrorCode(400, "瑞鹰历史日报不存在");
     ErrorCode IOT_RY_IMPROVE_DAILY_REPORT_DETAIL_NOT_EXISTS = new ErrorCode(500, "瑞鹰设备整改日报明细(生产动态拆分)不存在");
+    ErrorCode IOT_FIVE_DAILY_REPORT_NOT_EXISTS = new ErrorCode(600, "5#国日报不存在");
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotfivedailyreport/IotFiveDailyReportController.java

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotfivedailyreport;
+
+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.iotfivedailyreport.vo.IotFiveDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotfivedailyreport.vo.IotFiveDailyReportRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotfivedailyreport.vo.IotFiveDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotfivedailyreport.IotFiveDailyReportDO;
+import cn.iocoder.yudao.module.pms.service.iotfivedailyreport.IotFiveDailyReportService;
+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 = "管理后台 - 5#国日报")
+@RestController
+@RequestMapping("/pms/iot-five-daily-report")
+@Validated
+public class IotFiveDailyReportController {
+
+    @Resource
+    private IotFiveDailyReportService iotFiveDailyReportService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建5#国日报")
+    @PreAuthorize("@ss.hasPermission('pms:iot-five-daily-report:create')")
+    public CommonResult<Long> createIotFiveDailyReport(@Valid @RequestBody IotFiveDailyReportSaveReqVO createReqVO) {
+        return success(iotFiveDailyReportService.createIotFiveDailyReport(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新5#国日报")
+    @PreAuthorize("@ss.hasPermission('pms:iot-five-daily-report:update')")
+    public CommonResult<Boolean> updateIotFiveDailyReport(@Valid @RequestBody IotFiveDailyReportSaveReqVO updateReqVO) {
+        iotFiveDailyReportService.updateIotFiveDailyReport(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除5#国日报")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-five-daily-report:delete')")
+    public CommonResult<Boolean> deleteIotFiveDailyReport(@RequestParam("id") Long id) {
+        iotFiveDailyReportService.deleteIotFiveDailyReport(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得5#国日报")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-five-daily-report:query')")
+    public CommonResult<IotFiveDailyReportRespVO> getIotFiveDailyReport(@RequestParam("id") Long id) {
+        IotFiveDailyReportDO iotFiveDailyReport = iotFiveDailyReportService.getIotFiveDailyReport(id);
+        return success(BeanUtils.toBean(iotFiveDailyReport, IotFiveDailyReportRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得5#国日报分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-five-daily-report:query')")
+    public CommonResult<PageResult<IotFiveDailyReportRespVO>> getIotFiveDailyReportPage(@Valid IotFiveDailyReportPageReqVO pageReqVO) {
+        PageResult<IotFiveDailyReportDO> pageResult = iotFiveDailyReportService.getIotFiveDailyReportPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotFiveDailyReportRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出5#国日报 Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-five-daily-report:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotFiveDailyReportExcel(@Valid IotFiveDailyReportPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotFiveDailyReportDO> list = iotFiveDailyReportService.getIotFiveDailyReportPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "5#国日报.xls", "数据", IotFiveDailyReportRespVO.class,
+                        BeanUtils.toBean(list, IotFiveDailyReportRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotfivedailyreport/vo/IotFiveDailyReportPageReqVO.java

@@ -0,0 +1,217 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotfivedailyreport.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 5#国日报分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotFiveDailyReportPageReqVO extends PageParam {
+
+    @Schema(description = "施工队伍id", example = "15068")
+    private Long deptId;
+
+    @Schema(description = "日报名称", example = "王五")
+    private String reportName;
+
+    @Schema(description = "项目id", example = "30840")
+    private Long projectId;
+
+    @Schema(description = "项目名称", example = "李四")
+    private String projectName;
+
+    @Schema(description = "合同甲方")
+    private String customer;
+
+    @Schema(description = "任务id", example = "3181")
+    private Long taskId;
+
+    @Schema(description = "井号", example = "李四")
+    private String wellName;
+
+    @Schema(description = "施工地点")
+    private String location;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "施工工艺([123,233])")
+    private String techniqueIds;
+
+    @Schema(description = "施工设备([123,233])")
+    private String deviceIds;
+
+    @Schema(description = "设备名称")
+    private String deviceNames;
+
+    @Schema(description = "时间节点-开始")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalTime[] startTime;
+
+    @Schema(description = "时间节点-结束")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalTime[] endTime;
+
+    @Schema(description = "主设备(泵车)数量")
+    private BigDecimal mainDeviceNum;
+
+    @Schema(description = "作业设备(泵车)数量")
+    private BigDecimal wokDeviceNum;
+
+    @Schema(description = "带班干部")
+    private String responsiblePerson;
+
+    @Schema(description = "当日加砂量(吨)")
+    private BigDecimal dailySandVolume;
+
+    @Schema(description = "当日主压层数(层)")
+    private BigDecimal dailyWorkingLayers;
+
+    @Schema(description = "当日注液量(m³)")
+    private BigDecimal dailyLiquidVolume;
+
+    @Schema(description = "当日作业井数(井)")
+    private BigDecimal dailyWellVolume;
+
+    @Schema(description = "当日油耗(吨)")
+    private BigDecimal dailyFuel;
+
+    @Schema(description = "单井工作量")
+    private String singleWellWorkload;
+
+    @Schema(description = "天气")
+    private String weather;
+
+    @Schema(description = "气温(℃)")
+    private String temperature;
+
+    @Schema(description = "当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @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 nptReason;
+
+    @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 nextPlan;
+
+    @Schema(description = "施工简报")
+    private String constructionBrief;
+
+    @Schema(description = "施工状态(动迁上井/动迁下井/施工准备/施工...)", example = "2")
+    private String fiveStatus;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "状态(2填写中 0待填写 1已完成)", example = "2")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "187")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    private Integer auditStatus;
+
+    @Schema(description = "审批意见")
+    private String opinion;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "日报填写时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] fillTime;
+
+    @Schema(description = "审批时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] approvalTime;
+
+    @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 = "非生产时效")
+    private BigDecimal nptRate;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotfivedailyreport/vo/IotFiveDailyReportRespVO.java

@@ -0,0 +1,287 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotfivedailyreport.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;
+import java.time.LocalTime;
+
+@Schema(description = "管理后台 - 5#国日报 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotFiveDailyReportRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13655")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "15068")
+    @ExcelProperty("施工队伍id")
+    private Long deptId;
+
+    @Schema(description = "日报名称", example = "王五")
+    @ExcelProperty("日报名称")
+    private String reportName;
+
+    @Schema(description = "项目id", example = "30840")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "项目名称", example = "李四")
+    @ExcelProperty("项目名称")
+    private String projectName;
+
+    @Schema(description = "合同甲方")
+    @ExcelProperty("合同甲方")
+    private String customer;
+
+    @Schema(description = "任务id", example = "3181")
+    @ExcelProperty("任务id")
+    private Long taskId;
+
+    @Schema(description = "井号", example = "李四")
+    @ExcelProperty("井号")
+    private String wellName;
+
+    @Schema(description = "施工地点")
+    @ExcelProperty("施工地点")
+    private String location;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    @ExcelProperty("项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "施工工艺([123,233])")
+    @ExcelProperty("施工工艺([123,233])")
+    private String techniqueIds;
+
+    @Schema(description = "施工设备([123,233])")
+    @ExcelProperty("施工设备([123,233])")
+    private String deviceIds;
+
+    @Schema(description = "设备名称")
+    @ExcelProperty("设备名称")
+    private String deviceNames;
+
+    @Schema(description = "时间节点-开始")
+    @ExcelProperty("时间节点-开始")
+    private LocalTime startTime;
+
+    @Schema(description = "时间节点-结束")
+    @ExcelProperty("时间节点-结束")
+    private LocalTime endTime;
+
+    @Schema(description = "主设备(泵车)数量")
+    @ExcelProperty("主设备(泵车)数量")
+    private BigDecimal mainDeviceNum;
+
+    @Schema(description = "作业设备(泵车)数量")
+    @ExcelProperty("作业设备(泵车)数量")
+    private BigDecimal wokDeviceNum;
+
+    @Schema(description = "带班干部")
+    @ExcelProperty("带班干部")
+    private String responsiblePerson;
+
+    @Schema(description = "当日加砂量(吨)")
+    @ExcelProperty("当日加砂量(吨)")
+    private BigDecimal dailySandVolume;
+
+    @Schema(description = "当日主压层数(层)")
+    @ExcelProperty("当日主压层数(层)")
+    private BigDecimal dailyWorkingLayers;
+
+    @Schema(description = "当日注液量(m³)")
+    @ExcelProperty("当日注液量(m³)")
+    private BigDecimal dailyLiquidVolume;
+
+    @Schema(description = "当日作业井数(井)")
+    @ExcelProperty("当日作业井数(井)")
+    private BigDecimal dailyWellVolume;
+
+    @Schema(description = "当日油耗(吨)")
+    @ExcelProperty("当日油耗(吨)")
+    private BigDecimal dailyFuel;
+
+    @Schema(description = "单井工作量")
+    @ExcelProperty("单井工作量")
+    private String singleWellWorkload;
+
+    @Schema(description = "天气")
+    @ExcelProperty("天气")
+    private String weather;
+
+    @Schema(description = "气温(℃)")
+    @ExcelProperty("气温(℃)")
+    private String temperature;
+
+    @Schema(description = "当日用电量(kWh)")
+    @ExcelProperty("当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "生产时间(H)")
+    @ExcelProperty("生产时间(H)")
+    private BigDecimal productionTime;
+
+    @Schema(description = "非生产时间(H)")
+    @ExcelProperty("非生产时间(H)")
+    private BigDecimal nonProductionTime;
+
+    @Schema(description = "非生产时间原因", example = "不香")
+    @ExcelProperty("非生产时间原因")
+    private String nptReason;
+
+    @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 nextPlan;
+
+    @Schema(description = "施工简报")
+    @ExcelProperty("施工简报")
+    private String constructionBrief;
+
+    @Schema(description = "施工状态(动迁上井/动迁下井/施工准备/施工...)", example = "2")
+    @ExcelProperty("施工状态(动迁上井/动迁下井/施工准备/施工...)")
+    private String fiveStatus;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    @ExcelProperty("不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    @ExcelProperty("排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态(2填写中 0待填写 1已完成)", example = "2")
+    @ExcelProperty("状态(2填写中 0待填写 1已完成)")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "187")
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    @ExcelProperty("审批状态 未提交、审批中、审批通过、审批不通过、已取消")
+    private Integer auditStatus;
+
+    @Schema(description = "审批意见")
+    @ExcelProperty("审批意见")
+    private String opinion;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "日报填写时间")
+    @ExcelProperty("日报填写时间")
+    private LocalDateTime fillTime;
+
+    @Schema(description = "审批时间")
+    @ExcelProperty("审批时间")
+    private LocalDateTime approvalTime;
+
+    @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 BigDecimal nptRate;
+
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "当年 累计主压层数(层)")
+    @ExcelProperty("累计主压层数(层)")
+    private BigDecimal totalWorkingLayers;
+
+    @Schema(description = "当月 完成主压层数(层)")
+    @ExcelProperty("当月完成主压层数(层)")
+    private BigDecimal monthWorkingLayers;
+
+    @Schema(description = "当年 累计加砂量(吨)")
+    @ExcelProperty("累计加砂量(吨)")
+    private BigDecimal totalSandVolume;
+
+    @Schema(description = "当年 累计注液量(m³)")
+    @ExcelProperty("累计注液量(m³)")
+    private BigDecimal totalLiquidVolume;
+
+    @Schema(description = "当年 累计油耗(吨)")
+    @ExcelProperty("累计油耗(吨)")
+    private BigDecimal totalDailyFuel;
+
+    @Schema(description = "设备利用率 %")
+    @ExcelProperty("设备利用率%")
+    private BigDecimal utilizationRate;
+
+    @Schema(description = "当月 计划压裂(层)")
+    @ExcelProperty("当月计划压裂(层)")
+    private BigDecimal planWorkingLayers;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotfivedailyreport/vo/IotFiveDailyReportSaveReqVO.java

@@ -0,0 +1,191 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotfivedailyreport.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+@Schema(description = "管理后台 - 5#国日报新增/修改 Request VO")
+@Data
+public class IotFiveDailyReportSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13655")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "15068")
+    private Long deptId;
+
+    @Schema(description = "日报名称", example = "王五")
+    private String reportName;
+
+    @Schema(description = "项目id", example = "30840")
+    private Long projectId;
+
+    @Schema(description = "项目名称", example = "李四")
+    private String projectName;
+
+    @Schema(description = "合同甲方")
+    private String customer;
+
+    @Schema(description = "任务id", example = "3181")
+    private Long taskId;
+
+    @Schema(description = "井号", example = "李四")
+    private String wellName;
+
+    @Schema(description = "施工地点")
+    private String location;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "施工工艺([123,233])")
+    private String techniqueIds;
+
+    @Schema(description = "施工设备([123,233])")
+    private String deviceIds;
+
+    @Schema(description = "设备名称")
+    private String deviceNames;
+
+    @Schema(description = "时间节点-开始")
+    private LocalTime startTime;
+
+    @Schema(description = "时间节点-结束")
+    private LocalTime endTime;
+
+    @Schema(description = "主设备(泵车)数量")
+    private BigDecimal mainDeviceNum;
+
+    @Schema(description = "作业设备(泵车)数量")
+    private BigDecimal wokDeviceNum;
+
+    @Schema(description = "带班干部")
+    private String responsiblePerson;
+
+    @Schema(description = "当日加砂量(吨)")
+    private BigDecimal dailySandVolume;
+
+    @Schema(description = "当日主压层数(层)")
+    private BigDecimal dailyWorkingLayers;
+
+    @Schema(description = "当日注液量(m³)")
+    private BigDecimal dailyLiquidVolume;
+
+    @Schema(description = "当日作业井数(井)")
+    private BigDecimal dailyWellVolume;
+
+    @Schema(description = "当日油耗(吨)")
+    private BigDecimal dailyFuel;
+
+    @Schema(description = "单井工作量")
+    private String singleWellWorkload;
+
+    @Schema(description = "天气")
+    private String weather;
+
+    @Schema(description = "气温(℃)")
+    private String temperature;
+
+    @Schema(description = "当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "生产时间(H)")
+    private BigDecimal productionTime;
+
+    @Schema(description = "非生产时间(H)")
+    private BigDecimal nonProductionTime;
+
+    @Schema(description = "非生产时间原因", example = "不香")
+    private String nptReason;
+
+    @Schema(description = "施工开始日期")
+    private LocalDateTime constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    private LocalDateTime constructionEndDate;
+
+    @Schema(description = "当日生产情况生产动态", example = "1")
+    private String productionStatus;
+
+    @Schema(description = "下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工简报")
+    private String constructionBrief;
+
+    @Schema(description = "施工状态(动迁上井/动迁下井/施工准备/施工...)", example = "2")
+    private String fiveStatus;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "状态(2填写中 0待填写 1已完成)", example = "2")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "187")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    private Integer auditStatus;
+
+    @Schema(description = "审批意见")
+    private String opinion;
+
+    @Schema(description = "日报填写时间")
+    private LocalDateTime fillTime;
+
+    @Schema(description = "审批时间")
+    private LocalDateTime approvalTime;
+
+    @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 BigDecimal nptRate;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskschedule/IotProjectTaskScheduleController.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskschedule.vo.IotProjectTaskSchedulePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskschedule.vo.IotProjectTaskScheduleRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskschedule.vo.IotProjectTaskScheduleSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskschedule.IotProjectTaskScheduleDO;
 import cn.iocoder.yudao.module.pms.service.iotprojecttaskschedule.IotProjectTaskScheduleService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -92,6 +93,14 @@ public class IotProjectTaskScheduleController {
         return success(BeanUtils.toBean(projectTaskSchedules, IotProjectTaskScheduleRespVO.class));
     }
 
+    @GetMapping("/scheduleExtProperties")
+    @Operation(summary = "获得项目任务计划对应的扩展属性列表")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-schedule:query')")
+    public CommonResult<List<IotTaskAttrModelProperty>> scheduleExtProperties(@Valid IotProjectTaskSchedulePageReqVO pageReqVO) {
+        List<IotTaskAttrModelProperty> projectTaskSchedules = iotProjectTaskScheduleService.scheduleExtProperties(pageReqVO);
+        return success(projectTaskSchedules);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出项目任务时间表/施工进度 Excel")
     @PreAuthorize("@ss.hasPermission('rq:iot-project-task-schedule:export')")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotfivedailyreport/IotFiveDailyReportDO.java

@@ -0,0 +1,266 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotfivedailyreport;
+
+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;
+import java.time.LocalTime;
+
+/**
+ * 5#国日报 DO
+ *
+ * @author ruiqi
+ */
+@TableName("rq_iot_five_daily_report")
+@KeySequence("rq_iot_five_daily_report_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotFiveDailyReportDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 施工队伍id
+     */
+    private Long deptId;
+    /**
+     * 日报名称
+     */
+    private String reportName;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 合同甲方
+     */
+    private String customer;
+    /**
+     * 任务id
+     */
+    private Long taskId;
+    /**
+     * 井号
+     */
+    private String wellName;
+    /**
+     * 施工地点
+     */
+    private String location;
+    /**
+     * 项目类别(钻井 修井 注氮 酸化压裂... )
+     */
+    private String projectClassification;
+    /**
+     * 施工工艺([123,233])
+     */
+    private String techniqueIds;
+    /**
+     * 施工设备([123,233])
+     */
+    private String deviceIds;
+    /**
+     * 设备名称
+     */
+    private String deviceNames;
+    /**
+     * 时间节点-开始
+     */
+    private LocalTime startTime;
+    /**
+     * 时间节点-结束
+     */
+    private LocalTime endTime;
+    /**
+     * 主设备(泵车)数量
+     */
+    private BigDecimal mainDeviceNum;
+    /**
+     * 作业设备(泵车)数量
+     */
+    private BigDecimal wokDeviceNum;
+    /**
+     * 带班干部
+     */
+    private String responsiblePerson;
+    /**
+     * 当日加砂量(吨)
+     */
+    private BigDecimal dailySandVolume;
+    /**
+     * 当日主压层数(层)
+     */
+    private BigDecimal dailyWorkingLayers;
+    /**
+     * 当日注液量(m³)
+     */
+    private BigDecimal dailyLiquidVolume;
+    /**
+     * 当日作业井数(井)
+     */
+    private BigDecimal dailyWellVolume;
+    /**
+     * 当日油耗(吨)
+     */
+    private BigDecimal dailyFuel;
+    /**
+     * 单井工作量
+     */
+    private String singleWellWorkload;
+    /**
+     * 天气
+     */
+    private String weather;
+    /**
+     * 气温(℃)
+     */
+    private String temperature;
+    /**
+     * 当日用电量(kWh)
+     */
+    private BigDecimal dailyPowerUsage;
+    /**
+     * 生产时间(H)
+     */
+    private BigDecimal productionTime;
+    /**
+     * 非生产时间(H)
+     */
+    private BigDecimal nonProductionTime;
+    /**
+     * 非生产时间原因
+     */
+    private String nptReason;
+    /**
+     * 施工开始日期
+     */
+    private LocalDateTime constructionStartDate;
+    /**
+     * 施工结束日期
+     */
+    private LocalDateTime constructionEndDate;
+    /**
+     * 当日生产情况生产动态
+     */
+    private String productionStatus;
+    /**
+     * 下步工作计划
+     */
+    private String nextPlan;
+    /**
+     * 施工简报
+     */
+    private String constructionBrief;
+    /**
+     * 施工状态(动迁上井/动迁下井/施工准备/施工...)
+     */
+    private String fiveStatus;
+    /**
+     * 不同专业公司的扩展属性值
+     */
+    private String extProperty;
+    /**
+     * 排序值
+     */
+    private Integer sort;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(2填写中 0待填写 1已完成)
+     */
+    private Integer status;
+    /**
+     * 流程实例id
+     */
+    private String processInstanceId;
+    /**
+     * 审批状态 未提交、审批中、审批通过、审批不通过、已取消
+     */
+    private Integer auditStatus;
+    /**
+     * 审批意见
+     */
+    private String opinion;
+    /**
+     * 日报填写时间
+     */
+    private LocalDateTime fillTime;
+    /**
+     * 审批时间
+     */
+    private LocalDateTime approvalTime;
+    /**
+     * 事故非生产时间(工程质量)
+     */
+    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 BigDecimal nptRate;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotfivedailyreport/IotFiveDailyReportMapper.java

@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotfivedailyreport;
+
+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.iotfivedailyreport.vo.IotFiveDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotfivedailyreport.IotFiveDailyReportDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 5#国日报 Mapper
+ *
+ * @author ruiqi
+ */
+@Mapper
+public interface IotFiveDailyReportMapper extends BaseMapperX<IotFiveDailyReportDO> {
+
+    default PageResult<IotFiveDailyReportDO> selectPage(IotFiveDailyReportPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotFiveDailyReportDO>()
+                .eqIfPresent(IotFiveDailyReportDO::getDeptId, reqVO.getDeptId())
+                .likeIfPresent(IotFiveDailyReportDO::getReportName, reqVO.getReportName())
+                .eqIfPresent(IotFiveDailyReportDO::getProjectId, reqVO.getProjectId())
+                .likeIfPresent(IotFiveDailyReportDO::getProjectName, reqVO.getProjectName())
+                .eqIfPresent(IotFiveDailyReportDO::getCustomer, reqVO.getCustomer())
+                .eqIfPresent(IotFiveDailyReportDO::getTaskId, reqVO.getTaskId())
+                .likeIfPresent(IotFiveDailyReportDO::getWellName, reqVO.getWellName())
+                .eqIfPresent(IotFiveDailyReportDO::getLocation, reqVO.getLocation())
+                .eqIfPresent(IotFiveDailyReportDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotFiveDailyReportDO::getTechniqueIds, reqVO.getTechniqueIds())
+                .eqIfPresent(IotFiveDailyReportDO::getDeviceIds, reqVO.getDeviceIds())
+                .eqIfPresent(IotFiveDailyReportDO::getDeviceNames, reqVO.getDeviceNames())
+                .betweenIfPresent(IotFiveDailyReportDO::getStartTime, reqVO.getStartTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getEndTime, reqVO.getEndTime())
+                .eqIfPresent(IotFiveDailyReportDO::getMainDeviceNum, reqVO.getMainDeviceNum())
+                .eqIfPresent(IotFiveDailyReportDO::getWokDeviceNum, reqVO.getWokDeviceNum())
+                .eqIfPresent(IotFiveDailyReportDO::getResponsiblePerson, reqVO.getResponsiblePerson())
+                .eqIfPresent(IotFiveDailyReportDO::getDailySandVolume, reqVO.getDailySandVolume())
+                .eqIfPresent(IotFiveDailyReportDO::getDailyWorkingLayers, reqVO.getDailyWorkingLayers())
+                .eqIfPresent(IotFiveDailyReportDO::getDailyLiquidVolume, reqVO.getDailyLiquidVolume())
+                .eqIfPresent(IotFiveDailyReportDO::getDailyWellVolume, reqVO.getDailyWellVolume())
+                .eqIfPresent(IotFiveDailyReportDO::getDailyFuel, reqVO.getDailyFuel())
+                .eqIfPresent(IotFiveDailyReportDO::getSingleWellWorkload, reqVO.getSingleWellWorkload())
+                .eqIfPresent(IotFiveDailyReportDO::getWeather, reqVO.getWeather())
+                .eqIfPresent(IotFiveDailyReportDO::getTemperature, reqVO.getTemperature())
+                .eqIfPresent(IotFiveDailyReportDO::getDailyPowerUsage, reqVO.getDailyPowerUsage())
+                .betweenIfPresent(IotFiveDailyReportDO::getProductionTime, reqVO.getProductionTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getNonProductionTime, reqVO.getNonProductionTime())
+                .eqIfPresent(IotFiveDailyReportDO::getNptReason, reqVO.getNptReason())
+                .betweenIfPresent(IotFiveDailyReportDO::getConstructionStartDate, reqVO.getConstructionStartDate())
+                .betweenIfPresent(IotFiveDailyReportDO::getConstructionEndDate, reqVO.getConstructionEndDate())
+                .eqIfPresent(IotFiveDailyReportDO::getProductionStatus, reqVO.getProductionStatus())
+                .eqIfPresent(IotFiveDailyReportDO::getNextPlan, reqVO.getNextPlan())
+                .eqIfPresent(IotFiveDailyReportDO::getConstructionBrief, reqVO.getConstructionBrief())
+                .eqIfPresent(IotFiveDailyReportDO::getFiveStatus, reqVO.getFiveStatus())
+                .eqIfPresent(IotFiveDailyReportDO::getExtProperty, reqVO.getExtProperty())
+                .eqIfPresent(IotFiveDailyReportDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotFiveDailyReportDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotFiveDailyReportDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotFiveDailyReportDO::getProcessInstanceId, reqVO.getProcessInstanceId())
+                .eqIfPresent(IotFiveDailyReportDO::getAuditStatus, reqVO.getAuditStatus())
+                .eqIfPresent(IotFiveDailyReportDO::getOpinion, reqVO.getOpinion())
+                .betweenIfPresent(IotFiveDailyReportDO::getCreateTime, reqVO.getCreateTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getFillTime, reqVO.getFillTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getApprovalTime, reqVO.getApprovalTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getAccidentTime, reqVO.getAccidentTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getRepairTime, reqVO.getRepairTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getSelfStopTime, reqVO.getSelfStopTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getComplexityTime, reqVO.getComplexityTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getRelocationTime, reqVO.getRelocationTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getRectificationTime, reqVO.getRectificationTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getWaitingStopTime, reqVO.getWaitingStopTime())
+                .betweenIfPresent(IotFiveDailyReportDO::getWinterBreakTime, reqVO.getWinterBreakTime())
+                .eqIfPresent(IotFiveDailyReportDO::getPartyaDesign, reqVO.getPartyaDesign())
+                .eqIfPresent(IotFiveDailyReportDO::getPartyaPrepare, reqVO.getPartyaPrepare())
+                .eqIfPresent(IotFiveDailyReportDO::getPartyaResource, reqVO.getPartyaResource())
+                .betweenIfPresent(IotFiveDailyReportDO::getOtherNptTime, reqVO.getOtherNptTime())
+                .eqIfPresent(IotFiveDailyReportDO::getOtherNptReason, reqVO.getOtherNptReason())
+                .eqIfPresent(IotFiveDailyReportDO::getNptRate, reqVO.getNptRate())
+                .orderByDesc(IotFiveDailyReportDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotfivedailyreport/IotFiveDailyReportService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.service.iotfivedailyreport;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.iotfivedailyreport.vo.IotFiveDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotfivedailyreport.vo.IotFiveDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotfivedailyreport.IotFiveDailyReportDO;
+
+import javax.validation.Valid;
+
+/**
+ * 5#国日报 Service 接口
+ *
+ * @author ruiqi
+ */
+public interface IotFiveDailyReportService {
+
+    /**
+     * 创建5#国日报
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotFiveDailyReport(@Valid IotFiveDailyReportSaveReqVO createReqVO);
+
+    /**
+     * 更新5#国日报
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotFiveDailyReport(@Valid IotFiveDailyReportSaveReqVO updateReqVO);
+
+    /**
+     * 删除5#国日报
+     *
+     * @param id 编号
+     */
+    void deleteIotFiveDailyReport(Long id);
+
+    /**
+     * 获得5#国日报
+     *
+     * @param id 编号
+     * @return 5#国日报
+     */
+    IotFiveDailyReportDO getIotFiveDailyReport(Long id);
+
+    /**
+     * 获得5#国日报分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 5#国日报分页
+     */
+    PageResult<IotFiveDailyReportDO> getIotFiveDailyReportPage(IotFiveDailyReportPageReqVO pageReqVO);
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotfivedailyreport/IotFiveDailyReportServiceImpl.java

@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.pms.service.iotfivedailyreport;
+
+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.iotfivedailyreport.vo.IotFiveDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotfivedailyreport.vo.IotFiveDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotfivedailyreport.IotFiveDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotfivedailyreport.IotFiveDailyReportMapper;
+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_FIVE_DAILY_REPORT_NOT_EXISTS;
+
+/**
+ * 5#国日报 Service 实现类
+ *
+ * @author ruiqi
+ */
+@Service
+@Validated
+public class IotFiveDailyReportServiceImpl implements IotFiveDailyReportService {
+
+    @Resource
+    private IotFiveDailyReportMapper iotFiveDailyReportMapper;
+
+    @Override
+    public Long createIotFiveDailyReport(IotFiveDailyReportSaveReqVO createReqVO) {
+        // 插入
+        IotFiveDailyReportDO iotFiveDailyReport = BeanUtils.toBean(createReqVO, IotFiveDailyReportDO.class);
+        iotFiveDailyReportMapper.insert(iotFiveDailyReport);
+        // 返回
+        return iotFiveDailyReport.getId();
+    }
+
+    @Override
+    public void updateIotFiveDailyReport(IotFiveDailyReportSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotFiveDailyReportExists(updateReqVO.getId());
+        // 更新
+        IotFiveDailyReportDO updateObj = BeanUtils.toBean(updateReqVO, IotFiveDailyReportDO.class);
+        iotFiveDailyReportMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotFiveDailyReport(Long id) {
+        // 校验存在
+        validateIotFiveDailyReportExists(id);
+        // 删除
+        iotFiveDailyReportMapper.deleteById(id);
+    }
+
+    private void validateIotFiveDailyReportExists(Long id) {
+        if (iotFiveDailyReportMapper.selectById(id) == null) {
+            throw exception(IOT_FIVE_DAILY_REPORT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public IotFiveDailyReportDO getIotFiveDailyReport(Long id) {
+        return iotFiveDailyReportMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotFiveDailyReportDO> getIotFiveDailyReportPage(IotFiveDailyReportPageReqVO pageReqVO) {
+        return iotFiveDailyReportMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotprojecttaskschedule/IotProjectTaskScheduleService.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.pms.service.iotprojecttaskschedule;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskschedule.vo.IotProjectTaskSchedulePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskschedule.vo.IotProjectTaskScheduleSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskschedule.IotProjectTaskScheduleDO;
 
 import javax.validation.Valid;
@@ -68,4 +69,12 @@ public interface IotProjectTaskScheduleService {
      * @return 任务进度计划列表
      */
     List<IotProjectTaskScheduleDO> getIotProjectTaskSchedules(IotProjectTaskSchedulePageReqVO pageReqVO);
+
+    /**
+     * 获得项目任务计划对应的扩展属性列表
+     *
+     * @param pageReqVO 请求参数 taskId
+     * @return 公司对应的任务工作量扩展属性列表
+     */
+    List<IotTaskAttrModelProperty> scheduleExtProperties(IotProjectTaskSchedulePageReqVO pageReqVO);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotprojecttaskschedule/IotProjectTaskScheduleServiceImpl.java

@@ -2,19 +2,28 @@ package cn.iocoder.yudao.module.pms.service.iotprojecttaskschedule;
 
 import cn.hutool.core.bean.BeanUtil;
 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.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotoperationmeetingattrs.vo.IotOperationMeetingAttrsPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskschedule.vo.IotProjectTaskSchedulePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskschedule.vo.IotProjectTaskScheduleSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotoperationmeetingattrs.IotOperationMeetingAttrsDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask.IotProjectTaskDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskschedule.IotProjectTaskScheduleDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotoperationmeetingattrs.IotOperationMeetingAttrsMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotprojecttask.IotProjectTaskMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotprojecttaskschedule.IotProjectTaskScheduleMapper;
 import com.google.common.collect.ImmutableMap;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -33,6 +42,12 @@ public class IotProjectTaskScheduleServiceImpl implements IotProjectTaskSchedule
     @Resource
     private IotProjectTaskScheduleMapper iotProjectTaskScheduleMapper;
 
+    @Resource
+    private IotProjectTaskMapper iotProjectTaskMapper;
+
+    @Resource
+    private IotOperationMeetingAttrsMapper iotOperationMeetingAttrsMapper;
+
     @Override
     public Long createIotProjectTaskSchedule(IotProjectTaskScheduleSaveReqVO createReqVO) {
         // 插入
@@ -106,4 +121,39 @@ public class IotProjectTaskScheduleServiceImpl implements IotProjectTaskSchedule
         return iotProjectTaskScheduleMapper.selectList(pageReqVO);
     }
 
+    @Override
+    public List<IotTaskAttrModelProperty> scheduleExtProperties(IotProjectTaskSchedulePageReqVO pageReqVO) {
+        Long taskId = pageReqVO.getTaskId();
+        if (ObjUtil.isEmpty(taskId)) {
+            return Collections.emptyList();
+        }
+        IotProjectTaskDO task = iotProjectTaskMapper.selectById(taskId);
+        if (ObjUtil.isEmpty(task)) {
+            return Collections.emptyList();
+        }
+        Long deptId = task.getDeptId();
+        if (ObjUtil.isEmpty(deptId)) {
+            return Collections.emptyList();
+        }
+        // 根据任务井所属的 公司id 查询工作量扩展属性
+        IotOperationMeetingAttrsPageReqVO reqVO = new IotOperationMeetingAttrsPageReqVO();
+        reqVO.setDeptId(deptId);
+        reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        PageResult<IotOperationMeetingAttrsDO> pageAttrs = iotOperationMeetingAttrsMapper.selectPage(reqVO);
+        List<IotOperationMeetingAttrsDO> workloadAttrs = pageAttrs.getList();
+        if (CollUtil.isEmpty(workloadAttrs)) {
+            return Collections.emptyList();
+        }
+        List<IotTaskAttrModelProperty> workloadProperties = new ArrayList<>();
+        workloadAttrs.forEach(attr -> {
+            // 提取 ‘计划xx’ 属性
+            IotTaskAttrModelProperty property = attr.getExtProperty();
+            String defaultValue = property.getDefaultValue();
+            if (ObjUtil.isNotEmpty(property) && property.getName().contains("计划") && StrUtil.isBlank(defaultValue)) {
+                workloadProperties.add(attr.getExtProperty());
+            }
+        });
+        return workloadProperties;
+    }
+
 }