Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotopeationfill/IotOpeationFillController.java

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java

@@ -322,4 +322,21 @@ public class DateUtils {
             );
             return mergedDateTime;
         }
+
+        public static String convertTimeToString(String time) {
+            // 定义时间戳（毫秒级）
+            long timestamp = Long.parseLong(time);
+
+            // 转换步骤：
+            // 1. 将时间戳转为Instant对象
+            Instant instant = Instant.ofEpochMilli(timestamp);
+            // 2. 转换为本地日期（默认时区，也可指定如ZoneId.of("Asia/Shanghai")）
+            LocalDate localDate = instant.atZone(ZoneId.systemDefault()).toLocalDate();
+            // 3. 定义格式化器
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            // 4. 格式化日期
+            String dateStr = localDate.format(formatter);
+
+            return dateStr;
+        }
 }

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileUtils.java

@@ -7,6 +7,7 @@ import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.DigestUtil;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import lombok.SneakyThrows;
@@ -14,8 +15,11 @@ import lombok.SneakyThrows;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.Date;
 
 /**
@@ -115,5 +119,34 @@ public class FileUtils {
         }
     }
 
+    public static String getFileNameByUrlParse(String urlPath)  {
+        // 1. 解析 URL 路径，获取完整路径部分（path）
+        URL url = null;
+        try {
+            url = new URL(urlPath);
+        } catch (MalformedURLException e) {
+            throw new ServiceException(new ErrorCode(100,"文件名称解析错误"));
+        }
+        String fullPath = url.getPath(); // 示例：/admin-api/infra/file/29/get/wechat_2025-08-19_221137_550.png
+
+        // 2. 找到最后一个 "/" 的位置，截取其后的字符串（即文件名）
+        int lastSlashIndex = fullPath.lastIndexOf("/");
+        if (lastSlashIndex == -1) {
+            // 若路径中无 "/"，则整个路径视为文件名（极端场景，如：https://example.com/filename.png）
+            return fullPath;
+        }
+        return fullPath.substring(lastSlashIndex + 1);
+    }
 
+    public static String encodePathSegment(String pathSegment) {
+        try {
+            // 使用UTF-8编码，符合现代Web标准
+            String encoded = URLEncoder.encode(pathSegment, "UTF-8");
+            // 替换空格编码：URLEncoder会将空格转为+，而URL路径中推荐使用%20
+            return encoded.replace("+", "%20");
+        } catch (UnsupportedEncodingException e) {
+            // UTF-8是Java标准编码，不会抛出此异常
+            throw new RuntimeException("URL编码失败", e);
+        }
+    }
 }

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/NumberUtils.java

@@ -94,4 +94,22 @@ public class NumberUtils {
         return numberStr.isEmpty() ? 0 : Long.parseLong(numberStr);
     }
 
+
+    public static String formatNumber(String numberStr) {
+        // 检查字符串是否包含小数点
+        if (numberStr.contains(".")) {
+            // 包含小数点，转换为double后保留一位小数
+            try {
+                double number = Double.parseDouble(numberStr);
+                // 使用String.format保留一位小数
+                return String.format("%.1f", number);
+            } catch (NumberFormatException e) {
+                // 如果转换失败，返回原字符串
+                return numberStr;
+            }
+        } else {
+            // 不包含小数点，直接返回原字符串
+            return numberStr;
+        }
+    }
 }

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/BeanUtils.java

@@ -4,7 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Consumer;
 
 /**
@@ -66,4 +69,27 @@ public class BeanUtils {
         BeanUtil.copyProperties(source, target, false);
     }
 
-}
+    /**
+     * 找出在第一个列表中有但在第二个列表中没有的元素
+     * @param firstList 第一个列表
+     * @param secondList 第二个列表
+     * @return 差异元素列表
+     */
+    public static List<String> getElementsOnlyInFirstList(List<String> firstList, List<String> secondList) {
+        // 将第二个列表转换为HashSet以提高查找效率
+        Set<String> secondSet = new HashSet<>(secondList);
+
+        // 存储差异元素
+        List<String> result = new ArrayList<>();
+
+        // 遍历第一个列表，找出不在第二个列表中的元素
+        for (String element : firstList) {
+            if (!secondSet.contains(element)) {
+                result.add(element);
+            }
+        }
+
+        return result;
+    }
+
+}

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

@@ -79,4 +79,11 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_PROJECT_TASK_SCHEDULE_NOT_EXISTS = new ErrorCode(1_002_004_005, "项目任务时间表/施工进度不存在");
     ErrorCode IOT_OPERATION_PLAN_NOT_EXISTS = new ErrorCode(156, "运行记录计划不存在");
     ErrorCode IOT_OPERATION_PLAN_DEV_NOT_EXISTS = new ErrorCode(157, "运行记录计划设备不存在");
+    ErrorCode IOT_PROJECT_TASK_TEMPLATE_NOT_EXISTS = new ErrorCode(257, "项目任务属性模板不存在");
+    ErrorCode IOT_PROJECT_TASK_ATTRS_NOT_EXISTS = new ErrorCode(258, "项目任务扩展属性不存在");
+    ErrorCode IOT_OPEATION_FILL_NOT_EXISTS1 = new ErrorCode(259, "该工单已执行!");
+    ErrorCode IOT_DAILY_REPORT_TEMPLATE_NOT_EXISTS = new ErrorCode(260, "生产日报属性模板不存在");
+    ErrorCode IOT_DAILY_REPORT_ATTRS_NOT_EXISTS = new ErrorCode(261, "日报扩展模板属性不存在");
+    ErrorCode IOT_PROJECT_DAILY_REPORT_NOT_EXISTS = new ErrorCode(262, "项目日报不存在");
+    ErrorCode IOT_RH_DAILY_REPORT_NOT_EXISTS = new ErrorCode(263, "瑞恒日报不存在");
 }

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

@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.pms.enums.devicetemplate;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * pms 数据定义的数据类型枚举类
+ *
+ * @author ruiqi
+ */
+@AllArgsConstructor
+@Getter
+public enum IotDataSpecsDataTypeEnum implements ArrayValuable<String> {
+
+    DOUBLE("double"),
+    TEXT("text"),
+    TEXTAREA("textarea"),
+    DATE("date");
+
+    public static final String[] ARRAYS = Arrays.stream(values()).map(IotDataSpecsDataTypeEnum::getDataType).toArray(String[]::new);
+
+    private final String dataType;
+
+    @Override
+    public String[] array() {
+        return ARRAYS;
+    }
+
+}

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

@@ -10,12 +10,14 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.ThingsModelDTO;
+import cn.iocoder.yudao.module.pms.oa.OaFlow;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceallotlog.vo.IotDeviceAllotSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonRelationSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSimpleRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.excel.DeviceImportExcelVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.YfDeviceDO;
@@ -38,11 +40,13 @@ import cn.iocoder.yudao.module.system.service.dict.DictDataService;
 import com.google.common.collect.ImmutableList;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.annotation.security.PermitAll;
@@ -545,4 +549,30 @@ public class IotDeviceController {
     public void initCharge() {
         iotDeviceService.updateCharge();
     }
+
+    @Autowired
+    private OaFlow oaFlow;
+
+    @PermitAll
+    @GetMapping("/oa/register")
+    public void oaRegister() {
+        try {
+            oaFlow.getCompany();
+//            oaFlow.getDepart();
+//            oaFlow.getPerson();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @PermitAll
+    @PostMapping("/import")
+    @Operation(summary = "导入设备")
+    @Parameters({
+            @Parameter(name = "file", description = "Excel 文件", required = true),
+    })
+    public void importExcel(@RequestParam("file") MultipartFile file) throws Exception {
+        List<DeviceImportExcelVO> list = ExcelUtils.read(file, DeviceImportExcelVO.class);
+        iotDeviceService.importDevice(list);
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/failure/IotFailureReportController.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.failure.vo.IotFailureReportS
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainSaveVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
 import cn.iocoder.yudao.module.pms.service.failure.IotFailureReportService;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -121,4 +122,13 @@ public class IotFailureReportController {
         iotFailureReportProcessVO.setAssigneeUserId(Long.valueOf(assigneeUserId));
         return success(iotFailureReportService.updateIotFailureReportProcess(iotFailureReportProcessVO));
     }
+
+    @GetMapping("/get/approval")
+    @Operation(summary = "获得故障上报")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-failure-report:query')")
+    public CommonResult<List<AdminUserRespDTO>> getApproval() {
+        List<AdminUserRespDTO> approval = iotFailureReportService.getApproval();
+        return success(approval);
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/failure/vo/IotFailureReportSaveReqVO.java

@@ -73,4 +73,8 @@ public class IotFailureReportSaveReqVO {
 
     @Schema(description = "设备编码")
     private String deviceCode;
+
+    /**审批人id*/
+    @Schema(description = "审批人id逗号分隔")
+    private String approvalId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdailyreportattrs/IotDailyReportAttrsController.java

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdailyreportattrs;
+
+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.iotdailyreportattrs.vo.IotDailyReportAttrsPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdailyreportattrs.vo.IotDailyReportAttrsRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdailyreportattrs.vo.IotDailyReportAttrsSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdailyreportattrs.IotDailyReportAttrsDO;
+import cn.iocoder.yudao.module.pms.service.iotdailyreportattrs.IotDailyReportAttrsService;
+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("/rq/iot-daily-report-attrs")
+@Validated
+public class IotDailyReportAttrsController {
+
+    @Resource
+    private IotDailyReportAttrsService iotDailyReportAttrsService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建日报扩展模板属性")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-attrs:create')")
+    public CommonResult<Long> createIotDailyReportAttrs(@Valid @RequestBody IotDailyReportAttrsSaveReqVO createReqVO) {
+        return success(iotDailyReportAttrsService.createIotDailyReportAttrs(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新日报扩展模板属性")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-attrs:update')")
+    public CommonResult<Boolean> updateIotDailyReportAttrs(@Valid @RequestBody IotDailyReportAttrsSaveReqVO updateReqVO) {
+        iotDailyReportAttrsService.updateIotDailyReportAttrs(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除日报扩展模板属性")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-attrs:delete')")
+    public CommonResult<Boolean> deleteIotDailyReportAttrs(@RequestParam("id") Long id) {
+        iotDailyReportAttrsService.deleteIotDailyReportAttrs(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得日报扩展模板属性")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-attrs:query')")
+    public CommonResult<IotDailyReportAttrsRespVO> getIotDailyReportAttrs(@RequestParam("id") Long id) {
+        IotDailyReportAttrsDO iotDailyReportAttrs = iotDailyReportAttrsService.getIotDailyReportAttrs(id);
+        return success(BeanUtils.toBean(iotDailyReportAttrs, IotDailyReportAttrsRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得日报扩展模板属性分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-attrs:query')")
+    public CommonResult<PageResult<IotDailyReportAttrsRespVO>> getIotDailyReportAttrsPage(@Valid IotDailyReportAttrsPageReqVO pageReqVO) {
+        PageResult<IotDailyReportAttrsDO> pageResult = iotDailyReportAttrsService.getIotDailyReportAttrsPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotDailyReportAttrsRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出日报扩展模板属性 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-attrs:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotDailyReportAttrsExcel(@Valid IotDailyReportAttrsPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotDailyReportAttrsDO> list = iotDailyReportAttrsService.getIotDailyReportAttrsPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "日报扩展模板属性.xls", "数据", IotDailyReportAttrsRespVO.class,
+                        BeanUtils.toBean(list, IotDailyReportAttrsRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdailyreportattrs/vo/IotDailyReportAttrsPageReqVO.java

@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdailyreportattrs.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 日报扩展模板属性分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotDailyReportAttrsPageReqVO extends PageParam {
+
+    @Schema(description = "日报扩展模板id", example = "22440")
+    private Long templateId;
+
+    @Schema(description = "公司id", example = "27294")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "249")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂 ...)")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    private String wellType;
+
+    @Schema(description = "井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    private String technique;
+
+    @Schema(description = "属性名称", example = "张三")
+    private String name;
+
+    @Schema(description = "属性标识符")
+    private String identifier;
+
+    @Schema(description = "数据类型(double text textarea date dropdown)", example = "2")
+    private String dataType;
+
+    @Schema(description = "是否必填(0非必填 1必填)")
+    private Integer required;
+
+    @Schema(description = "单位(MPa)")
+    private String unit;
+
+    @Schema(description = "访问模式(r读  w写)")
+    private String accessMode;
+
+    @Schema(description = "默认值")
+    private String defaultValue;
+
+    @Schema(description = "最大值")
+    private String maxValue;
+
+    @Schema(description = "最小值")
+    private String minValue;
+
+    @Schema(description = "不同专业公司的扩展属性")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    private Integer status;
+
+    @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/iotdailyreportattrs/vo/IotDailyReportAttrsRespVO.java

@@ -0,0 +1,103 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdailyreportattrs.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 日报扩展模板属性 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotDailyReportAttrsRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14208")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "日报扩展模板id", example = "22440")
+    @ExcelProperty("日报扩展模板id")
+    private Long templateId;
+
+    @Schema(description = "公司id", example = "27294")
+    @ExcelProperty("公司id")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "249")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂 ...)")
+    @ExcelProperty("项目类别(钻井 修井 注氮 酸化压裂 ...)")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    @ExcelProperty("井型")
+    private String wellType;
+
+    @Schema(description = "井别")
+    @ExcelProperty("井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    @ExcelProperty("施工工艺")
+    private String technique;
+
+    @Schema(description = "属性名称", example = "张三")
+    @ExcelProperty("属性名称")
+    private String name;
+
+    @Schema(description = "属性标识符")
+    @ExcelProperty("属性标识符")
+    private String identifier;
+
+    @Schema(description = "数据类型(double text textarea date dropdown)", example = "2")
+    @ExcelProperty("数据类型(double text textarea date dropdown)")
+    private String dataType;
+
+    @Schema(description = "是否必填(0非必填 1必填)")
+    @ExcelProperty("是否必填(0非必填 1必填)")
+    private Integer required;
+
+    @Schema(description = "单位(MPa)")
+    @ExcelProperty("单位(MPa)")
+    private String unit;
+
+    @Schema(description = "访问模式(r读  w写)")
+    @ExcelProperty("访问模式(r读  w写)")
+    private String accessMode;
+
+    @Schema(description = "默认值")
+    @ExcelProperty("默认值")
+    private String defaultValue;
+
+    @Schema(description = "最大值")
+    @ExcelProperty("最大值")
+    private String maxValue;
+
+    @Schema(description = "最小值")
+    @ExcelProperty("最小值")
+    private String minValue;
+
+    @Schema(description = "不同专业公司的扩展属性")
+    @ExcelProperty("不同专业公司的扩展属性")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    @ExcelProperty("排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    @ExcelProperty("状态(0启用 1禁用)")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdailyreportattrs/vo/IotDailyReportAttrsSaveReqVO.java

@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdailyreportattrs.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 日报扩展模板属性新增/修改 Request VO")
+@Data
+public class IotDailyReportAttrsSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14208")
+    private Long id;
+
+    @Schema(description = "日报扩展模板id", example = "22440")
+    private Long templateId;
+
+    @Schema(description = "公司id", example = "27294")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "249")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂 ...)")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    private String wellType;
+
+    @Schema(description = "井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    private String technique;
+
+    @Schema(description = "属性名称", example = "张三")
+    private String name;
+
+    @Schema(description = "属性标识符")
+    private String identifier;
+
+    @Schema(description = "数据类型(double text textarea date dropdown)", example = "2")
+    private String dataType;
+
+    @Schema(description = "是否必填(0非必填 1必填)")
+    private Integer required;
+
+    @Schema(description = "单位(MPa)")
+    private String unit;
+
+    @Schema(description = "访问模式(r读  w写)")
+    private String accessMode;
+
+    @Schema(description = "默认值")
+    private String defaultValue;
+
+    @Schema(description = "最大值")
+    private String maxValue;
+
+    @Schema(description = "最小值")
+    private String minValue;
+
+    @Schema(description = "不同专业公司的扩展属性")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdailyreporttemplate/IotDailyReportTemplateController.java

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdailyreporttemplate;
+
+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.iotdailyreporttemplate.vo.IotDailyReportTemplatePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdailyreporttemplate.vo.IotDailyReportTemplateRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdailyreporttemplate.vo.IotDailyReportTemplateSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdailyreporttemplate.IotDailyReportTemplateDO;
+import cn.iocoder.yudao.module.pms.service.iotdailyreporttemplate.IotDailyReportTemplateService;
+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("/rq/iot-daily-report-template")
+@Validated
+public class IotDailyReportTemplateController {
+
+    @Resource
+    private IotDailyReportTemplateService iotDailyReportTemplateService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建生产日报属性模板")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-template:create')")
+    public CommonResult<Long> createIotDailyReportTemplate(@Valid @RequestBody IotDailyReportTemplateSaveReqVO createReqVO) {
+        return success(iotDailyReportTemplateService.createIotDailyReportTemplate(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新生产日报属性模板")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-template:update')")
+    public CommonResult<Boolean> updateIotDailyReportTemplate(@Valid @RequestBody IotDailyReportTemplateSaveReqVO updateReqVO) {
+        iotDailyReportTemplateService.updateIotDailyReportTemplate(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除生产日报属性模板")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-template:delete')")
+    public CommonResult<Boolean> deleteIotDailyReportTemplate(@RequestParam("id") Long id) {
+        iotDailyReportTemplateService.deleteIotDailyReportTemplate(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得生产日报属性模板")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-template:query')")
+    public CommonResult<IotDailyReportTemplateRespVO> getIotDailyReportTemplate(@RequestParam("id") Long id) {
+        IotDailyReportTemplateDO iotDailyReportTemplate = iotDailyReportTemplateService.getIotDailyReportTemplate(id);
+        return success(BeanUtils.toBean(iotDailyReportTemplate, IotDailyReportTemplateRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得生产日报属性模板分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-template:query')")
+    public CommonResult<PageResult<IotDailyReportTemplateRespVO>> getIotDailyReportTemplatePage(@Valid IotDailyReportTemplatePageReqVO pageReqVO) {
+        PageResult<IotDailyReportTemplateDO> pageResult = iotDailyReportTemplateService.getIotDailyReportTemplatePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotDailyReportTemplateRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出生产日报属性模板 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-daily-report-template:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotDailyReportTemplateExcel(@Valid IotDailyReportTemplatePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotDailyReportTemplateDO> list = iotDailyReportTemplateService.getIotDailyReportTemplatePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "生产日报属性模板.xls", "数据", IotDailyReportTemplateRespVO.class,
+                        BeanUtils.toBean(list, IotDailyReportTemplateRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdailyreporttemplate/vo/IotDailyReportTemplatePageReqVO.java

@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdailyreporttemplate.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 生产日报属性模板分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotDailyReportTemplatePageReqVO extends PageParam {
+
+    @Schema(description = "公司id", example = "13499")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "29163")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂...)")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    private String wellType;
+
+    @Schema(description = "井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    private String technique;
+
+    @Schema(description = "模板名称", example = "王五")
+    private String name;
+
+    @Schema(description = "模板标识符")
+    private String identifier;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    private Integer status;
+
+    @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/iotdailyreporttemplate/vo/IotDailyReportTemplateRespVO.java

@@ -0,0 +1,63 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdailyreporttemplate.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 生产日报属性模板 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotDailyReportTemplateRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5000")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "公司id", example = "13499")
+    @ExcelProperty("公司id")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "29163")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂...)")
+    @ExcelProperty("项目类别(钻井 修井 注氮 酸化压裂...)")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    @ExcelProperty("井型")
+    private String wellType;
+
+    @Schema(description = "井别")
+    @ExcelProperty("井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    @ExcelProperty("施工工艺")
+    private String technique;
+
+    @Schema(description = "模板名称", example = "王五")
+    @ExcelProperty("模板名称")
+    private String name;
+
+    @Schema(description = "模板标识符")
+    @ExcelProperty("模板标识符")
+    private String identifier;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    @ExcelProperty("状态(0启用 1禁用)")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdailyreporttemplate/vo/IotDailyReportTemplateSaveReqVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdailyreporttemplate.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 生产日报属性模板新增/修改 Request VO")
+@Data
+public class IotDailyReportTemplateSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5000")
+    private Long id;
+
+    @Schema(description = "公司id", example = "13499")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "29163")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂...)")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    private String wellType;
+
+    @Schema(description = "井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    private String technique;
+
+    @Schema(description = "模板名称", example = "王五")
+    private String name;
+
+    @Schema(description = "模板标识符")
+    private String identifier;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicecategorytemplateattrs/vo/IotDeviceProperty.java

@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplateattrs.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 设备扩展属性 json 解析对象")
+@Data
+@ToString(callSuper = true)
+public class IotDeviceProperty {
+
+    private Integer id;
+    private Integer deviceCategoryId;
+    private Object templateId;
+    private String name;
+    private String code;
+    private String type;
+    private Integer requiredFlag;
+    private String defaultValue;
+    private String unit;
+    private String description;
+    private Integer status;
+    private String remark;
+    private Integer sort;
+    private SelectOptions selectOptions;
+    private Integer version;
+    private Long createTime;
+    private String value;
+
+    public static class DataSpecs {
+        private String dataType;
+        private Integer length;
+        private Integer max;
+        private Integer min;
+        private Integer step;
+        private Integer precise;
+        private Object defaultValue;
+        private String unit;
+        private String unitName;
+
+        // Getters and Setters
+    }
+
+    public static class DataSpecsItem {
+        private String dataType;
+        private String name;
+        private Object value;
+
+        // Getters and Setters
+    }
+
+    public static class SelectOptions {
+        private String name;
+        private Object placeHolder;
+        private String code;
+        private String type;
+        private Integer requiredFlag;
+        private Object sort;
+        private String identifier;
+        private Object defaultValue;
+        private Object accessMode;
+        private DataSpecs dataSpecs;
+        private List<DataSpecsItem> dataSpecsList;
+
+        // Getters and Setters
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotoperationplan/vo/IotOperationPlanSaveReqVO.java

@@ -57,6 +57,6 @@ public class IotOperationPlanSaveReqVO {
     @Schema(description = "首次执行时间")
     private LocalDateTime beginCreateTime;
 
-    Collection<IotOperationPlanDevDO> planDevList;
+    List<IotOperationPlanDevDO> planDevList;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectdailyreport/IotProjectDailyReportController.java

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojectdailyreport;
+
+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.iotprojectdailyreport.vo.IotProjectDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojectdailyreport.vo.IotProjectDailyReportRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojectdailyreport.vo.IotProjectDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojectdailyreport.IotProjectDailyReportDO;
+import cn.iocoder.yudao.module.pms.service.iotprojectdailyreport.IotProjectDailyReportService;
+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("/rq/iot-project-daily-report")
+@Validated
+public class IotProjectDailyReportController {
+
+    @Resource
+    private IotProjectDailyReportService iotProjectDailyReportService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建项目日报")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-daily-report:create')")
+    public CommonResult<Long> createIotProjectDailyReport(@Valid @RequestBody IotProjectDailyReportSaveReqVO createReqVO) {
+        return success(iotProjectDailyReportService.createIotProjectDailyReport(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新项目日报")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-daily-report:update')")
+    public CommonResult<Boolean> updateIotProjectDailyReport(@Valid @RequestBody IotProjectDailyReportSaveReqVO updateReqVO) {
+        iotProjectDailyReportService.updateIotProjectDailyReport(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除项目日报")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-daily-report:delete')")
+    public CommonResult<Boolean> deleteIotProjectDailyReport(@RequestParam("id") Long id) {
+        iotProjectDailyReportService.deleteIotProjectDailyReport(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得项目日报")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-daily-report:query')")
+    public CommonResult<IotProjectDailyReportRespVO> getIotProjectDailyReport(@RequestParam("id") Long id) {
+        IotProjectDailyReportDO iotProjectDailyReport = iotProjectDailyReportService.getIotProjectDailyReport(id);
+        return success(BeanUtils.toBean(iotProjectDailyReport, IotProjectDailyReportRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得项目日报分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-daily-report:query')")
+    public CommonResult<PageResult<IotProjectDailyReportRespVO>> getIotProjectDailyReportPage(@Valid IotProjectDailyReportPageReqVO pageReqVO) {
+        PageResult<IotProjectDailyReportDO> pageResult = iotProjectDailyReportService.getIotProjectDailyReportPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotProjectDailyReportRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出项目日报 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-daily-report:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotProjectDailyReportExcel(@Valid IotProjectDailyReportPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotProjectDailyReportDO> list = iotProjectDailyReportService.getIotProjectDailyReportPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "项目日报.xls", "数据", IotProjectDailyReportRespVO.class,
+                        BeanUtils.toBean(list, IotProjectDailyReportRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectdailyreport/vo/IotProjectDailyReportPageReqVO.java

@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojectdailyreport.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 项目日报分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotProjectDailyReportPageReqVO extends PageParam {
+
+    @Schema(description = "施工队伍id", example = "27980")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "12710")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "4714")
+    private Long taskId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @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 = "下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "当日生产情况生产动态", example = "2")
+    private String productionStatus;
+
+    @Schema(description = "施工状态(数据字典)", example = "2")
+    private Integer constructionStatus;
+
+    @Schema(description = "人员情况")
+    private String personnel;
+
+    @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 = "10815")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "2")
+    private Integer auditStatus;
+
+    @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/iotprojectdailyreport/vo/IotProjectDailyReportRespVO.java

@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojectdailyreport.vo;
+
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 项目日报 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotProjectDailyReportRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16328")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "27980")
+    @ExcelProperty("施工队伍id")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "12710")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "4714")
+    @ExcelProperty("任务id")
+    private Long taskId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    @ExcelProperty("项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "施工开始日期")
+    @ExcelProperty("施工开始日期")
+    private LocalDateTime constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    @ExcelProperty("施工结束日期")
+    private LocalDateTime constructionEndDate;
+
+    @Schema(description = "下步工作计划")
+    @ExcelProperty("下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "当日生产情况生产动态", example = "2")
+    @ExcelProperty("当日生产情况生产动态")
+    private String productionStatus;
+
+    @Schema(description = "施工状态(数据字典)", example = "2")
+    @ExcelProperty("施工状态(数据字典)")
+    private Integer constructionStatus;
+
+    @Schema(description = "人员情况")
+    @ExcelProperty("人员情况")
+    private String personnel;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    @ExcelProperty("不同专业公司的扩展属性值")
+    private List<IotTaskAttrModelProperty> 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 = "10815")
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "2")
+    @ExcelProperty("审批状态 未提交、审批中、审批通过、审批不通过、已取消")
+    private Integer auditStatus;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectdailyreport/vo/IotProjectDailyReportSaveReqVO.java

@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojectdailyreport.vo;
+
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 项目日报新增/修改 Request VO")
+@Data
+public class IotProjectDailyReportSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16328")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "27980")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "12710")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "4714")
+    private Long taskId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "施工开始日期")
+    private LocalDateTime constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    private LocalDateTime constructionEndDate;
+
+    @Schema(description = "下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "当日生产情况生产动态", example = "2")
+    private String productionStatus;
+
+    @Schema(description = "施工状态(数据字典)", example = "2")
+    private Integer constructionStatus;
+
+    @Schema(description = "人员情况")
+    private String personnel;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    private List<IotTaskAttrModelProperty> 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 = "10815")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "2")
+    private Integer auditStatus;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectinfo/vo/IotProjectInfoPageReqVO.java

@@ -55,6 +55,9 @@ public class IotProjectInfoPageReqVO extends PageParam {
     @Schema(description = "工作量已完成")
     private String workloadFinish;
 
+    @Schema(description = "工作量单位(段/层/方/井深/进尺)")
+    private String workloadUnit;
+
     @Schema(description = "开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] startTime;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectinfo/vo/IotProjectInfoRespVO.java

@@ -66,6 +66,10 @@ public class IotProjectInfoRespVO {
     @ExcelProperty("工作量已完成")
     private String workloadFinish;
 
+    @Schema(description = "工作量单位(段/层/方/井深/进尺)")
+    @ExcelProperty("工作量单位(段/层/方/井深/进尺)")
+    private String workloadUnit;
+
     @Schema(description = "开始时间")
     @ExcelProperty("开始时间")
     private LocalDateTime startTime;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectinfo/vo/IotProjectInfoSaveReqVO.java

@@ -50,6 +50,9 @@ public class IotProjectInfoSaveReqVO {
     @Schema(description = "工作量已完成")
     private String workloadFinish;
 
+    @Schema(description = "工作量单位(段/层/方/井深/进尺)")
+    private String workloadUnit;
+
     @Schema(description = "开始时间")
     private LocalDateTime startTime;
 
@@ -80,4 +83,9 @@ public class IotProjectInfoSaveReqVO {
 
     private String manufactureName;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "数据字典类型", example = "rq_iot_project_work_area_rh")
+    private String dictType;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectinfo/vo/IotProjectSaveVO.java

@@ -1,12 +1,8 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotprojectinfo.vo;
 
-import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskPageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author yc
  * @version 1.0

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskPageReqVO.java

@@ -24,9 +24,12 @@ public class IotProjectTaskPageReqVO extends PageParam {
     @Schema(description = "井号", example = "赵六")
     private String wellName;
 
-    @Schema(description = "井型/井别", example = "2")
+    @Schema(description = "井型", example = "2")
     private String wellType;
 
+    @Schema(description = "井别", example = "2")
+    private String wellCategory;
+
     @Schema(description = "施工地点")
     private String location;
 
@@ -61,9 +64,10 @@ public class IotProjectTaskPageReqVO extends PageParam {
     @Schema(description = "备注", example = "你说的对")
     private String remark;
 
-    @Schema(description = "施工队伍")
+    @Schema(description = "施工队伍集合")
     private Set<Long> deptIds;
 
+    @Schema(description = "施工队伍id")
     private Long deptId;
 
     @Schema(description = "客户名称")
@@ -75,4 +79,10 @@ public class IotProjectTaskPageReqVO extends PageParam {
     @Schema(description = "合同编号")
     private String contractCode;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "任务id集合")
+    private List<Long> taskIds;
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskRespVO.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo;
 
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Set;
 
 @Schema(description = "管理后台 - 项目信息任务拆分 Response VO")
@@ -25,10 +27,14 @@ public class IotProjectTaskRespVO {
     @ExcelProperty("井号")
     private String wellName;
 
-    @Schema(description = "井型/井别", example = "2")
-    @ExcelProperty("井型/井别")
+    @Schema(description = "井型", example = "2")
+    @ExcelProperty("井型")
     private String wellType;
 
+    @Schema(description = "井别", example = "2")
+    @ExcelProperty("井别")
+    private String wellCategory;
+
     @Schema(description = "施工地点")
     @ExcelProperty("施工地点")
     private String location;
@@ -95,4 +101,7 @@ public class IotProjectTaskRespVO {
      */
     @Schema(description = "项目所属部门id", example = "1755")
     private Long projectDeptId;
+
+    @Schema(description = "任务扩展属性", example = "[{\"a\": 1},{\"b\": 2}]")
+    private List<IotTaskAttrModelProperty> extProperty;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskSaveReqVO.java

@@ -1,8 +1,10 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo;
 
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Set;
 
 @Schema(description = "管理后台 - 项目信息任务拆分新增/修改 Request VO")
@@ -18,9 +20,12 @@ public class IotProjectTaskSaveReqVO {
     @Schema(description = "井号", example = "赵六")
     private String wellName;
 
-    @Schema(description = "井型/井别", example = "2")
+    @Schema(description = "井型", example = "2")
     private String wellType;
 
+    @Schema(description = "井别", example = "2")
+    private String wellCategory;
+
     @Schema(description = "施工地点")
     private String location;
 
@@ -66,4 +71,12 @@ public class IotProjectTaskSaveReqVO {
     @Schema(description = "合同编号")
     private String contractCode;
 
+    @Schema(description = "任务扩展属性", example = "[{\"a\": 1},{\"b\": 2}]")
+    private List<IotTaskAttrModelProperty> extProperty;
+
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "施工区域数据字典类型", example = "rq_iot_project_work_area_rh")
+    private String dictType;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskattrs/IotProjectTaskAttrsController.java

@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskattrs;
+
+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.iotprojecttaskattrs.vo.IotProjectTaskAttrsPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskattrs.vo.IotProjectTaskAttrsRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskattrs.vo.IotProjectTaskAttrsSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotProjectTaskAttrsDO;
+import cn.iocoder.yudao.module.pms.service.iotprojecttaskattrs.IotProjectTaskAttrsService;
+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("/rq/iot-project-task-attrs")
+@Validated
+public class IotProjectTaskAttrsController {
+
+    @Resource
+    private IotProjectTaskAttrsService iotProjectTaskAttrsService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建项目任务扩展属性")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-attrs:create')")
+    public CommonResult<Long> createIotProjectTaskAttrs(@Valid @RequestBody IotProjectTaskAttrsSaveReqVO createReqVO) {
+        return success(iotProjectTaskAttrsService.createIotProjectTaskAttrs(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新项目任务扩展属性")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-attrs:update')")
+    public CommonResult<Boolean> updateIotProjectTaskAttrs(@Valid @RequestBody IotProjectTaskAttrsSaveReqVO updateReqVO) {
+        iotProjectTaskAttrsService.updateIotProjectTaskAttrs(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除项目任务扩展属性")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-attrs:delete')")
+    public CommonResult<Boolean> deleteIotProjectTaskAttrs(@RequestParam("id") Long id) {
+        iotProjectTaskAttrsService.deleteIotProjectTaskAttrs(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得项目任务扩展属性")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-attrs:query')")
+    public CommonResult<IotProjectTaskAttrsRespVO> getIotProjectTaskAttrs(@RequestParam("id") Long id) {
+        IotProjectTaskAttrsDO iotProjectTaskAttrs = iotProjectTaskAttrsService.getIotProjectTaskAttrs(id);
+        return success(BeanUtils.toBean(iotProjectTaskAttrs, IotProjectTaskAttrsRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得项目任务扩展属性分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-attrs:query')")
+    public CommonResult<PageResult<IotProjectTaskAttrsRespVO>> getIotProjectTaskAttrsPage(@Valid IotProjectTaskAttrsPageReqVO pageReqVO) {
+        PageResult<IotProjectTaskAttrsDO> pageResult = iotProjectTaskAttrsService.getIotProjectTaskAttrsPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotProjectTaskAttrsRespVO.class));
+    }
+
+    @GetMapping("/attrs")
+    @Operation(summary = "获得项目任务扩展属性列表")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-attrs:query')")
+    public CommonResult<List<IotProjectTaskAttrsRespVO>> attrs(@Valid IotProjectTaskAttrsPageReqVO pageReqVO) {
+        List<IotProjectTaskAttrsDO> pageResult = iotProjectTaskAttrsService.getIotProjectTaskAttrsList(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotProjectTaskAttrsRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出项目任务扩展属性 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-attrs:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotProjectTaskAttrsExcel(@Valid IotProjectTaskAttrsPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotProjectTaskAttrsDO> list = iotProjectTaskAttrsService.getIotProjectTaskAttrsPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "项目任务扩展属性.xls", "数据", IotProjectTaskAttrsRespVO.class,
+                        BeanUtils.toBean(list, IotProjectTaskAttrsRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskattrs/vo/IotProjectTaskAttrsPageReqVO.java

@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskattrs.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 项目任务扩展属性分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotProjectTaskAttrsPageReqVO extends PageParam {
+
+    @Schema(description = "任务扩展模板id", example = "9437")
+    private Long templateId;
+
+    @Schema(description = "公司id", example = "157")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "15067")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂 )")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    private String wellType;
+
+    @Schema(description = "井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    private String technique;
+
+    @Schema(description = "属性名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "属性标识符")
+    private String identifier;
+
+    @Schema(description = "数据类型(double text textarea date)")
+    private String dataType;
+
+    @Schema(description = "是否必填(0非必填 1必填)")
+    private Integer required;
+
+    @Schema(description = "单位")
+    private String unit;
+
+    @Schema(description = "访问模式(r读  w写)")
+    private String accessMode;
+
+    @Schema(description = "默认值")
+    private String defaultValue;
+
+    @Schema(description = "最大值")
+    private String maxValue;
+
+    @Schema(description = "最小值")
+    private String minValue;
+
+    @Schema(description = "不同专业公司的扩展属性")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "0")
+    private Integer status;
+
+    @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/iotprojecttaskattrs/vo/IotProjectTaskAttrsRespVO.java

@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskattrs.vo;
+
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 项目任务扩展属性 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotProjectTaskAttrsRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14405")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "任务扩展模板id", example = "9437")
+    @ExcelProperty("任务扩展模板id")
+    private Long templateId;
+
+    @Schema(description = "公司id", example = "17720")
+    @ExcelProperty("公司id")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "15067")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂 )")
+    @ExcelProperty("项目类别(钻井 修井 注氮 酸化压裂 )")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    @ExcelProperty("井型")
+    private String wellType;
+
+    @Schema(description = "井别")
+    @ExcelProperty("井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    @ExcelProperty("施工工艺")
+    private String technique;
+
+    @Schema(description = "属性名称", example = "芋艿")
+    @ExcelProperty("属性名称")
+    private String name;
+
+    @Schema(description = "属性标识符")
+    @ExcelProperty("属性标识符")
+    private String identifier;
+
+    @Schema(description = "数据类型(double text textarea date)")
+    @ExcelProperty("数据类型(double text textarea date)")
+    private String dataType;
+
+    @Schema(description = "是否必填(0非必填 1必填)")
+    @ExcelProperty("是否必填(0非必填 1必填)")
+    private Integer required;
+
+    @Schema(description = "单位")
+    @ExcelProperty("单位")
+    private String unit;
+
+    @Schema(description = "访问模式(r读  w写)")
+    @ExcelProperty("访问模式(r读  w写)")
+    private String accessMode;
+
+    @Schema(description = "默认值")
+    @ExcelProperty("默认值")
+    private String defaultValue;
+
+    @Schema(description = "最大值")
+    private String maxValue;
+
+    @Schema(description = "最小值")
+    private String minValue;
+
+    @Schema(description = "不同专业公司的扩展属性")
+    @ExcelProperty("不同专业公司的扩展属性")
+    private IotTaskAttrModelProperty extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "0")
+    @ExcelProperty("状态(0启用 1禁用)")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskattrs/vo/IotProjectTaskAttrsSaveReqVO.java

@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskattrs.vo;
+
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 项目任务扩展属性新增/修改 Request VO")
+@Data
+public class IotProjectTaskAttrsSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14405")
+    private Long id;
+
+    @Schema(description = "任务扩展模板id", example = "9437")
+    private Long templateId;
+
+    @Schema(description = "公司id", example = "17720")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "15067")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂 )")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    private String wellType;
+
+    @Schema(description = "井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    private String technique;
+
+    @Schema(description = "属性名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "属性标识符")
+    private String identifier;
+
+    @Schema(description = "数据类型(double text textarea date)")
+    private String dataType;
+
+    @Schema(description = "是否必填(0非必填 1必填)")
+    private Integer required;
+
+    @Schema(description = "单位")
+    private String unit;
+
+    @Schema(description = "访问模式(r读  w写)")
+    private String accessMode;
+
+    @Schema(description = "默认值")
+    private String defaultValue;
+
+    @Schema(description = "最大值")
+    private String maxValue;
+
+    @Schema(description = "最小值")
+    private String minValue;
+
+    @Schema(description = "不同专业公司的扩展属性")
+    private IotTaskAttrModelProperty extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "1")
+    private Integer status;
+
+}

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

@@ -32,14 +32,22 @@ public class IotProjectTaskScheduleRespVO {
     @ExcelProperty("施工阶段描述")
     private String description;
 
-    @Schema(description = "状态起始时间")
-    @ExcelProperty("状态起始时间")
+    @Schema(description = "状态起始时间 计划")
+    @ExcelProperty("状态起始时间 计划")
     private LocalDateTime startTime;
 
-    @Schema(description = "状态结束时间")
-    @ExcelProperty("状态结束时间")
+    @Schema(description = "状态结束时间 计划")
+    @ExcelProperty("状态结束时间 计划")
     private LocalDateTime endTime;
 
+    @Schema(description = "状态起始时间 实际")
+    @ExcelProperty("状态起始时间 实际")
+    private LocalDateTime actualStartTime;
+
+    @Schema(description = "状态结束时间 实际")
+    @ExcelProperty("状态结束时间 实际")
+    private LocalDateTime actualEndTime;
+
     @Schema(description = "备注", example = "你说的对")
     @ExcelProperty("备注")
     private String remark;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttasktemplate/IotProjectTaskTemplateController.java

@@ -0,0 +1,103 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttasktemplate;
+
+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.iotprojecttasktemplate.vo.IotProjectTaskTemplatePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttasktemplate.vo.IotProjectTaskTemplateRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttasktemplate.vo.IotProjectTaskTemplateSaveReqVO;
+import cn.iocoder.yudao.module.pms.convert.iotprojecttasktemplate.IotProjectTaskTemplateConvert;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttasktemplate.IotProjectTaskTemplateDO;
+import cn.iocoder.yudao.module.pms.service.iotprojecttasktemplate.IotProjectTaskTemplateService;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+
+@Tag(name = "管理后台 - 项目任务属性模板")
+@RestController
+@RequestMapping("/rq/iot-project-task-template")
+@Validated
+public class IotProjectTaskTemplateController {
+
+    @Resource
+    private IotProjectTaskTemplateService iotProjectTaskTemplateService;
+    @Resource
+    private DeptService deptService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建项目任务属性模板")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-template:create')")
+    public CommonResult<Long> createIotProjectTaskTemplate(@Valid @RequestBody IotProjectTaskTemplateSaveReqVO createReqVO) {
+        return success(iotProjectTaskTemplateService.createIotProjectTaskTemplate(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新项目任务属性模板")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-template:update')")
+    public CommonResult<Boolean> updateIotProjectTaskTemplate(@Valid @RequestBody IotProjectTaskTemplateSaveReqVO updateReqVO) {
+        iotProjectTaskTemplateService.updateIotProjectTaskTemplate(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除项目任务属性模板")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-template:delete')")
+    public CommonResult<Boolean> deleteIotProjectTaskTemplate(@RequestParam("id") Long id) {
+        iotProjectTaskTemplateService.deleteIotProjectTaskTemplate(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得项目任务属性模板")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-template:query')")
+    public CommonResult<IotProjectTaskTemplateRespVO> getIotProjectTaskTemplate(@RequestParam("id") Long id) {
+        IotProjectTaskTemplateDO iotProjectTaskTemplate = iotProjectTaskTemplateService.getIotProjectTaskTemplate(id);
+        return success(BeanUtils.toBean(iotProjectTaskTemplate, IotProjectTaskTemplateRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得项目任务属性模板分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-template:query')")
+    public CommonResult<PageResult<IotProjectTaskTemplateRespVO>> getIotProjectTaskTemplatePage(@Valid IotProjectTaskTemplatePageReqVO pageReqVO) {
+        PageResult<IotProjectTaskTemplateDO> pageResult = iotProjectTaskTemplateService.getIotProjectTaskTemplatePage(pageReqVO);
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(
+                convertList(pageResult.getList(), IotProjectTaskTemplateDO::getDeptId));
+        List<IotProjectTaskTemplateRespVO> taskTemplateRespVOS = IotProjectTaskTemplateConvert.INSTANCE.convertList(pageResult.getList(), deptMap);
+        return success(new PageResult<>(taskTemplateRespVOS, pageResult.getTotal()));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出项目任务属性模板 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task-template:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotProjectTaskTemplateExcel(@Valid IotProjectTaskTemplatePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotProjectTaskTemplateDO> list = iotProjectTaskTemplateService.getIotProjectTaskTemplatePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "项目任务属性模板.xls", "数据", IotProjectTaskTemplateRespVO.class,
+                        BeanUtils.toBean(list, IotProjectTaskTemplateRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttasktemplate/vo/IotProjectTaskTemplatePageReqVO.java

@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttasktemplate.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 项目任务属性模板分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotProjectTaskTemplatePageReqVO extends PageParam {
+
+    @Schema(description = "公司id", example = "21249")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "1118")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂 )")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    private String wellType;
+
+    @Schema(description = "井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    private String technique;
+
+    @Schema(description = "模板名称", example = "李四")
+    private String name;
+
+    @Schema(description = "模板标识符")
+    private String identifier;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "0")
+    private Integer status;
+
+    @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/iotprojecttasktemplate/vo/IotProjectTaskTemplateRespVO.java

@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttasktemplate.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 项目任务属性模板 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotProjectTaskTemplateRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18517")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "公司id", example = "21249")
+    @ExcelProperty("公司id")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "1118")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂 )")
+    @ExcelProperty("项目类别(钻井 修井 注氮 酸化压裂 )")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    @ExcelProperty("井型")
+    private String wellType;
+
+    @Schema(description = "井别")
+    @ExcelProperty("井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    @ExcelProperty("施工工艺")
+    private String technique;
+
+    @Schema(description = "模板名称", example = "李四")
+    @ExcelProperty("模板名称")
+    private String name;
+
+    @Schema(description = "模板标识符")
+    @ExcelProperty("模板标识符")
+    private String identifier;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "0")
+    @ExcelProperty("状态(0启用 1禁用)")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "公司名称")
+    private String deptName;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttasktemplate/vo/IotProjectTaskTemplateSaveReqVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttasktemplate.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 项目任务属性模板新增/修改 Request VO")
+@Data
+public class IotProjectTaskTemplateSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18517")
+    private Long id;
+
+    @Schema(description = "公司id", example = "21249")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "1118")
+    private Long projectId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂 )")
+    private String projectClassification;
+
+    @Schema(description = "井型", example = "2")
+    private String wellType;
+
+    @Schema(description = "井别")
+    private String wellCategory;
+
+    @Schema(description = "施工工艺")
+    private String technique;
+
+    @Schema(description = "模板名称", example = "李四")
+    private String name;
+
+    @Schema(description = "模板标识符")
+    private String identifier;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "0")
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/IotRhDailyReportController.java

@@ -0,0 +1,191 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+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.datapermission.core.util.DataPermissionUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojectinfo.vo.IotProjectInfoPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojectinfo.IotProjectInfoDO;
+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.iotrhdailyreport.IotRhDailyReportDO;
+import cn.iocoder.yudao.module.pms.service.iotprojectinfo.IotProjectInfoService;
+import cn.iocoder.yudao.module.pms.service.iotprojecttask.IotProjectTaskService;
+import cn.iocoder.yudao.module.pms.service.iotrhdailyreport.IotRhDailyReportService;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+
+@Tag(name = "管理后台 - 瑞恒日报")
+@RestController
+@RequestMapping("/pms/iot-rh-daily-report")
+@Validated
+public class IotRhDailyReportController {
+
+    @Resource
+    private IotRhDailyReportService iotRhDailyReportService;
+    @Resource
+    private DeptService deptService;
+    @Resource
+    private IotProjectInfoService iotProjectInfoService;
+    @Resource
+    private IotProjectTaskService iotProjectTaskService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建瑞恒日报")
+    @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:create')")
+    public CommonResult<Long> createIotRhDailyReport(@Valid @RequestBody IotRhDailyReportSaveReqVO createReqVO) {
+        return success(iotRhDailyReportService.createIotRhDailyReport(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新瑞恒日报")
+    @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:update')")
+    public CommonResult<Boolean> updateIotRhDailyReport(@Valid @RequestBody IotRhDailyReportSaveReqVO updateReqVO) {
+        iotRhDailyReportService.updateIotRhDailyReport(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除瑞恒日报")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:delete')")
+    public CommonResult<Boolean> deleteIotRhDailyReport(@RequestParam("id") Long id) {
+        iotRhDailyReportService.deleteIotRhDailyReport(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得瑞恒日报")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:query')")
+    public CommonResult<IotRhDailyReportRespVO> getIotRhDailyReport(@RequestParam("id") Long id) {
+        IotRhDailyReportDO iotRhDailyReport = iotRhDailyReportService.getIotRhDailyReport(id);
+        return success(BeanUtils.toBean(iotRhDailyReport, IotRhDailyReportRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得瑞恒日报分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:query')")
+    public CommonResult<PageResult<IotRhDailyReportRespVO>> getIotRhDailyReportPage(@Valid IotRhDailyReportPageReqVO pageReqVO) {
+        PageResult<IotRhDailyReportDO> pageResult = iotRhDailyReportService.getIotRhDailyReportPage(pageReqVO);
+
+        // List<IotRhDailyReportRespVO> rhDailyReports = IotRhDailyReportConvert.INSTANCE.convertList(pageResult.getList(), deptMap);
+        return success(new PageResult<>(buildRhDailyReports(pageResult.getList()), pageResult.getTotal()));
+        // return success(new PageResult<>(rhDailyReports, pageResult.getTotal()));
+    }
+
+    @GetMapping("/taskActualProgress")
+    @Operation(summary = "查询日报所属任务的实际进度")
+    @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:query')")
+    public CommonResult<List<IotRhDailyReportRespVO>> taskActualProgress(@Valid IotRhDailyReportPageReqVO pageReqVO) {
+        List<IotRhDailyReportDO> taskProgresses = iotRhDailyReportService.taskActualProgress(pageReqVO);
+
+        return success(BeanUtils.toBean(taskProgresses, IotRhDailyReportRespVO.class));
+    }
+
+    /**
+     * 瑞恒日报分布 设置关联查询信息
+     * @param reports
+     * @return
+     */
+    private List<IotRhDailyReportRespVO> buildRhDailyReports(List<IotRhDailyReportDO> reports) {
+        if (CollUtil.isEmpty(reports)) {
+            return Collections.emptyList();
+        }
+        // 设备部门信息
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(convertList(reports, IotRhDailyReportDO::getDeptId));
+        // key项目id   value项目合同号
+        Map<Long, String> projectPair = new HashMap<>();
+        //  key任务id     value任务井号-施工区域
+        Map<Long, String> taskPair = new HashMap<>();
+        // key任务id   value设计注气量
+        Map<Long, String> taskExtPropertyPair = new HashMap<>();
+        DataPermissionUtils.executeIgnore(() -> {
+            // 查询日报关联的项目信息
+            IotProjectInfoPageReqVO reqVO = new IotProjectInfoPageReqVO();
+            reqVO.setProjectIds(convertList(reports, IotRhDailyReportDO::getProjectId));
+            List<IotProjectInfoDO> projects = iotProjectInfoService.getIotProjectInfos(reqVO);
+            if (CollUtil.isNotEmpty(projects)) {
+                projects.forEach(project -> {
+                    projectPair.put(project.getId(), project.getContractName());
+                });
+            }
+            // 查询日报关联的任务信息
+            IotProjectTaskPageReqVO taskReqVO = new IotProjectTaskPageReqVO();
+            taskReqVO.setTaskIds(convertList(reports, IotRhDailyReportDO::getTaskId));
+            List<IotProjectTaskDO> tasks = iotProjectTaskService.projectTasks(taskReqVO);
+            if (CollUtil.isNotEmpty(tasks)) {
+                tasks.forEach(task -> {
+                    taskPair.put(task.getId(), StrUtil.join(" - ", task.getWellName(), task.getLocation()));
+                    if (CollUtil.isNotEmpty(task.getExtProperty())) {
+                        List<IotTaskAttrModelProperty> taskAttrs = task.getExtProperty();
+                        if (CollUtil.isNotEmpty(taskAttrs)) {
+                            // 找到 设计注气量 属性 对应的值
+                            taskAttrs.forEach(attr -> {
+                                if ("设计注气量".equals(attr.getName()) && StrUtil.isNotBlank(attr.getActualValue())) {
+                                    taskExtPropertyPair.put(task.getId(), attr.getActualValue());
+                                }
+                            });
+                        }
+                    }
+                });
+            }
+            // 查询任务中维护的 设计注气量
+
+        });
+        // 2. 拼接数据
+        return BeanUtils.toBean(reports, IotRhDailyReportRespVO.class, (reportVO) -> {
+            // 2.1 拼接部门信息
+            findAndThen(deptMap, reportVO.getDeptId(), dept -> reportVO.setDeptName(dept.getName()));
+            // 2.2 日报关联的项目信息
+            findAndThen(projectPair, reportVO.getProjectId(), contractName -> reportVO.setContractName(contractName));
+            // 2.3 日报关联的任务信息
+            findAndThen(taskPair, reportVO.getTaskId(), taskName -> reportVO.setTaskName(taskName));
+            // 2.4 设计注气量
+            findAndThen(taskExtPropertyPair, reportVO.getTaskId(), designInjection -> reportVO.setDesignInjection(designInjection));
+        });
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出瑞恒日报 Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotRhDailyReportExcel(@Valid IotRhDailyReportPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotRhDailyReportDO> list = iotRhDailyReportService.getIotRhDailyReportPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "瑞恒日报.xls", "数据", IotRhDailyReportRespVO.class,
+                        BeanUtils.toBean(list, IotRhDailyReportRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportPageReqVO.java

@@ -0,0 +1,115 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.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 IotRhDailyReportPageReqVO extends PageParam {
+
+    @Schema(description = "施工队伍id", example = "17995")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "24473")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "20353")
+    private Long taskId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "搬迁安装天数")
+    private BigDecimal relocationDays;
+
+    @Schema(description = "运行时效")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] transitTime;
+
+    @Schema(description = "当日注气量(万方)")
+    private BigDecimal dailyGasInjection;
+
+    @Schema(description = "当日注水量(方)")
+    private BigDecimal dailyWaterInjection;
+
+    @Schema(description = "当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "当日注气时间(H)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] dailyInjectGasTime;
+
+    @Schema(description = "当日注水时间(H)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] dailyInjectWaterTime;
+
+    @Schema(description = "非生产时间(H)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal[] nonProductionTime;
+
+    @Schema(description = "非生产时间原因")
+    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 = "2")
+    private String productionStatus;
+
+    @Schema(description = "下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
+    private Integer constructionStatus;
+
+    @Schema(description = "人员情况")
+    private String personnel;
+
+    @Schema(description = "累计注气量(万方)")
+    private BigDecimal totalGasInjection;
+
+    @Schema(description = "累计注水量(方)")
+    private BigDecimal totalWaterInjection;
+
+    @Schema(description = "累计完工井次")
+    private BigDecimal cumulativeCompletion;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "1131")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    private Integer auditStatus;
+
+    @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/iotrhdailyreport/vo/IotRhDailyReportRespVO.java

@@ -0,0 +1,151 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.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 IotRhDailyReportRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5694")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "17995")
+    @ExcelProperty("施工队伍id")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "24473")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "20353")
+    @ExcelProperty("任务id")
+    private Long taskId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    @ExcelProperty("项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "搬迁安装天数")
+    @ExcelProperty("搬迁安装天数")
+    private BigDecimal relocationDays;
+
+    @Schema(description = "运行时效")
+    @ExcelProperty("运行时效")
+    private BigDecimal transitTime;
+
+    @Schema(description = "当日注气量(万方)")
+    @ExcelProperty("当日注气量(万方)")
+    private BigDecimal dailyGasInjection;
+
+    @Schema(description = "当日注水量(方)")
+    @ExcelProperty("当日注水量(方)")
+    private BigDecimal dailyWaterInjection;
+
+    @Schema(description = "当日注气时间(H)")
+    @ExcelProperty("当日注气时间(H)")
+    private BigDecimal dailyInjectGasTime;
+
+    @Schema(description = "当日注水时间(H)")
+    @ExcelProperty("当日注水时间(H)")
+    private BigDecimal dailyInjectWaterTime;
+
+    @Schema(description = "当日用电量(kWh)")
+    @ExcelProperty("当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "非生产时间(H)")
+    @ExcelProperty("非生产时间(H)")
+    private BigDecimal nonProductionTime;
+
+    @Schema(description = "非生产时间原因")
+    @ExcelProperty("非生产时间原因")
+    private String nptReason;
+
+    @Schema(description = "施工开始日期")
+    @ExcelProperty("施工开始日期")
+    private LocalDateTime constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    @ExcelProperty("施工结束日期")
+    private LocalDateTime constructionEndDate;
+
+    @Schema(description = "当日生产情况生产动态", example = "2")
+    @ExcelProperty("当日生产情况生产动态")
+    private String productionStatus;
+
+    @Schema(description = "下步工作计划")
+    @ExcelProperty("下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
+    @ExcelProperty("施工状态(动迁 准备 施工 完工)")
+    private Integer constructionStatus;
+
+    @Schema(description = "人员情况")
+    @ExcelProperty("人员情况")
+    private String personnel;
+
+    @Schema(description = "累计注气量(万方)")
+    @ExcelProperty("累计注气量(万方)")
+    private BigDecimal totalGasInjection;
+
+    @Schema(description = "累计注水量(方)")
+    @ExcelProperty("累计注水量(方)")
+    private BigDecimal totalWaterInjection;
+
+    @Schema(description = "累计完工井次")
+    @ExcelProperty("累计完工井次")
+    private BigDecimal cumulativeCompletion;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    @ExcelProperty("不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    @ExcelProperty("排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    @ExcelProperty("状态(0启用 1禁用)")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "1131")
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    @ExcelProperty("审批状态 未提交、审批中、审批通过、审批不通过、已取消")
+    private Integer auditStatus;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "部门名称")
+    private String deptName;
+
+    @Schema(description = "项目/合同名称")
+    private String contractName;
+
+    @Schema(description = "任务 井号-施工地点")
+    private String taskName;
+
+    @Schema(description = "设计注气量")
+    private String designInjection;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportSaveReqVO.java

@@ -0,0 +1,100 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.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 IotRhDailyReportSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5694")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "17995")
+    private Long deptId;
+
+    @Schema(description = "项目id", example = "24473")
+    private Long projectId;
+
+    @Schema(description = "任务id", example = "20353")
+    private Long taskId;
+
+    @Schema(description = "项目类别(钻井 修井 注氮 酸化压裂... )")
+    private String projectClassification;
+
+    @Schema(description = "搬迁安装天数")
+    private BigDecimal relocationDays;
+
+    @Schema(description = "运行时效")
+    private BigDecimal transitTime;
+
+    @Schema(description = "当日注气量(万方)")
+    private BigDecimal dailyGasInjection;
+
+    @Schema(description = "当日注水量(方)")
+    private BigDecimal dailyWaterInjection;
+
+    @Schema(description = "当日注气时间(H)")
+    private BigDecimal dailyInjectGasTime;
+
+    @Schema(description = "当日注水时间(H)")
+    private BigDecimal dailyInjectWaterTime;
+
+    @Schema(description = "当日用电量(kWh)")
+    private BigDecimal dailyPowerUsage;
+
+    @Schema(description = "非生产时间(H)")
+    private BigDecimal nonProductionTime;
+
+    @Schema(description = "非生产时间原因")
+    private String nptReason;
+
+    @Schema(description = "施工开始日期")
+    private LocalDateTime constructionStartDate;
+
+    @Schema(description = "施工结束日期")
+    private LocalDateTime constructionEndDate;
+
+    @Schema(description = "当日生产情况生产动态", example = "2")
+    private String productionStatus;
+
+    @Schema(description = "下步工作计划")
+    private String nextPlan;
+
+    @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
+    private Integer constructionStatus;
+
+    @Schema(description = "人员情况")
+    private String personnel;
+
+    @Schema(description = "累计注气量(万方)")
+    private BigDecimal totalGasInjection;
+
+    @Schema(description = "累计注水量(方)")
+    private BigDecimal totalWaterInjection;
+
+    @Schema(description = "累计完工井次")
+    private BigDecimal cumulativeCompletion;
+
+    @Schema(description = "不同专业公司的扩展属性值")
+    private String extProperty;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    private Integer status;
+
+    @Schema(description = "流程实例id", example = "1131")
+    private String processInstanceId;
+
+    @Schema(description = "审批状态 未提交、审批中、审批通过、审批不通过、已取消", example = "1")
+    private Integer auditStatus;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/IotMaintainController.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.pms.controller.admin.maintain;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -15,7 +16,9 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainBomDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.oa.IotOaPersonDO;
 import cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant;
+import cn.iocoder.yudao.module.pms.oa.CallBackOaVo;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.failure.IotFailureReportService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainBomService;
@@ -196,4 +199,27 @@ public class IotMaintainController {
         return success(userListByDept);
 
     }
+
+    @GetMapping("/maintain/applyusers")
+    @PreAuthorize("@ss.hasPermission('system:user:query')")
+    public CommonResult<List<IotOaPersonDO>> getApplyUsers(@RequestParam("id") String id) {
+        List<IotOaPersonDO> maintainPerson = iotMaintainService.getMaintainPerson(id);
+        return success(maintainPerson);
+    }
+    @GetMapping("/maintain/project")
+    @PreAuthorize("@ss.hasPermission('system:user:query')")
+    public CommonResult<List<IotOaPersonDO>> getProjectUsers(@RequestParam("id") String id) {
+        List<IotOaPersonDO> maintainPerson = iotMaintainService.getProjectPerson(id);
+        return success(maintainPerson);
+    }
+
+    @PostMapping("/oa")
+    @PreAuthorize("@ss.hasPermission('system:oa:query')")
+    public CommonResult<String> getProjectUsers(@RequestBody CallBackOaVo callBackOaVo) {
+        if (StringUtils.isBlank(callBackOaVo.getRequestId())||StringUtils.isBlank(callBackOaVo.getIfSuccess())||Objects.isNull(callBackOaVo.getMainData())){
+            throw new ServiceException(new ErrorCode(200, "参数缺失"));
+        }
+        iotMaintainService.oaDeal(callBackOaVo);
+        return success("成功");
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/vo/IotMaintainRespVO.java

@@ -109,7 +109,7 @@ public class IotMaintainRespVO {
     /**
      * 供应商
      */
-    private Long supplier;
+    private String supplier;
     /**
      * 委外附件
      */
@@ -130,4 +130,30 @@ public class IotMaintainRespVO {
     private LocalDateTime executeDate;
     private List<String> pics;
     private List<String> outFiles;
+
+    private String creator;
+    private String maintainPersonName;
+    /**申请人id*/
+    private String applyPersonId;
+    /**申请部门id*/
+    private String applyDeptId;
+    /**规格型号*/
+    private String model;
+    /**启用日期*/
+    private String enableDate;
+    /**维修类别*/
+    private String maintainClassify;
+
+    /**运转公里/小时*/
+    private String kmHour;
+    /**维修地点*/
+    private String address;
+    /**项目经理*/
+    private String projectManager;
+    /**oa流程单号*/
+    private String oaFlowNo;
+    /**维修项目*/
+    private String maintainItem;
+    /**oa返回的请求id*/
+    private String requestId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/vo/IotMaintainSaveReqVO.java

@@ -87,7 +87,7 @@ public class IotMaintainSaveReqVO {
     /**
      * 供应商
      */
-    private Long supplier;
+    private String supplier;
     /**
      * 委外附件
      */
@@ -106,4 +106,24 @@ public class IotMaintainSaveReqVO {
 
     private List<String> pics;
     private List<String> outFiles;
+
+    /**申请人id*/
+    private String applyPersonId;
+    /**申请部门id*/
+    private String applyDeptId;
+    /**规格型号*/
+    private String model;
+    /**启用日期*/
+    private String enableDate;
+    /**维修类别*/
+    private String maintainClassify;
+
+    /**运转公里/小时*/
+    private String kmHour;
+    /**维修地点*/
+    private String address;
+    /**项目经理*/
+    private String projectManager;
+
+    private String maintainItem;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/oa/IotOaCompanyPageReqVO.java

@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.pms.controller.admin.oa;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - oa公司分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotOaCompanyPageReqVO extends PageParam {
+
+    @Schema(description = "公司描述")
+    private String subcompanydesc;
+
+    @Schema(description = "公司代码")
+    private String subcompanycode;
+
+    @Schema(description = "无", example = "407")
+    private String supsubcomid;
+
+    @Schema(description = "oaId", example = "27563")
+    private String oaId;
+
+    @Schema(description = "公司名称", example = "赵六")
+    private String subcompanyname;
+
+    @Schema(description = "排序")
+    private String showorder;
+
+    @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/oa/IotOaCompanyRespVO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.pms.controller.admin.oa;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - oa公司 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotOaCompanyRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1921")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "公司描述")
+    @ExcelProperty("公司描述")
+    private String subcompanydesc;
+
+    @Schema(description = "公司代码")
+    @ExcelProperty("公司代码")
+    private String subcompanycode;
+
+    @Schema(description = "无", example = "407")
+    @ExcelProperty("无")
+    private String supsubcomid;
+
+    @Schema(description = "oaId", example = "27563")
+    @ExcelProperty("oaId")
+    private String oaId;
+
+    @Schema(description = "公司名称", example = "赵六")
+    @ExcelProperty("公司名称")
+    private String subcompanyname;
+
+    @Schema(description = "排序")
+    @ExcelProperty("排序")
+    private String showorder;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/oa/IotOaCompanySaveReqVO.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.pms.controller.admin.oa;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - oa公司新增/修改 Request VO")
+@Data
+public class IotOaCompanySaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1921")
+    private Long id;
+
+    @Schema(description = "公司描述")
+    private String subcompanydesc;
+
+    @Schema(description = "公司代码")
+    private String subcompanycode;
+
+    @Schema(description = "无", example = "407")
+    private String supsubcomid;
+
+    @Schema(description = "oaId", example = "27563")
+    private String oaId;
+
+    @Schema(description = "公司名称", example = "赵六")
+    private String subcompanyname;
+
+    @Schema(description = "排序")
+    private String showorder;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/oa/IotOaDepartPageReqVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.pms.controller.admin.oa;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - oa部门分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotOaDepartPageReqVO extends PageParam {
+
+    @Schema(description = "无", example = "21826")
+    private String supdepid;
+
+    @Schema(description = "部门描述")
+    private String departmentmark;
+
+    @Schema(description = "部门名称", example = "王五")
+    private String departmentname;
+
+    @Schema(description = "部门编码")
+    private String departmentcode;
+
+    @Schema(description = "oaid", example = "13606")
+    private String oaId;
+
+    @Schema(description = "无")
+    private String subcompanyid1;
+
+    @Schema(description = "排序")
+    private String showorder;
+
+    @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/oa/IotOaDepartRespVO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.pms.controller.admin.oa;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - oa部门 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotOaDepartRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27509")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "无", example = "21826")
+    @ExcelProperty("无")
+    private String supdepid;
+
+    @Schema(description = "部门描述")
+    @ExcelProperty("部门描述")
+    private String departmentmark;
+
+    @Schema(description = "部门名称", example = "王五")
+    @ExcelProperty("部门名称")
+    private String departmentname;
+
+    @Schema(description = "部门编码")
+    @ExcelProperty("部门编码")
+    private String departmentcode;
+
+    @Schema(description = "oaid", example = "13606")
+    @ExcelProperty("oaid")
+    private String oaId;
+
+    @Schema(description = "无")
+    @ExcelProperty("无")
+    private String subcompanyid1;
+
+    @Schema(description = "排序")
+    @ExcelProperty("排序")
+    private String showorder;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/oa/IotOaDepartSaveReqVO.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.pms.controller.admin.oa;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - oa部门新增/修改 Request VO")
+@Data
+public class IotOaDepartSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27509")
+    private Long id;
+
+    @Schema(description = "无", example = "21826")
+    private String supdepid;
+
+    @Schema(description = "部门描述")
+    private String departmentmark;
+
+    @Schema(description = "部门名称", example = "王五")
+    private String departmentname;
+
+    @Schema(description = "部门编码")
+    private String departmentcode;
+
+    @Schema(description = "oaid", example = "13606")
+    private String oaId;
+
+    @Schema(description = "无")
+    private String subcompanyid1;
+
+    @Schema(description = "排序")
+    private String showorder;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/oa/IotOaPersonPageReqVO.java

@@ -0,0 +1,78 @@
+package cn.iocoder.yudao.module.pms.controller.admin.oa;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - oa人员分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotOaPersonPageReqVO extends PageParam {
+
+    @Schema(description = "公司开始日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] companystartdate;
+
+    @Schema(description = "所属分部1")
+    private String subcompanyid1;
+
+    @Schema(description = "所属分部名称", example = "张三")
+    private String subcompanyname;
+
+    @Schema(description = "工作序列", example = "王五")
+    private String jobgroupname;
+
+    @Schema(description = "无", example = "11411")
+    private String belongtoid;
+
+    @Schema(description = "所属集团编码")
+    private String subcompanycode;
+
+    @Schema(description = "oaid", example = "32027")
+    private String oaId;
+
+    @Schema(description = "姓名", example = "王五")
+    private String lastname;
+
+    @Schema(description = "合同结束日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] enddate;
+
+    @Schema(description = "所属部门名称", example = "芋艿")
+    private String departmentname;
+
+    @Schema(description = "状态", example = "2")
+    private String status;
+
+    @Schema(description = "工作职务", example = "王五")
+    private String jobtitlename;
+
+    @Schema(description = "部门编码")
+    private String departmentcode;
+
+    @Schema(description = "工号")
+    private String workcode;
+
+    @Schema(description = "性别")
+    private String sex;
+
+    @Schema(description = "部门id", example = "12290")
+    private String departmentid;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "工作地点", example = "22757")
+    private String locationid;
+
+    @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/oa/IotOaPersonRespVO.java

@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.pms.controller.admin.oa;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - oa人员 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotOaPersonRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "10139")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "公司开始日期")
+    @ExcelProperty("公司开始日期")
+    private String companystartdate;
+
+    @Schema(description = "所属分部1")
+    @ExcelProperty("所属分部1")
+    private String subcompanyid1;
+
+    @Schema(description = "所属分部名称", example = "张三")
+    @ExcelProperty("所属分部名称")
+    private String subcompanyname;
+
+    @Schema(description = "工作序列", example = "王五")
+    @ExcelProperty("工作序列")
+    private String jobgroupname;
+
+    @Schema(description = "无", example = "11411")
+    @ExcelProperty("无")
+    private String belongtoid;
+
+    @Schema(description = "所属集团编码")
+    @ExcelProperty("所属集团编码")
+    private String subcompanycode;
+
+    @Schema(description = "oaid", example = "32027")
+    @ExcelProperty("oaid")
+    private String oaId;
+
+    @Schema(description = "姓名", example = "王五")
+    @ExcelProperty("姓名")
+    private String lastname;
+
+    @Schema(description = "合同结束日期")
+    @ExcelProperty("合同结束日期")
+    private String enddate;
+
+    @Schema(description = "所属部门名称", example = "芋艿")
+    @ExcelProperty("所属部门名称")
+    private String departmentname;
+
+    @Schema(description = "状态", example = "2")
+    @ExcelProperty("状态")
+    private String status;
+
+    @Schema(description = "工作职务", example = "王五")
+    @ExcelProperty("工作职务")
+    private String jobtitlename;
+
+    @Schema(description = "部门编码")
+    @ExcelProperty("部门编码")
+    private String departmentcode;
+
+    @Schema(description = "工号")
+    @ExcelProperty("工号")
+    private String workcode;
+
+    @Schema(description = "性别")
+    @ExcelProperty("性别")
+    private String sex;
+
+    @Schema(description = "部门id", example = "12290")
+    @ExcelProperty("部门id")
+    private String departmentid;
+
+    @Schema(description = "手机号")
+    @ExcelProperty("手机号")
+    private String mobile;
+
+    @Schema(description = "工作地点", example = "22757")
+    @ExcelProperty("工作地点")
+    private String locationid;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/oa/IotOaPersonSaveReqVO.java

@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.pms.controller.admin.oa;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - oa人员新增/修改 Request VO")
+@Data
+public class IotOaPersonSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "10139")
+    private Long id;
+
+    @Schema(description = "公司开始日期")
+    private String companystartdate;
+
+    @Schema(description = "所属分部1")
+    private String subcompanyid1;
+
+    @Schema(description = "所属分部名称", example = "张三")
+    private String subcompanyname;
+
+    @Schema(description = "工作序列", example = "王五")
+    private String jobgroupname;
+
+    @Schema(description = "无", example = "11411")
+    private String belongtoid;
+
+    @Schema(description = "所属集团编码")
+    private String subcompanycode;
+
+    @Schema(description = "oaid", example = "32027")
+    private String oaId;
+
+    @Schema(description = "姓名", example = "王五")
+    private String lastname;
+
+    @Schema(description = "合同结束日期")
+    private String enddate;
+
+    @Schema(description = "所属部门名称", example = "芋艿")
+    private String departmentname;
+
+    @Schema(description = "状态", example = "2")
+    private String status;
+
+    @Schema(description = "工作职务", example = "王五")
+    private String jobtitlename;
+
+    @Schema(description = "部门编码")
+    private String departmentcode;
+
+    @Schema(description = "工号")
+    private String workcode;
+
+    @Schema(description = "性别")
+    private String sex;
+
+    @Schema(description = "部门id", example = "12290")
+    private String departmentid;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "工作地点", example = "22757")
+    private String locationid;
+
+}

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

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.Pms;
 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
+import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.failure.vo.IotFailureReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.IotInspectOrderPageReqVO;
@@ -18,6 +19,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeati
 import cn.iocoder.yudao.module.pms.controller.admin.iotoutbound.vo.IotOutboundPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.YearTotalGas;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.DeviceVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
@@ -408,25 +410,6 @@ public class IotStaticController {
             List<DeviceVO> deviceVOS = new ArrayList<>();
             return CommonResult.success(deviceVOS);
         }
-//        DeviceHistoryParam deviceHistoryParam = new DeviceHistoryParam();
-//        List<IotDeviceDO> iotDeviceDOS = iotDeviceMapper.selectByCodeIn(ImmutableList.of(deviceName));
-//        if (CollUtil.isEmpty(iotDeviceDOS)) {return CommonResult.success(new JSONArray());}
-//        deviceHistoryParam.setDeviceId(iotDeviceDOS.get(0).getYfDeviceId());
-//        deviceHistoryParam.setSerialNumber(deviceName);
-//        List<DeviceHistoryParam.IdentifierVO> list = Lists.newArrayList();
-//        DeviceHistoryParam.IdentifierVO identifierVO = new DeviceHistoryParam.IdentifierVO();
-//        identifierVO.setIdentifier(identifier);
-//        identifierVO.setType(1);
-//        list.add(identifierVO);
-//        deviceHistoryParam.setIdentifierList(list);
-//        deviceHistoryParam.setBeginTime(beginTime);
-//        deviceHistoryParam.setEndTime(endTime);
-//
-//        JSONObject jsonObject = restTemplate.postForObject(yanfanUrl + "/prod-api/data/center/deviceHistory", deviceHistoryParam, JSONObject.class);
-//        JSONArray object = JSON.parseArray(JSON.toJSONString(jsonObject.get("data")));
-
-//        return CommonResult.success(object);
-
     }
 
     private Set<Long> getDeptIds(String dept) {
@@ -446,9 +429,10 @@ public class IotStaticController {
             depts = deptApi.getDeptByName(dto.getName());
         }
         if (CollUtil.isNotEmpty(depts)) {
+            Long deptId = depts.get(0).getId();
             if (Objects.nonNull(depts.get(0).getId())) {
                 ids = deptService.getChildDeptIdListFromCache(depts.get(0).getId());
-                ids.add(depts.get(0).getId());
+                ids.add(deptId);
             }
         }
         return  ids;
@@ -750,10 +734,12 @@ public class IotStaticController {
                                 if (totalObj instanceof Number) {
                                     return ((Number) totalObj).longValue();
                                 } else if (totalObj instanceof String) {
-                                    return Long.parseLong((String) totalObj);
+                                    String value = String.valueOf(totalObj).replace(".00","");
+                                    return Long.parseLong(value);
                                 } else {
-                                    System.err.println("total字段格式错误: " + totalObj);
-                                    return 0L;
+//                                    System.err.println("total字段格式错误: " + totalObj);
+                                    String value = String.valueOf(totalObj).replace(".00","");
+                                    return Long.parseLong(value);
                                 }
                             } catch (Exception e) {
                                 System.err.println("处理total字段出错: " + e.getMessage());
@@ -934,26 +920,26 @@ public class IotStaticController {
             fillData.add(v);
         });
 
-        iotDeviceRunLogPageReqVO.setPointName("当日注水量");
-        List<Map<String, Object>> waters = iotDeviceRunLogMapper.selectListByCreateTimeAndDeptList(iotDeviceRunLogPageReqVO).stream().map(e -> {
-            Map<String, Object> abc = new HashMap<>();
-            abc.put("id", e.getId());
-            abc.put("createTime", e.getCreateTime());
-            abc.put("total", e.getTotalRunTime());
-            abc.put("today", e.getFillContent());
-            return abc;
-        }).collect(Collectors.toList());
-        LinkedHashMap<String, Long> waterMap = sumTotalByDate(waters, 7,"today");
-        LinkedList<Object> waterxAxis = new LinkedList<>();
-        LinkedList<Object> waterData = new LinkedList<>();
-        waterMap.forEach( (k,v)->{
-            waterxAxis.add(k);
-            waterData.add(v);
-        });
+//        iotDeviceRunLogPageReqVO.setPointName("当日注水量");
+//        List<Map<String, Object>> waters = iotDeviceRunLogMapper.selectListByCreateTimeAndDeptList(iotDeviceRunLogPageReqVO).stream().map(e -> {
+//            Map<String, Object> abc = new HashMap<>();
+//            abc.put("id", e.getId());
+//            abc.put("createTime", e.getCreateTime());
+//            abc.put("total", e.getTotalRunTime());
+//            abc.put("today", e.getFillContent());
+//            return abc;
+//        }).collect(Collectors.toList());
+//        LinkedHashMap<String, Long> waterMap = sumTotalByDate(waters, 7,"today");
+//        LinkedList<Object> waterxAxis = new LinkedList<>();
+//        LinkedList<Object> waterData = new LinkedList<>();
+//        waterMap.forEach( (k,v)->{
+//            waterxAxis.add(k);
+//            waterData.add(v);
+//        });
 
         ImmutableMap<String, Serializable> fillResult = ImmutableMap.of("name", "当日注气量~~en**daily gas injection", "data", fillData);
-        ImmutableMap<String, Serializable> waterResult = ImmutableMap.of("name", "当日注水量~~en**daily water injection", "data", waterData);
-        return success(ImmutableMap.of("xAxis", xAxis, "series", ImmutableList.of(fillResult, waterResult)));
+//        ImmutableMap<String, Serializable> waterResult = ImmutableMap.of("name", "当日注水量~~en**daily water injection", "data", waterData);
+        return success(ImmutableMap.of("xAxis", xAxis, "series", ImmutableList.of(fillResult)));
 
     }
 
@@ -1007,5 +993,31 @@ public class IotStaticController {
             return success(formattedResult);
         }
     }
+
+
+    @PermitAll
+    @GetMapping("/year/total/gas/{dept}")
+    public CommonResult<ImmutableMap> getYearTotalGas(@PathVariable("dept") String dept) {
+        Set<Long> ids = getDeptIds(dept);
+        //获取近一年的月份
+        List<String> lastYearMonthRanges = getLastYearMonthRanges().stream().map(MonthRange::getYearMonth).collect(Collectors.toList());
+        IotDeviceRunLogPageReqVO iotDeviceRunLogPageReqVO = new IotDeviceRunLogPageReqVO();
+        iotDeviceRunLogPageReqVO.setDeptIds(new ArrayList<>(ids));
+        iotDeviceRunLogPageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        iotDeviceRunLogPageReqVO.setPointName("当日注气量");
+        List<YearTotalGas> yearTotalGases = iotDeviceRunLogMapper.selectYearTotalGas(iotDeviceRunLogPageReqVO);
+        LinkedList<String> result = new LinkedList<>();
+        lastYearMonthRanges.forEach(lastYearMonthRange -> {
+            YearTotalGas yearTotalGas = yearTotalGases.stream().filter(e -> e.getMonth().equals(lastYearMonthRange)).findAny().orElse(null);
+            if (Objects.isNull(yearTotalGas)) {
+                result.add("0");
+            } else {
+                result.add(NumberUtils.formatNumber(yearTotalGas.getTotalGas()));
+            }
+        });
+        ImmutableMap<String, Serializable> fillResult = ImmutableMap.of("name", "累计注气量~~en**cumulative gas injection", "data", result);
+        return success(ImmutableMap.of("xAxis", lastYearMonthRanges, "series", ImmutableList.of(fillResult)));
+
+    }
 }
 

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

@@ -0,0 +1,9 @@
+package cn.iocoder.yudao.module.pms.controller.admin.stat.vo;
+
+import lombok.Data;
+
+@Data
+public class YearTotalGas {
+    private String month;
+    private String totalGas;
+}

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

@@ -226,4 +226,6 @@ public class IotDeviceRespVO {
     private boolean runningWorkOrder = false;
 
     private String vehicleName;
+    private String assetOwnership;
+    private String useProject;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/excel/DeviceImportExcelVO.java

@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.pms.controller.admin.vo.excel;
+
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 用户 Excel 导入 VO
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
+public class DeviceImportExcelVO {
+
+    @ExcelProperty("资产编号")
+    private String deviceCode;
+
+    @ExcelProperty("资产名称")
+    private String deviceName;
+
+    @ExcelProperty("启用时间")
+    private LocalDateTime enableDate;
+
+    @ExcelProperty("使用项目")
+    private String useProject;
+
+    @ExcelProperty("资产归属")
+    private String assetOwnership;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/convert/iotprojecttasktemplate/IotProjectTaskTemplateConvert.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.pms.convert.iotprojecttasktemplate;
+
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttasktemplate.vo.IotProjectTaskTemplateRespVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttasktemplate.IotProjectTaskTemplateDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface IotProjectTaskTemplateConvert {
+
+    IotProjectTaskTemplateConvert INSTANCE = Mappers.getMapper(IotProjectTaskTemplateConvert.class);
+
+    default List<IotProjectTaskTemplateRespVO> convertList(List<IotProjectTaskTemplateDO> list, Map<Long, DeptDO> deptMap) {
+        return CollectionUtils.convertList(list, de -> convert(de, deptMap.get(de.getDeptId())));
+    }
+
+    default IotProjectTaskTemplateRespVO convert(IotProjectTaskTemplateDO user, DeptDO dept) {
+        IotProjectTaskTemplateRespVO userVO = BeanUtils.toBean(user, IotProjectTaskTemplateRespVO.class);
+        if (dept != null) {
+            userVO.setDeptName(dept.getName());
+        }
+        return userVO;
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/convert/iotrhdailyreport/IotRhDailyReportConvert.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.pms.convert.iotrhdailyreport;
+
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttasktemplate.vo.IotProjectTaskTemplateRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportRespVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttasktemplate.IotProjectTaskTemplateDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotrhdailyreport.IotRhDailyReportDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface IotRhDailyReportConvert {
+
+    IotRhDailyReportConvert INSTANCE = Mappers.getMapper(IotRhDailyReportConvert.class);
+
+    default List<IotRhDailyReportRespVO> convertList(List<IotRhDailyReportDO> list, Map<Long, DeptDO> deptMap) {
+        return CollectionUtils.convertList(list, de -> convert(de, deptMap.get(de.getDeptId())));
+    }
+
+    default IotRhDailyReportRespVO convert(IotRhDailyReportDO user, DeptDO dept) {
+        IotRhDailyReportRespVO userVO = BeanUtils.toBean(user, IotRhDailyReportRespVO.class);
+        if (dept != null) {
+            userVO.setDeptName(dept.getName());
+        }
+        return userVO;
+    }
+
+}

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

@@ -168,4 +168,6 @@ public class IotDeviceDO extends BaseDO {
     private String brandName;
 
     private String vehicleName;
+    private String assetOwnership;
+    private String useProject;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/failure/IotFailureReportDO.java

@@ -108,4 +108,6 @@ public class IotFailureReportDO extends BaseDO {
     private String type;
 
     private String deviceCode;
+    /**审批人id*/
+    private String approvalId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotdailyreportattrs/IotDailyReportAttrsDO.java

@@ -0,0 +1,110 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotdailyreportattrs;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 日报扩展模板属性 DO
+ *
+ * @author 超级管理员
+ */
+@TableName(value = "rq_iot_daily_report_attrs", autoResultMap = true)
+@KeySequence("rq_iot_daily_report_attrs_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotDailyReportAttrsDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 日报扩展模板id
+     */
+    private Long templateId;
+    /**
+     * 公司id
+     */
+    private Long deptId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 项目类别(钻井 修井 注氮 酸化压裂 ...)
+     */
+    private String projectClassification;
+    /**
+     * 井型
+     */
+    private String wellType;
+    /**
+     * 井别
+     */
+    private String wellCategory;
+    /**
+     * 施工工艺
+     */
+    private String technique;
+    /**
+     * 属性名称
+     */
+    private String name;
+    /**
+     * 属性标识符
+     */
+    private String identifier;
+    /**
+     * 数据类型(double text textarea date dropdown)
+     */
+    private String dataType;
+    /**
+     * 是否必填(0非必填 1必填)
+     */
+    private Integer required;
+    /**
+     * 单位(MPa)
+     */
+    private String unit;
+    /**
+     * 访问模式(r读  w写)
+     */
+    private String accessMode;
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+    /**
+     * 最大值
+     */
+    private String maxValue;
+    /**
+     * 最小值
+     */
+    private String minValue;
+    /**
+     * 不同专业公司的扩展属性
+     */
+    private String extProperty;
+    /**
+     * 排序值
+     */
+    private Integer sort;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotdailyreporttemplate/IotDailyReportTemplateDO.java

@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotdailyreporttemplate;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 生产日报属性模板 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_iot_daily_report_template")
+@KeySequence("rq_iot_daily_report_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotDailyReportTemplateDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 公司id
+     */
+    private Long deptId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 项目类别(钻井 修井 注氮 酸化压裂...)
+     */
+    private String projectClassification;
+    /**
+     * 井型
+     */
+    private String wellType;
+    /**
+     * 井别
+     */
+    private String wellCategory;
+    /**
+     * 施工工艺
+     */
+    private String technique;
+    /**
+     * 模板名称
+     */
+    private String name;
+    /**
+     * 模板标识符
+     */
+    private String identifier;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotopeationfill/IotOpeationFillOrderDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojectdailyreport/IotProjectDailyReportDO.java

@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotprojectdailyreport;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 项目日报 DO
+ *
+ * @author 超级管理员
+ */
+@TableName(value = "rq_iot_project_daily_report", autoResultMap = true)
+@KeySequence("rq_iot_project_daily_report_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotProjectDailyReportDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 施工队伍id
+     */
+    private Long deptId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 任务id
+     */
+    private Long taskId;
+    /**
+     * 项目类别(钻井 修井 注氮 酸化压裂... )
+     */
+    private String projectClassification;
+    /**
+     * 施工开始日期
+     */
+    private LocalDateTime constructionStartDate;
+    /**
+     * 施工结束日期
+     */
+    private LocalDateTime constructionEndDate;
+    /**
+     * 下步工作计划
+     */
+    private String nextPlan;
+    /**
+     * 当日生产情况生产动态
+     */
+    private String productionStatus;
+    /**
+     * 施工状态(数据字典)
+     */
+    private Integer constructionStatus;
+    /**
+     * 人员情况
+     */
+    private String personnel;
+    /**
+     * 不同专业公司的扩展属性值
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<IotTaskAttrModelProperty> extProperty;
+    /**
+     * 排序值
+     */
+    private Integer sort;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+    /**
+     * 流程实例id
+     */
+    private String processInstanceId;
+    /**
+     * 审批状态 未提交、审批中、审批通过、审批不通过、已取消
+     */
+    private Integer auditStatus;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojectinfo/IotProjectInfoDO.java

@@ -81,6 +81,10 @@ public class IotProjectInfoDO extends BaseDO {
      * 工作量已完成
      */
     private String workloadFinish;
+    /**
+     * 工作量单位(段/层/方/井深/进尺)
+     */
+    private String workloadUnit;
     /**
      * 开始时间
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttask/IotProjectTaskDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -39,9 +41,13 @@ public class IotProjectTaskDO extends BaseDO {
      */
     private String wellName;
     /**
-     * 井型/井别
+     * 井型
      */
     private String wellType;
+    /**
+     * 井别
+     */
+    private String wellCategory;
     /**
      * 施工地点
      */
@@ -90,6 +96,9 @@ public class IotProjectTaskDO extends BaseDO {
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Set<Long> deptIds;
 
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<IotTaskAttrModelProperty> extProperty;
+
     /**
      * 该任务所属部门id
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttaskattrs/IotDailyReportEnumDataSpecs.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 日报模板属性 数据类型为下拉列表的 DataSpec 定义
+ *
+ * 数据类型 下拉列表。
+ *
+ * @author ruiqi
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class IotDailyReportEnumDataSpecs {
+
+    /**
+     * 枚举项的名称。
+     * 可包含中文、大小写英文字母、数字、下划线（_）和短划线（-）
+     * 必须以中文、英文字母或数字开头，长度不超过 20 个字符
+     */
+    private String name;
+    /**
+     * 枚举值。
+     */
+    private String value;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttaskattrs/IotProjectTaskAttrsDO.java

@@ -0,0 +1,113 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.*;
+
+/**
+ * 项目任务扩展属性 DO
+ *
+ * @author 超级管理员
+ */
+@TableName(value = "rq_iot_project_task_attrs", autoResultMap = true)
+@KeySequence("rq_iot_project_task_attrs_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotProjectTaskAttrsDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 任务扩展模板id
+     */
+    private Long templateId;
+    /**
+     * 公司id
+     */
+    private Long deptId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 项目类别(钻井 修井 注氮 酸化压裂 )
+     */
+    private String projectClassification;
+    /**
+     * 井型
+     */
+    private String wellType;
+    /**
+     * 井别
+     */
+    private String wellCategory;
+    /**
+     * 施工工艺
+     */
+    private String technique;
+    /**
+     * 属性名称
+     */
+    private String name;
+    /**
+     * 属性标识符
+     */
+    private String identifier;
+    /**
+     * 数据类型(double text textarea date)
+     */
+    private String dataType;
+    /**
+     * 是否必填(0非必填 1必填)
+     */
+    private Integer required;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 访问模式(r读  w写)
+     */
+    private String accessMode;
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+    /**
+     * 最大值
+     */
+    private String maxValue;
+    /**
+     * 最小值
+     */
+    private String minValue;
+    /**
+     * 排序值
+     */
+    private Integer sort;
+    /**
+     * 不同专业公司的扩展属性
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private IotTaskAttrModelProperty extProperty;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttaskattrs/IotTaskAttrModelProperty.java

@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs;
+
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.pms.enums.devicetemplate.DeviceTemplateAttrAccessModeEnum;
+import cn.iocoder.yudao.module.pms.enums.devicetemplate.IotDataSpecsDataTypeEnum;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+import java.util.List;
+
+/**
+ * pms 任务扩展属性
+ *
+ * @author ruiqi
+ */
+@Data
+public class IotTaskAttrModelProperty {
+
+    /**
+     * 属性名称
+     */
+    @NotEmpty(message = "属性名称不能为空")
+    private String name;
+
+    /**
+     * 属性标识符
+     */
+    @NotEmpty(message = "属性标识符不能为空")
+    @Pattern(regexp = "^[a-zA-Z][a-zA-Z0-9_]{0,31}$", message = "属性标识符只能由字母、数字和下划线组成，必须以字母开头，长度不超过 32 个字符")
+    private String identifier;
+
+    /**
+     * 参数值的数据类型 (double text textarea date)
+     *
+     * 枚举 {@link IotDataSpecsDataTypeEnum}
+     */
+    @NotEmpty(message = "数据类型不能为空")
+    @InEnum(IotDataSpecsDataTypeEnum.class)
+    private String dataType;
+
+    /**
+     * 是否必填(0非必填 1必填)
+     */
+    private Integer required;
+
+    /**
+     * 单位 MPa m
+     */
+    private String unit;
+
+    /**
+     * 可以对该属性进行的操作类型
+     *
+     * 枚举 {@link DeviceTemplateAttrAccessModeEnum}
+     */
+    @InEnum(DeviceTemplateAttrAccessModeEnum.class)
+    private String accessMode;
+
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+
+    /**
+     * 最大值
+     */
+    private String maxValue;
+
+    /**
+     * 最小值
+     */
+    private String minValue;
+
+    /**
+     * 排序值
+     */
+    private Integer sort;
+
+    /**
+     * 字段值
+     */
+    private String actualValue;
+
+    /**
+     * 数据类型 为下拉列表型的数据规范
+     */
+    private List<IotDailyReportEnumDataSpecs> dropdownList;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttaskschedule/IotProjectTaskScheduleDO.java

@@ -45,13 +45,21 @@ public class IotProjectTaskScheduleDO extends BaseDO {
      */
     private String description;
     /**
-     * 状态起始时间
+     * 状态起始时间 计划
      */
     private LocalDateTime startTime;
     /**
-     * 状态结束时间
+     * 状态结束时间 计划
      */
     private LocalDateTime endTime;
+    /**
+     * 状态起始时间 实际
+     */
+    private LocalDateTime actualStartTime;
+    /**
+     * 状态结束时间 实际
+     */
+    private LocalDateTime actualEndTime;
     /**
      * 备注
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttasktemplate/IotProjectTaskTemplateDO.java

@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttasktemplate;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 项目任务属性模板 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_iot_project_task_template")
+@KeySequence("rq_iot_project_task_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotProjectTaskTemplateDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 公司id
+     */
+    private Long deptId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 项目类别(钻井 修井 注氮 酸化压裂 )
+     */
+    private String projectClassification;
+    /**
+     * 井型
+     */
+    private String wellType;
+    /**
+     * 井别
+     */
+    private String wellCategory;
+    /**
+     * 施工工艺
+     */
+    private String technique;
+    /**
+     * 模板名称
+     */
+    private String name;
+    /**
+     * 模板标识符
+     */
+    private String identifier;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrhdailyreport/IotRhDailyReportDO.java

@@ -0,0 +1,145 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotrhdailyreport;
+
+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_rh_daily_report")
+@KeySequence("rq_iot_rh_daily_report_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotRhDailyReportDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 施工队伍id
+     */
+    private Long deptId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 任务id
+     */
+    private Long taskId;
+    /**
+     * 项目类别(钻井 修井 注氮 酸化压裂... )
+     */
+    private String projectClassification;
+    /**
+     * 搬迁安装天数
+     */
+    private BigDecimal relocationDays;
+    /**
+     * 运行时效
+     */
+    private BigDecimal transitTime;
+    /**
+     * 当日注气量(万方)
+     */
+    private BigDecimal dailyGasInjection;
+    /**
+     * 当日注水量(方)
+     */
+    private BigDecimal dailyWaterInjection;
+    /**
+     * 当日注气时间(H)
+     */
+    private BigDecimal dailyInjectGasTime;
+    /**
+     * 当日注水时间(H)
+     */
+    private BigDecimal dailyInjectWaterTime;
+    /**
+     * 当日用电量(kWh)
+     */
+    private BigDecimal dailyPowerUsage;
+    /**
+     * 非生产时间(H)
+     */
+    private BigDecimal nonProductionTime;
+    /**
+     * 非生产时间原因
+     */
+    private String nptReason;
+    /**
+     * 施工开始日期
+     */
+    private LocalDateTime constructionStartDate;
+    /**
+     * 施工结束日期
+     */
+    private LocalDateTime constructionEndDate;
+    /**
+     * 当日生产情况生产动态
+     */
+    private String productionStatus;
+    /**
+     * 下步工作计划
+     */
+    private String nextPlan;
+    /**
+     * 施工状态(动迁 准备 施工 完工)
+     */
+    private Integer constructionStatus;
+    /**
+     * 人员情况
+     */
+    private String personnel;
+    /**
+     * 累计注气量(万方)
+     */
+    private BigDecimal totalGasInjection;
+    /**
+     * 累计注水量(方)
+     */
+    private BigDecimal totalWaterInjection;
+    /**
+     * 累计完工井次
+     */
+    private BigDecimal cumulativeCompletion;
+    /**
+     * 不同专业公司的扩展属性值
+     */
+    private String extProperty;
+    /**
+     * 排序值
+     */
+    private Integer sort;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+    /**
+     * 流程实例id
+     */
+    private String processInstanceId;
+    /**
+     * 审批状态 未提交、审批中、审批通过、审批不通过、已取消
+     */
+    private Integer auditStatus;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/maintain/IotMaintainDO.java

@@ -1,16 +1,13 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.maintain;
 
+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.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 维修工单 DO
@@ -128,7 +125,7 @@ public class IotMaintainDO extends BaseDO {
     /**
      * 供应商
      */
-    private Long supplier;
+    private String supplier;
     /**
      * 委外附件
      */
@@ -144,4 +141,29 @@ public class IotMaintainDO extends BaseDO {
     private String maintainPersonName;
 
     private LocalDateTime executeDate;
+    /**申请人id*/
+    private String applyPersonId;
+    /**申请部门id*/
+    private String applyDeptId;
+    /**规格型号*/
+    private String model;
+    /**启用日期*/
+    private String enableDate;
+    /**维修类别*/
+    private String maintainClassify;
+
+    /**运转公里/小时*/
+    private String kmHour;
+    /**维修地点*/
+    private String address;
+    /**项目经理*/
+    private String projectManager;
+    /**oa流程单号*/
+    private String oaFlowNo;
+    /**维修项目*/
+    private String maintainItem;
+    /**oa返回的请求id*/
+    private String requestId;
+    /**请求意见*/
+    private String suggestionJson;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/oa/IotOaCompanyDO.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.oa;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * oa公司 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_iot_oa_company")
+@KeySequence("rq_iot_oa_company_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotOaCompanyDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 公司描述
+     */
+    private String subcompanydesc;
+    /**
+     * 公司代码
+     */
+    private String subcompanycode;
+    /**
+     * 无
+     */
+    private String supsubcomid;
+    /**
+     * oaId
+     */
+    private String oaId;
+    /**
+     * 公司名称
+     */
+    private String subcompanyname;
+    /**
+     * 排序
+     */
+    private String showorder;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/oa/IotOaDepartDO.java

@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.oa;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * oa部门 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_iot_oa_depart")
+@KeySequence("rq_iot_oa_depart_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotOaDepartDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 无
+     */
+    private String supdepid;
+    /**
+     * 部门描述
+     */
+    private String departmentmark;
+    /**
+     * 部门名称
+     */
+    private String departmentname;
+    /**
+     * 部门编码
+     */
+    private String departmentcode;
+    /**
+     * oaid
+     */
+    private String oaId;
+    /**
+     * 无
+     */
+    private String subcompanyid1;
+    /**
+     * 排序
+     */
+    private String showorder;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/oa/IotOaPersonDO.java

@@ -0,0 +1,103 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.oa;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * oa人员 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_iot_oa_person")
+@KeySequence("rq_iot_oa_person_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotOaPersonDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 公司开始日期
+     */
+    private String companystartdate;
+    /**
+     * 所属分部1
+     */
+    private String subcompanyid1;
+    /**
+     * 所属分部名称
+     */
+    private String subcompanyname;
+    /**
+     * 工作序列
+     */
+    private String jobgroupname;
+    /**
+     * 无
+     */
+    private String belongtoid;
+    /**
+     * 所属集团编码
+     */
+    private String subcompanycode;
+    /**
+     * oaid
+     */
+    private String oaId;
+    /**
+     * 姓名
+     */
+    private String lastname;
+    /**
+     * 合同结束日期
+     */
+    private String enddate;
+    /**
+     * 所属部门名称
+     */
+    private String departmentname;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 工作职务
+     */
+    private String jobtitlename;
+    /**
+     * 部门编码
+     */
+    private String departmentcode;
+    /**
+     * 工号
+     */
+    private String workcode;
+    /**
+     * 性别
+     */
+    private String sex;
+    /**
+     * 部门id
+     */
+    private String departmentid;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 工作地点
+     */
+    private String locationid;
+
+}

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

@@ -77,7 +77,7 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
 
     default List<IotDeviceDO> selectList(IotDevicePageReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IotDeviceDO>()
-                .inIfPresent(IotDeviceDO::getDeptId, reqVO.getDeviceIds())
+                .inIfPresent(IotDeviceDO::getId, reqVO.getDeviceIds())
                 .likeIfPresent(IotDeviceDO::getDeviceCode, reqVO.getDeviceCode())
                 .likeIfPresent(IotDeviceDO::getDeviceName, reqVO.getDeviceName())
                 .eqIfPresent(IotDeviceDO::getBrand, reqVO.getBrand())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotdailyreportattrs/IotDailyReportAttrsMapper.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotdailyreportattrs;
+
+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.iotdailyreportattrs.vo.IotDailyReportAttrsPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdailyreportattrs.IotDailyReportAttrsDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 日报扩展模板属性 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotDailyReportAttrsMapper extends BaseMapperX<IotDailyReportAttrsDO> {
+
+    default PageResult<IotDailyReportAttrsDO> selectPage(IotDailyReportAttrsPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotDailyReportAttrsDO>()
+                .eqIfPresent(IotDailyReportAttrsDO::getTemplateId, reqVO.getTemplateId())
+                .eqIfPresent(IotDailyReportAttrsDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotDailyReportAttrsDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(IotDailyReportAttrsDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotDailyReportAttrsDO::getWellType, reqVO.getWellType())
+                .eqIfPresent(IotDailyReportAttrsDO::getWellCategory, reqVO.getWellCategory())
+                .eqIfPresent(IotDailyReportAttrsDO::getTechnique, reqVO.getTechnique())
+                .likeIfPresent(IotDailyReportAttrsDO::getName, reqVO.getName())
+                .eqIfPresent(IotDailyReportAttrsDO::getIdentifier, reqVO.getIdentifier())
+                .eqIfPresent(IotDailyReportAttrsDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(IotDailyReportAttrsDO::getRequired, reqVO.getRequired())
+                .eqIfPresent(IotDailyReportAttrsDO::getUnit, reqVO.getUnit())
+                .eqIfPresent(IotDailyReportAttrsDO::getAccessMode, reqVO.getAccessMode())
+                .eqIfPresent(IotDailyReportAttrsDO::getDefaultValue, reqVO.getDefaultValue())
+                .eqIfPresent(IotDailyReportAttrsDO::getMaxValue, reqVO.getMaxValue())
+                .eqIfPresent(IotDailyReportAttrsDO::getMinValue, reqVO.getMinValue())
+                .eqIfPresent(IotDailyReportAttrsDO::getExtProperty, reqVO.getExtProperty())
+                .eqIfPresent(IotDailyReportAttrsDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotDailyReportAttrsDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotDailyReportAttrsDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(IotDailyReportAttrsDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotDailyReportAttrsDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotdailyreporttemplate/IotDailyReportTemplateMapper.java

@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotdailyreporttemplate;
+
+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.iotdailyreporttemplate.vo.IotDailyReportTemplatePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdailyreporttemplate.IotDailyReportTemplateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 生产日报属性模板 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotDailyReportTemplateMapper extends BaseMapperX<IotDailyReportTemplateDO> {
+
+    default PageResult<IotDailyReportTemplateDO> selectPage(IotDailyReportTemplatePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotDailyReportTemplateDO>()
+                .eqIfPresent(IotDailyReportTemplateDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotDailyReportTemplateDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(IotDailyReportTemplateDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotDailyReportTemplateDO::getWellType, reqVO.getWellType())
+                .eqIfPresent(IotDailyReportTemplateDO::getWellCategory, reqVO.getWellCategory())
+                .eqIfPresent(IotDailyReportTemplateDO::getTechnique, reqVO.getTechnique())
+                .likeIfPresent(IotDailyReportTemplateDO::getName, reqVO.getName())
+                .eqIfPresent(IotDailyReportTemplateDO::getIdentifier, reqVO.getIdentifier())
+                .eqIfPresent(IotDailyReportTemplateDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotDailyReportTemplateDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(IotDailyReportTemplateDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotDailyReportTemplateDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotdevicerunlog/IotDeviceRunLogMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicerunlog.vo.IotDeviceRunLogPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicerunlog.vo.IotDeviceRunLogRespVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.IotStaticController;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.YearTotalGas;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -68,4 +70,6 @@ public interface IotDeviceRunLogMapper extends BaseMapperX<IotDeviceRunLogDO> {
 
     @TenantIgnore
     List<IotDeviceRunLogRespVO> selectListByCreateTimeAndDeptList(IotDeviceRunLogPageReqVO reqVO);
+    @TenantIgnore
+    List<YearTotalGas> selectYearTotalGas(IotDeviceRunLogPageReqVO reqVO);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotopeationfill/IotOpeationFillMapper.java

@@ -62,9 +62,12 @@ public interface IotOpeationFillMapper extends BaseMapperX<IotOpeationFillDO> {
     List<IotOpeationFillDO> getFillDevices(@Param("deviceIds")List<Long> deviceIds);
 
     List<IotModelTemplateAttrsDO> getAttrsById(IotModelTemplateAttrsRespVO vo);
+
     @TenantIgnore
     int insertFill(List<IotOpeationFillDO> vo);
-    int insertFillOrder(List<IotOpeationFillDO> vo);
+
+    /*int insertFillOrder(List<IotOpeationFillDO> vo);*/
+
     @TenantIgnore
     List<IotOpeationFillDO> fillList(IotOpeationFillPageReqVO vo);
     @TenantIgnore

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotprojectdailyreport/IotProjectDailyReportMapper.java

@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotprojectdailyreport;
+
+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.iotprojectdailyreport.vo.IotProjectDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojectdailyreport.IotProjectDailyReportDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目日报 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotProjectDailyReportMapper extends BaseMapperX<IotProjectDailyReportDO> {
+
+    default PageResult<IotProjectDailyReportDO> selectPage(IotProjectDailyReportPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotProjectDailyReportDO>()
+                .eqIfPresent(IotProjectDailyReportDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotProjectDailyReportDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(IotProjectDailyReportDO::getTaskId, reqVO.getTaskId())
+                .eqIfPresent(IotProjectDailyReportDO::getProjectClassification, reqVO.getProjectClassification())
+                .betweenIfPresent(IotProjectDailyReportDO::getConstructionStartDate, reqVO.getConstructionStartDate())
+                .betweenIfPresent(IotProjectDailyReportDO::getConstructionEndDate, reqVO.getConstructionEndDate())
+                .eqIfPresent(IotProjectDailyReportDO::getNextPlan, reqVO.getNextPlan())
+                .eqIfPresent(IotProjectDailyReportDO::getProductionStatus, reqVO.getProductionStatus())
+                .eqIfPresent(IotProjectDailyReportDO::getConstructionStatus, reqVO.getConstructionStatus())
+                .eqIfPresent(IotProjectDailyReportDO::getPersonnel, reqVO.getPersonnel())
+                .eqIfPresent(IotProjectDailyReportDO::getExtProperty, reqVO.getExtProperty())
+                .eqIfPresent(IotProjectDailyReportDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotProjectDailyReportDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotProjectDailyReportDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotProjectDailyReportDO::getProcessInstanceId, reqVO.getProcessInstanceId())
+                .eqIfPresent(IotProjectDailyReportDO::getAuditStatus, reqVO.getAuditStatus())
+                .betweenIfPresent(IotProjectDailyReportDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotProjectDailyReportDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotprojecttask/IotProjectTaskMapper.java

@@ -1,17 +1,19 @@
 package cn.iocoder.yudao.module.pms.dal.mysql.iotprojecttask;
 
-import java.time.LocalDateTime;
-import java.util.*;
-
+import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 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.iotprojecttask.vo.IotProjectTaskPageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask.IotProjectTaskDO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
 
 /**
  * 项目信息任务拆分 Mapper
@@ -53,6 +55,24 @@ public interface IotProjectTaskMapper extends BaseMapperX<IotProjectTaskDO> {
                 .orderByDesc(IotProjectTaskDO::getId));
     }
 
+    default List<IotProjectTaskDO> selectList(IotProjectTaskPageReqVO reqVO) {
+        LambdaQueryWrapperX<IotProjectTaskDO> wrapper = new LambdaQueryWrapperX<IotProjectTaskDO>()
+                .inIfPresent(IotProjectTaskDO::getId,  reqVO.getTaskIds())
+                .eqIfPresent(IotProjectTaskDO::getProjectId, reqVO.getProjectId())
+                .likeIfPresent(IotProjectTaskDO::getWellName, reqVO.getWellName())
+                .eqIfPresent(IotProjectTaskDO::getWellType, reqVO.getWellType())
+                .eqIfPresent(IotProjectTaskDO::getLocation, reqVO.getLocation())
+                .eqIfPresent(IotProjectTaskDO::getTechnique, reqVO.getTechnique())
+                .eqIfPresent(IotProjectTaskDO::getWorkloadDesign, reqVO.getWorkloadDesign())
+                .betweenIfPresent(IotProjectTaskDO::getCreateTime, reqVO.getCreateTime())
+                .likeIfPresent(IotProjectTaskDO::getUserName, reqVO.getUserName())
+                .eqIfPresent(IotProjectTaskDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(IotProjectTaskDO::getRemark, reqVO.getRemark());
+        if (ObjUtil.isNotEmpty(reqVO.getDeptId())) {
+            wrapper.apply("FIND_IN_SET({0}, REPLACE(REPLACE(dept_ids,'[',''),']',''))", reqVO.getDeptId());
+        }
+        return selectList(wrapper);
+    }
 
     IPage<IotProjectTaskDO> taskList(IPage<IotProjectTaskPageReqVO> page,
                                      @Param("manufactureName") String manufactureName,

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotprojecttaskattrs/IotProjectTaskAttrsMapper.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotprojecttaskattrs;
+
+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.iotprojecttaskattrs.vo.IotProjectTaskAttrsPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotProjectTaskAttrsDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 项目任务扩展属性 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotProjectTaskAttrsMapper extends BaseMapperX<IotProjectTaskAttrsDO> {
+
+    default PageResult<IotProjectTaskAttrsDO> selectPage(IotProjectTaskAttrsPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotProjectTaskAttrsDO>()
+                .eqIfPresent(IotProjectTaskAttrsDO::getTemplateId, reqVO.getTemplateId())
+                .eqIfPresent(IotProjectTaskAttrsDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotProjectTaskAttrsDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(IotProjectTaskAttrsDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotProjectTaskAttrsDO::getWellType, reqVO.getWellType())
+                .eqIfPresent(IotProjectTaskAttrsDO::getWellCategory, reqVO.getWellCategory())
+                .eqIfPresent(IotProjectTaskAttrsDO::getTechnique, reqVO.getTechnique())
+                .likeIfPresent(IotProjectTaskAttrsDO::getName, reqVO.getName())
+                .eqIfPresent(IotProjectTaskAttrsDO::getIdentifier, reqVO.getIdentifier())
+                .eqIfPresent(IotProjectTaskAttrsDO::getExtProperty, reqVO.getExtProperty())
+                .eqIfPresent(IotProjectTaskAttrsDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotProjectTaskAttrsDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(IotProjectTaskAttrsDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotProjectTaskAttrsDO::getId));
+    }
+
+    default List<IotProjectTaskAttrsDO> selectList(IotProjectTaskAttrsPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotProjectTaskAttrsDO>()
+                .eqIfPresent(IotProjectTaskAttrsDO::getTemplateId, reqVO.getTemplateId())
+                .eqIfPresent(IotProjectTaskAttrsDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotProjectTaskAttrsDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(IotProjectTaskAttrsDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotProjectTaskAttrsDO::getWellType, reqVO.getWellType())
+                .eqIfPresent(IotProjectTaskAttrsDO::getWellCategory, reqVO.getWellCategory())
+                .eqIfPresent(IotProjectTaskAttrsDO::getTechnique, reqVO.getTechnique())
+                .likeIfPresent(IotProjectTaskAttrsDO::getName, reqVO.getName())
+                .eqIfPresent(IotProjectTaskAttrsDO::getIdentifier, reqVO.getIdentifier())
+                .eqIfPresent(IotProjectTaskAttrsDO::getExtProperty, reqVO.getExtProperty())
+                .eqIfPresent(IotProjectTaskAttrsDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotProjectTaskAttrsDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(IotProjectTaskAttrsDO::getCreateTime, reqVO.getCreateTime())
+                .orderByAsc(IotProjectTaskAttrsDO::getSort));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotprojecttaskschedule/IotProjectTaskScheduleMapper.java

@@ -40,7 +40,7 @@ public interface IotProjectTaskScheduleMapper extends BaseMapperX<IotProjectTask
                 .betweenIfPresent(IotProjectTaskScheduleDO::getEndTime, reqVO.getEndTime())
                 .eqIfPresent(IotProjectTaskScheduleDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotProjectTaskScheduleDO::getCreateTime, reqVO.getCreateTime())
-                .orderByAsc(IotProjectTaskScheduleDO::getStatus));
+                .orderByAsc(IotProjectTaskScheduleDO::getStartTime, IotProjectTaskScheduleDO::getStatus));
     }
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotprojecttasktemplate/IotProjectTaskTemplateMapper.java

@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotprojecttasktemplate;
+
+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.iotprojecttasktemplate.vo.IotProjectTaskTemplatePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttasktemplate.IotProjectTaskTemplateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目任务属性模板 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotProjectTaskTemplateMapper extends BaseMapperX<IotProjectTaskTemplateDO> {
+
+    default PageResult<IotProjectTaskTemplateDO> selectPage(IotProjectTaskTemplatePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotProjectTaskTemplateDO>()
+                .eqIfPresent(IotProjectTaskTemplateDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotProjectTaskTemplateDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(IotProjectTaskTemplateDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotProjectTaskTemplateDO::getWellType, reqVO.getWellType())
+                .eqIfPresent(IotProjectTaskTemplateDO::getWellCategory, reqVO.getWellCategory())
+                .eqIfPresent(IotProjectTaskTemplateDO::getTechnique, reqVO.getTechnique())
+                .likeIfPresent(IotProjectTaskTemplateDO::getName, reqVO.getName())
+                .eqIfPresent(IotProjectTaskTemplateDO::getIdentifier, reqVO.getIdentifier())
+                .eqIfPresent(IotProjectTaskTemplateDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotProjectTaskTemplateDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(IotProjectTaskTemplateDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotProjectTaskTemplateDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotrhdailyreport/IotRhDailyReportMapper.java

@@ -0,0 +1,108 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotrhdailyreport;
+
+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.iotrhdailyreport.vo.IotRhDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotrhdailyreport.IotRhDailyReportDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ * 瑞恒日报 Mapper
+ *
+ * @author ruiqi
+ */
+@Mapper
+public interface IotRhDailyReportMapper extends BaseMapperX<IotRhDailyReportDO> {
+
+    default PageResult<IotRhDailyReportDO> selectPage(IotRhDailyReportPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotRhDailyReportDO>()
+                .eqIfPresent(IotRhDailyReportDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotRhDailyReportDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(IotRhDailyReportDO::getTaskId, reqVO.getTaskId())
+                .eqIfPresent(IotRhDailyReportDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotRhDailyReportDO::getRelocationDays, reqVO.getRelocationDays())
+                .betweenIfPresent(IotRhDailyReportDO::getTransitTime, reqVO.getTransitTime())
+                .eqIfPresent(IotRhDailyReportDO::getDailyGasInjection, reqVO.getDailyGasInjection())
+                .eqIfPresent(IotRhDailyReportDO::getDailyWaterInjection, reqVO.getDailyWaterInjection())
+                .betweenIfPresent(IotRhDailyReportDO::getDailyInjectGasTime, reqVO.getDailyInjectGasTime())
+                .betweenIfPresent(IotRhDailyReportDO::getDailyInjectWaterTime, reqVO.getDailyInjectWaterTime())
+                .betweenIfPresent(IotRhDailyReportDO::getNonProductionTime, reqVO.getNonProductionTime())
+                .eqIfPresent(IotRhDailyReportDO::getNptReason, reqVO.getNptReason())
+                .betweenIfPresent(IotRhDailyReportDO::getConstructionStartDate, reqVO.getConstructionStartDate())
+                .betweenIfPresent(IotRhDailyReportDO::getConstructionEndDate, reqVO.getConstructionEndDate())
+                .eqIfPresent(IotRhDailyReportDO::getProductionStatus, reqVO.getProductionStatus())
+                .eqIfPresent(IotRhDailyReportDO::getNextPlan, reqVO.getNextPlan())
+                .eqIfPresent(IotRhDailyReportDO::getConstructionStatus, reqVO.getConstructionStatus())
+                .eqIfPresent(IotRhDailyReportDO::getPersonnel, reqVO.getPersonnel())
+                .eqIfPresent(IotRhDailyReportDO::getTotalGasInjection, reqVO.getTotalGasInjection())
+                .eqIfPresent(IotRhDailyReportDO::getTotalWaterInjection, reqVO.getTotalWaterInjection())
+                .eqIfPresent(IotRhDailyReportDO::getCumulativeCompletion, reqVO.getCumulativeCompletion())
+                .eqIfPresent(IotRhDailyReportDO::getExtProperty, reqVO.getExtProperty())
+                .eqIfPresent(IotRhDailyReportDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotRhDailyReportDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotRhDailyReportDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotRhDailyReportDO::getProcessInstanceId, reqVO.getProcessInstanceId())
+                .eqIfPresent(IotRhDailyReportDO::getAuditStatus, reqVO.getAuditStatus())
+                .betweenIfPresent(IotRhDailyReportDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotRhDailyReportDO::getId));
+    }
+
+    /* default List<IotRhDailyReportDO> selectList(IotRhDailyReportPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotRhDailyReportDO>()
+                .eqIfPresent(IotRhDailyReportDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotRhDailyReportDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(IotRhDailyReportDO::getTaskId, reqVO.getTaskId())
+                .eqIfPresent(IotRhDailyReportDO::getProjectClassification, reqVO.getProjectClassification())
+                .eqIfPresent(IotRhDailyReportDO::getRelocationDays, reqVO.getRelocationDays())
+                .betweenIfPresent(IotRhDailyReportDO::getTransitTime, reqVO.getTransitTime())
+                .eqIfPresent(IotRhDailyReportDO::getDailyGasInjection, reqVO.getDailyGasInjection())
+                .eqIfPresent(IotRhDailyReportDO::getDailyWaterInjection, reqVO.getDailyWaterInjection())
+                .betweenIfPresent(IotRhDailyReportDO::getDailyInjectGasTime, reqVO.getDailyInjectGasTime())
+                .betweenIfPresent(IotRhDailyReportDO::getDailyInjectWaterTime, reqVO.getDailyInjectWaterTime())
+                .betweenIfPresent(IotRhDailyReportDO::getNonProductionTime, reqVO.getNonProductionTime())
+                .eqIfPresent(IotRhDailyReportDO::getNptReason, reqVO.getNptReason())
+                .betweenIfPresent(IotRhDailyReportDO::getConstructionStartDate, reqVO.getConstructionStartDate())
+                .betweenIfPresent(IotRhDailyReportDO::getConstructionEndDate, reqVO.getConstructionEndDate())
+                .eqIfPresent(IotRhDailyReportDO::getProductionStatus, reqVO.getProductionStatus())
+                .eqIfPresent(IotRhDailyReportDO::getNextPlan, reqVO.getNextPlan())
+                .eqIfPresent(IotRhDailyReportDO::getConstructionStatus, reqVO.getConstructionStatus())
+                .eqIfPresent(IotRhDailyReportDO::getPersonnel, reqVO.getPersonnel())
+                .eqIfPresent(IotRhDailyReportDO::getTotalGasInjection, reqVO.getTotalGasInjection())
+                .eqIfPresent(IotRhDailyReportDO::getTotalWaterInjection, reqVO.getTotalWaterInjection())
+                .eqIfPresent(IotRhDailyReportDO::getCumulativeCompletion, reqVO.getCumulativeCompletion())
+                .eqIfPresent(IotRhDailyReportDO::getExtProperty, reqVO.getExtProperty())
+                .eqIfPresent(IotRhDailyReportDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotRhDailyReportDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotRhDailyReportDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotRhDailyReportDO::getProcessInstanceId, reqVO.getProcessInstanceId())
+                .eqIfPresent(IotRhDailyReportDO::getAuditStatus, reqVO.getAuditStatus())
+                .betweenIfPresent(IotRhDailyReportDO::getCreateTime, reqVO.getCreateTime()));
+    } */
+
+    // 修改selectList方法，使用XML实现
+    List<IotRhDailyReportDO> selectListGrouped(@Param("reqVO") IotRhDailyReportPageReqVO reqVO);
+
+    /**
+     * 根据条件查询单个OTA升级记录
+     *
+     * @param deptId     施工队伍id
+     * @param taskId     任务ID，可选参数，用于筛选任务ID匹配的记录
+     * @param dateTime   当前时间
+     * @return 返回符合条件的瑞恒日报记录
+     */
+    default IotRhDailyReportDO selectExistReport(Long deptId, Long taskId, LocalDateTime dateTime) {
+        String dateStr = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        // 使用LambdaQueryWrapperX构建查询条件，根据传入的参数动态添加查询条件
+        return selectOne(new LambdaQueryWrapperX<IotRhDailyReportDO>()
+                .eqIfPresent(IotRhDailyReportDO::getDeptId, deptId)
+                .eqIfPresent(IotRhDailyReportDO::getTaskId, taskId)
+                .apply("DATE(create_time) = {0}", dateStr));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/oa/IotOaCompanyMapper.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.oa;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.oa.IotOaCompanyPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.oa.IotOaCompanyDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * oa公司 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotOaCompanyMapper extends BaseMapperX<IotOaCompanyDO> {
+
+    default PageResult<IotOaCompanyDO> selectPage(IotOaCompanyPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotOaCompanyDO>()
+                .eqIfPresent(IotOaCompanyDO::getSubcompanydesc, reqVO.getSubcompanydesc())
+                .eqIfPresent(IotOaCompanyDO::getSubcompanycode, reqVO.getSubcompanycode())
+                .eqIfPresent(IotOaCompanyDO::getSupsubcomid, reqVO.getSupsubcomid())
+                .eqIfPresent(IotOaCompanyDO::getOaId, reqVO.getOaId())
+                .likeIfPresent(IotOaCompanyDO::getSubcompanyname, reqVO.getSubcompanyname())
+                .eqIfPresent(IotOaCompanyDO::getShoworder, reqVO.getShoworder())
+                .betweenIfPresent(IotOaCompanyDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotOaCompanyDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/oa/IotOaDepartMapper.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.oa;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.oa.IotOaDepartPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.oa.IotOaDepartDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * oa部门 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotOaDepartMapper extends BaseMapperX<IotOaDepartDO> {
+
+    default PageResult<IotOaDepartDO> selectPage(IotOaDepartPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotOaDepartDO>()
+                .eqIfPresent(IotOaDepartDO::getSupdepid, reqVO.getSupdepid())
+                .eqIfPresent(IotOaDepartDO::getDepartmentmark, reqVO.getDepartmentmark())
+                .likeIfPresent(IotOaDepartDO::getDepartmentname, reqVO.getDepartmentname())
+                .eqIfPresent(IotOaDepartDO::getDepartmentcode, reqVO.getDepartmentcode())
+                .eqIfPresent(IotOaDepartDO::getOaId, reqVO.getOaId())
+                .eqIfPresent(IotOaDepartDO::getSubcompanyid1, reqVO.getSubcompanyid1())
+                .eqIfPresent(IotOaDepartDO::getShoworder, reqVO.getShoworder())
+                .betweenIfPresent(IotOaDepartDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotOaDepartDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/oa/IotOaPersonMapper.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.oa;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.oa.IotOaPersonPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.oa.IotOaPersonDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * oa人员 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotOaPersonMapper extends BaseMapperX<IotOaPersonDO> {
+
+    default PageResult<IotOaPersonDO> selectPage(IotOaPersonPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotOaPersonDO>()
+                .betweenIfPresent(IotOaPersonDO::getCompanystartdate, reqVO.getCompanystartdate())
+                .eqIfPresent(IotOaPersonDO::getSubcompanyid1, reqVO.getSubcompanyid1())
+                .likeIfPresent(IotOaPersonDO::getSubcompanyname, reqVO.getSubcompanyname())
+                .likeIfPresent(IotOaPersonDO::getJobgroupname, reqVO.getJobgroupname())
+                .eqIfPresent(IotOaPersonDO::getBelongtoid, reqVO.getBelongtoid())
+                .eqIfPresent(IotOaPersonDO::getSubcompanycode, reqVO.getSubcompanycode())
+                .eqIfPresent(IotOaPersonDO::getOaId, reqVO.getOaId())
+                .likeIfPresent(IotOaPersonDO::getLastname, reqVO.getLastname())
+                .betweenIfPresent(IotOaPersonDO::getEnddate, reqVO.getEnddate())
+                .likeIfPresent(IotOaPersonDO::getDepartmentname, reqVO.getDepartmentname())
+                .eqIfPresent(IotOaPersonDO::getStatus, reqVO.getStatus())
+                .likeIfPresent(IotOaPersonDO::getJobtitlename, reqVO.getJobtitlename())
+                .eqIfPresent(IotOaPersonDO::getDepartmentcode, reqVO.getDepartmentcode())
+                .eqIfPresent(IotOaPersonDO::getWorkcode, reqVO.getWorkcode())
+                .eqIfPresent(IotOaPersonDO::getSex, reqVO.getSex())
+                .eqIfPresent(IotOaPersonDO::getDepartmentid, reqVO.getDepartmentid())
+                .eqIfPresent(IotOaPersonDO::getMobile, reqVO.getMobile())
+                .eqIfPresent(IotOaPersonDO::getLocationid, reqVO.getLocationid())
+                .betweenIfPresent(IotOaPersonDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotOaPersonDO::getId));
+    }
+
+}

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

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.pms.constant.PmsConstants;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
@@ -16,6 +17,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillOrde
 import cn.iocoder.yudao.module.pms.dal.mysql.iotoperationplan.IotOperationPlanMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotoperationplandev.IotOperationPlanDevMapper;
 import cn.iocoder.yudao.module.pms.message.PmsMessage;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +57,8 @@ public class IotOperationPlanJob implements JobHandler {
     private IotOperationPlanMapper planMapper;
     @Resource
     private IotOperationPlanDevMapper planDevMapper;
+    @Resource
+    private DeptService deptService;
 
     /**
      * 1、查询开启状态运行计划
@@ -75,28 +79,7 @@ public class IotOperationPlanJob implements JobHandler {
         List<IotOperationPlanDO> planList = planMapper.getPlanList();
 
         if(planList.size()>0){
-            List<Long> planIds= planList.stream().map(IotOperationPlanDO::getId).collect(Collectors.toList());
-            //2、根据计划获取设备ID
-            List<IotOperationPlanDevDO> devList = planDevMapper.devIdList(planIds);
-            List<Long> devIdList= devList.stream().map(IotOperationPlanDevDO::getId).collect(Collectors.toList());
-            //3、根据设备ID生成主表数据
-            List<IotOpeationFillOrderDO> orderList = new ArrayList<>();
-            List<IotOpeationFillDO> pdList = iotOpeationFillMapper.pdList(devIdList);
-
-            for (IotOpeationFillDO pd:pdList) {
-
-                IotOpeationFillOrderDO fillDO = new IotOpeationFillOrderDO();
-
-                fillDO.setOrderName(pd.getOrgName()+"/"+LocalDate.now()+"运行记录填报");
-                fillDO.setDeptId(pd.getDeptId());
-                fillDO.setOrderStatus(0);
-                fillDO.setCreateTime(LocalDateTime.now());
-                fillDO.setUserName(pd.getUserName());
-                fillDO.setUserId(pd.getUserId());
-                fillDO.setMobile(pd.getMobile());
-                orderList.add(fillDO);
 
-            }
 
 
             for (IotOperationPlanDO planDO:planList) {
@@ -107,14 +90,86 @@ public class IotOperationPlanJob implements JobHandler {
                                 planDO.getBeginCreateTime().atZone(ZoneId.systemDefault()) // 使用系统默认时区
                                         .toInstant()                    // 转为 Instant（时间戳）
                         );
-                        deal(planDO, date,devIdList,orderList);
+
+
+                        Set<Long> idList = new HashSet<>();
+                        if(Objects.nonNull(planDO.getDeptId())){
+                            idList =  deptService.getChildDeptIdListFromCache(planDO.getDeptId());
+                            idList.add(planDO.getDeptId());
+                        }
+
+
+                        //2、根据计划获取设备ID
+                        List<IotDeviceRespVO> devList = iotOpeationFillMapper.getFillDevices2(idList);
+
+                        if(devList.size()>0){
+                            List<Long> devIdList= devList.stream().map(IotDeviceRespVO::getId).collect(Collectors.toList());
+                            //3、根据设备ID生成主表数据
+                            List<IotOpeationFillOrderDO> orderList = new ArrayList<>();
+                            List<IotOpeationFillDO> pdList = iotOpeationFillMapper.pdList(devIdList);
+
+                            for (IotOpeationFillDO pd:pdList) {
+
+                                IotOpeationFillOrderDO fillDO = new IotOpeationFillOrderDO();
+
+                                fillDO.setOrderName(pd.getOrgName()+"/"+LocalDate.now()+"运行记录填报");
+                                fillDO.setDeptId(pd.getDeptId());
+                                fillDO.setOrderStatus(0);
+                                fillDO.setCreateTime(LocalDateTime.now());
+                                fillDO.setUserName(pd.getUserName());
+                                fillDO.setUserId(pd.getUserId());
+                                fillDO.setMobile(pd.getMobile());
+                                orderList.add(fillDO);
+
+                            }
+
+                            deal(planDO, date,devIdList,orderList);
+                        }
+
+
                     }
                 } else {
                     Date lastdate = Date.from(
                             planDO.getLastCreateTime().atZone(ZoneId.systemDefault()) // 使用系统默认时区
                                     .toInstant()                    // 转为 Instant（时间戳）
                     );
-                    deal(planDO, lastdate,devIdList,orderList);
+
+
+
+                    Set<Long> idList = new HashSet<>();
+                    if(Objects.nonNull(planDO.getDeptId())){
+                        idList =  deptService.getChildDeptIdListFromCache(planDO.getDeptId());
+                        idList.add(planDO.getDeptId());
+                    }
+
+
+                    //2、根据计划获取设备ID
+                    List<IotDeviceRespVO> devList = iotOpeationFillMapper.getFillDevices2(idList);
+                    if(devList.size()>0){
+                        List<Long> devIdList= devList.stream().map(IotDeviceRespVO::getId).collect(Collectors.toList());
+                        //3、根据设备ID生成主表数据
+                        List<IotOpeationFillOrderDO> orderList = new ArrayList<>();
+                        List<IotOpeationFillDO> pdList = iotOpeationFillMapper.pdList(devIdList);
+
+                        for (IotOpeationFillDO pd:pdList) {
+
+                            IotOpeationFillOrderDO fillDO = new IotOpeationFillOrderDO();
+
+                            fillDO.setOrderName(pd.getOrgName()+"/"+LocalDate.now()+"运行记录填报");
+                            fillDO.setDeptId(pd.getDeptId());
+                            fillDO.setOrderStatus(0);
+                            fillDO.setCreateTime(LocalDateTime.now());
+                            fillDO.setUserName(pd.getUserName());
+                            fillDO.setUserId(pd.getUserId());
+                            fillDO.setMobile(pd.getMobile());
+                            orderList.add(fillDO);
+
+                        }
+
+
+                        deal(planDO, lastdate,devIdList,orderList);
+                    }
+
                 }
             }
 
@@ -167,10 +222,12 @@ public class IotOperationPlanJob implements JobHandler {
                 .filter(obj -> idList.contains(obj.getUserId()))
                 .collect(Collectors.toList());
 
+
+
         iotOpeationFillOrderMapper.insertBatch(orderList1);
 
 
-        /*//发送钉钉通知
+        //发送钉钉通知
         pmsThreadPoolTaskExecutor.execute(()->{
             try{
                 for (IotOpeationFillOrderDO order:orderList1) {
@@ -179,7 +236,7 @@ public class IotOperationPlanJob implements JobHandler {
             }catch (Exception e){
                 e.printStackTrace();
             }
-        });*/
+        });
 
 
         for (IotOpeationFillDO device:deviceList) {
@@ -208,4 +265,4 @@ public class IotOperationPlanJob implements JobHandler {
         System.out.println("*****************插入运行记录设备表完成***********************");
     }
 
-}
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/oa/OaPeopleJob.java

@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.pms.job.oa;
+
+import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.module.pms.oa.OaFlow;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class OaPeopleJob implements JobHandler {
+    @Autowired
+    private OaFlow oaFlow;
+
+    @Override
+    @TenantIgnore
+    public String execute(String param) throws Exception {
+        oaFlow.getCompany();
+        oaFlow.getDepart();
+        oaFlow.getPerson();
+        return "";
+    }
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/oa/CallBackOaVo.java

@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.pms.oa;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class CallBackOaVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String requestId;
+    private String ifSuccess;
+    private String flowNo;
+    private List<ApprovalInfo> mainData;
+
+    @Data
+    public static class ApprovalInfo{
+        private String userId;
+        private String name;
+        private String message;
+        private Integer index;
+    }
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/oa/E9ApiTokenUtil.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.pms.oa;
+
+import javax.crypto.Cipher;
+import java.security.KeyFactory;
+import java.security.PublicKey;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+
+public class E9ApiTokenUtil {
+    public static String encryptString(String pubkey, String plaintext) {
+        PublicKey publicKey = null;
+        try {
+            publicKey = getFromBase64String(pubkey);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (publicKey == null || plaintext == null) {
+            return null;
+        }
+        byte[] data = plaintext.getBytes();
+        try {
+            byte[] en_data = encrypt(publicKey, data);
+            return Base64.getEncoder().encodeToString(en_data);
+        }
+        catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+    public static PublicKey getFromBase64String(String publicKeyString) throws
+            Exception {
+        byte[] keyBytes = publicKeyString.getBytes();
+        byte[] ks = Base64.getDecoder().decode(keyBytes);
+        X509EncodedKeySpec spec = new X509EncodedKeySpec(ks);
+        KeyFactory kf = KeyFactory.getInstance("RSA");
+        return kf.generatePublic(spec);
+    }
+    public static byte[] encrypt(PublicKey publicKey, byte[] data) throws Exception {
+        Cipher ci = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+        ci.init(Cipher.ENCRYPT_MODE, publicKey);
+        return ci.doFinal(data);
+    }
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/oa/OaFlow.java

@@ -0,0 +1,310 @@
+package cn.iocoder.yudao.module.pms.oa;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.util.io.FileUtils;
+import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
+import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.oa.IotOaCompanyDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.oa.IotOaDepartDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.oa.IotOaPersonDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.maintain.IotMaintainMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.oa.IotOaCompanyMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.oa.IotOaDepartMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.oa.IotOaPersonMapper;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Component
+public class OaFlow {
+    private final IotOaCompanyMapper iotOaCompanyMapper;
+    private final IotOaDepartMapper iotOaDepartMapper;
+    private final IotOaPersonMapper iotOaPersonMapper;
+    private final IotMaintainMapper iotMaintainMapper;
+    @Value("${oa.appid}")
+    private String appid;
+    @Value("${oa.cpk}")
+    private String cpk;
+    @Value("${oa.register}")
+    private String registerUrl;
+    @Value("${oa.gettoken}")
+    private String tokenUrl;
+    @Value("${oa.companyUrl}")
+    private String companyUrl;
+    @Value("${oa.departmentUrl}")
+    private String departmentUrl;
+    @Value("${oa.userUrl}")
+    private String userUrl;
+    @Value("${oa.workflowId}")
+    private String workflowId;
+    @Value("${oa.requestName}")
+    private String requestName;
+    @Value("${oa.outMaintain}")
+    private String outMaintainUrl;
+    @Value("${oa.userid}")
+    private String userid;
+
+    private static String spk = "";
+    private static String secret = "";
+
+    public OaFlow(IotOaCompanyMapper iotOaCompanyMapper, IotOaDepartMapper iotOaDepartMapper, IotOaPersonMapper iotOaPersonMapper, IotMaintainMapper iotMaintainMapper) {
+        this.iotOaCompanyMapper = iotOaCompanyMapper;
+        this.iotOaDepartMapper = iotOaDepartMapper;
+        this.iotOaPersonMapper = iotOaPersonMapper;
+        this.iotMaintainMapper = iotMaintainMapper;
+    }
+
+
+    public void register() throws Exception{
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("appid", appid);
+        headers.add("cpk", cpk);
+
+        HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(headers);
+        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+
+        String result = restTemplate.postForObject(registerUrl, requestEntity, String.class);
+        JSONObject jsonObject = JSON.parseObject(result);
+        spk = String.valueOf(jsonObject.get("spk"));
+        secret = String.valueOf(jsonObject.get("secret"));
+        System.out.println("result:" + result);
+
+    }
+
+    public String getToken() throws Exception{
+        if (StringUtils.isBlank(spk) || StringUtils.isBlank(secret)) {
+            register();
+        }
+        String secretEn = E9ApiTokenUtil.encryptString(spk, secret);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("appid", appid);
+        headers.add("secret", secretEn);
+
+        HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(headers);
+        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+
+        String result = restTemplate.postForObject(tokenUrl, requestEntity, String.class);
+        JSONObject jsonObject = JSON.parseObject(result);
+        String token = String.valueOf(jsonObject.get("token"));
+        System.out.println("result:" + result);
+        return token;
+    }
+
+    public void getCompany() throws Exception{
+        String token = getToken();
+        HttpHeaders headersOut = new HttpHeaders();
+        headersOut.add("token", token);
+        headersOut.add("appid", appid);
+        headersOut.add("userid", "cLPEaFs9moW6b3xZMl1kNNWAAo7bp61ZRRTKmpiJUe56hSxQvrC2vWtY5ogj7g5FAnUOlzYjYg9MRktKXcseh/nsvZCQGa3BAlYixlDJruV19y4Omx5dYnqu/qv2rJAqTzUS71sOwuB1M2nKlLVsphw1GF74UhGP4xsjpZP7mC8=");
+
+        Map<String, Object> params = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("pagesize",1000000);
+        params.put("params", map);
+        // 3. 组合请求头和请求体
+        HttpEntity<Map<String, Object>> requestEntityOut = new HttpEntity<>(params, headersOut);
+        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+        String company = restTemplate.postForObject(companyUrl, requestEntityOut, String.class);
+        JSONObject companyInfo = JSON.parseObject(company);
+        //请求成功
+        if (Objects.nonNull(companyInfo)&&"1".equals(String.valueOf(companyInfo.get("code")))){
+            if (Objects.nonNull(companyInfo.get("data"))) {
+                JSONObject resultJson = JSON.parseObject(companyInfo.get("data").toString());
+                if (Objects.nonNull(resultJson.get("dataList"))) {
+                    //先删除
+                    List<Long> ids = iotOaCompanyMapper.selectList().stream().map(IotOaCompanyDO::getId).collect(Collectors.toList());
+                    iotOaCompanyMapper.deleteByIds(ids);
+                    JSON.parseArray(resultJson.get("dataList").toString(),IotOaCompanyDO.class).forEach(item -> {
+                        IotOaCompanyDO companyDO = new IotOaCompanyDO();
+                        BeanUtils.copyProperties(item,companyDO);
+                        companyDO.setOaId(String.valueOf(companyDO.getId()));
+                        companyDO.setId(null);
+                        companyDO.setDeleted(false);
+                        iotOaCompanyMapper.insert(companyDO);
+                    });
+                }
+            }
+        }
+    }
+
+    public void getDepart() throws Exception {
+        String token = getToken();
+        HttpHeaders headersOut = new HttpHeaders();
+        headersOut.add("token", token);
+        headersOut.add("appid", appid);
+        headersOut.add("userid", "cLPEaFs9moW6b3xZMl1kNNWAAo7bp61ZRRTKmpiJUe56hSxQvrC2vWtY5ogj7g5FAnUOlzYjYg9MRktKXcseh/nsvZCQGa3BAlYixlDJruV19y4Omx5dYnqu/qv2rJAqTzUS71sOwuB1M2nKlLVsphw1GF74UhGP4xsjpZP7mC8=");
+
+        Map<String, Object> params = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("pagesize",1000000);
+        params.put("params", map);
+        // 3. 组合请求头和请求体
+        HttpEntity<Map<String, Object>> requestEntityOut = new HttpEntity<>(params, headersOut);
+        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+        String company = restTemplate.postForObject(departmentUrl, requestEntityOut, String.class);
+        JSONObject companyInfo = JSON.parseObject(company);
+        //请求成功
+        if (Objects.nonNull(companyInfo) && "1".equals(String.valueOf(companyInfo.get("code")))) {
+            if (Objects.nonNull(companyInfo.get("data"))) {
+                JSONObject resultJson = JSON.parseObject(companyInfo.get("data").toString());
+                if (Objects.nonNull(resultJson.get("dataList"))) {
+                    //先删除
+                    List<Long> ids = iotOaDepartMapper.selectList().stream().map(IotOaDepartDO::getId).collect(Collectors.toList());
+                    iotOaDepartMapper.deleteByIds(ids);
+                    JSON.parseArray(resultJson.get("dataList").toString(), IotOaDepartDO.class).forEach(item -> {
+                        IotOaDepartDO iotOaDepartDO = new IotOaDepartDO();
+                        BeanUtils.copyProperties(item, iotOaDepartDO);
+                        iotOaDepartDO.setOaId(String.valueOf(iotOaDepartDO.getId()));
+                        iotOaDepartDO.setId(null);
+                        iotOaDepartDO.setDeleted(false);
+                        iotOaDepartMapper.insert(iotOaDepartDO);
+                    });
+                }
+            }
+        }
+    }
+
+    public void getPerson() throws Exception {
+        String token = getToken();
+        HttpHeaders headersOut = new HttpHeaders();
+        headersOut.add("token", token);
+        headersOut.add("appid", appid);
+        headersOut.add("userid", userid);
+
+        Map<String, Object> params = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("pagesize",1000000);
+        params.put("params", map);
+        // 3. 组合请求头和请求体
+        HttpEntity<Map<String, Object>> requestEntityOut = new HttpEntity<>(params, headersOut);
+        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+        String company = restTemplate.postForObject(userUrl, requestEntityOut, String.class);
+        JSONObject companyInfo = JSON.parseObject(company);
+        //请求成功
+        if (Objects.nonNull(companyInfo) && "1".equals(String.valueOf(companyInfo.get("code")))) {
+            if (Objects.nonNull(companyInfo.get("data"))) {
+                JSONObject resultJson = JSON.parseObject(companyInfo.get("data").toString());
+                if (Objects.nonNull(resultJson.get("dataList"))) {
+                    //先删除
+                    List<Long> ids = iotOaPersonMapper.selectList().stream().map(IotOaPersonDO::getId).collect(Collectors.toList());
+                    iotOaPersonMapper.deleteByIds(ids);
+                    TenantUtils.execute(1L, () -> {
+                        JSON.parseArray(resultJson.get("dataList").toString(), IotOaPersonDO.class).forEach(item -> {
+                            IotOaPersonDO iotOaPersonDO = new IotOaPersonDO();
+                            BeanUtils.copyProperties(item, iotOaPersonDO);
+                            iotOaPersonDO.setOaId(String.valueOf(iotOaPersonDO.getId()));
+                            iotOaPersonDO.setId(null);
+                            iotOaPersonDO.setDeleted(false);
+                            iotOaPersonMapper.insert(iotOaPersonDO);
+                        });
+                    });
+                }
+            }
+        }
+    }
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    public void createOutRepairFlow(IotMaintainDO iotMaintainDO) throws Exception {
+        String token = getToken();
+        HttpHeaders headersOut = new HttpHeaders();
+        headersOut.add("token", token);
+        headersOut.add("appid", appid);
+        String person = E9ApiTokenUtil.encryptString(spk, iotMaintainDO.getApplyPersonId());
+        headersOut.add("userid", person);
+        headersOut.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+
+        OutRepairFlow flow = new OutRepairFlow().setFieldName("xmjl").setFieldValue(iotMaintainDO.getProjectManager());
+        OutRepairFlow flow1 = new OutRepairFlow().setFieldName("sqr").setFieldValue(iotMaintainDO.getApplyPersonId());
+        List<IotOaPersonDO> dos = iotOaPersonMapper.selectList("oa_id", iotMaintainDO.getApplyPersonId());
+        if (CollUtil.isEmpty(dos)) {
+            throw new ServiceException(new ErrorCode(111, "不存在oa部门"));
+        }
+        OutRepairFlow flow2 = new OutRepairFlow().setFieldName("sqbm").setFieldValue(dos.get(0).getDepartmentid());
+        OutRepairFlow flow3 = new OutRepairFlow().setFieldName("sqrq").setFieldValue(DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN));
+        OutRepairFlow flow4 = new OutRepairFlow().setFieldName("clxh").setFieldValue(iotMaintainDO.getDeviceName());
+        OutRepairFlow flow5 = new OutRepairFlow().setFieldName("cph").setFieldValue(iotMaintainDO.getDeviceName());
+        OutRepairFlow flow6 = new OutRepairFlow().setFieldName("wxyy").setFieldValue(iotMaintainDO.getMaintainDescription());
+        OutRepairFlow flow7 = new OutRepairFlow().setFieldName("ygjey").setFieldValue(String.valueOf(iotMaintainDO.getMaintainFee()));
+        OutRepairFlow flow8 = new OutRepairFlow().setFieldName("wxdd").setFieldValue(Objects.isNull(iotMaintainDO.getAddress())?"": iotMaintainDO.getAddress());
+        OutRepairFlow flow9 = new OutRepairFlow().setFieldName("ggxh").setFieldValue(String.valueOf(iotMaintainDO.getModel()));
+        OutRepairFlow flow10 = new OutRepairFlow().setFieldName("qyrq").setFieldValue(StringUtils.substring(iotMaintainDO.getEnableDate(), 0,10));
+        OutRepairFlow flow11 = new OutRepairFlow().setFieldName("wxlb").setFieldValue(String.valueOf(iotMaintainDO.getMaintainClassify()));
+        OutRepairFlow flow12 = new OutRepairFlow().setFieldName("yzglxs").setFieldValue(Objects.isNull(iotMaintainDO.getKmHour())?"": iotMaintainDO.getKmHour());
+        OutRepairFlow flow13 = new OutRepairFlow().setFieldName("wxcj").setFieldValue(String.valueOf(iotMaintainDO.getSupplier()));
+        OutRepairFlow flow14 = new OutRepairFlow().setFieldName("gzms").setFieldValue(String.valueOf(iotMaintainDO.getDescription()));
+        OutRepairFlow flow15 = new OutRepairFlow().setFieldName("wxxm").setFieldValue(String.valueOf(iotMaintainDO.getMaintainItem()));
+        List<String> strings = JSON.parseArray(iotMaintainDO.getOutFile(), String.class);
+        List<ImmutableMap> files = new ArrayList<>();
+        strings.forEach(e ->{
+            String fileName = FileUtils.getFileNameByUrlParse(e);
+            String s1 = FileUtils.encodePathSegment(fileName);
+            String s = StringUtils.substringBeforeLast(e, "/");
+            files.add(ImmutableMap.of("filePath", s+"/"+s1,"fileName", fileName));
+        });
+
+        OutRepairFlow flow16 = new OutRepairFlow().setFieldName("fjsc").setFieldValue(JSON.toJSONString(files));
+        OutRepairFlow flow17 = new OutRepairFlow().setFieldName("sfdy").setFieldValue("1");
+        ImmutableList<OutRepairFlow> outRepairFlows = ImmutableList.of(flow16,flow12, flow3, flow4, flow5, flow6, flow7, flow8, flow9, flow10, flow11, flow2, flow, flow14, flow1, flow15, flow13,flow17);
+
+
+
+        // 创建表单数据
+        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+        params.add("workflowId", workflowId);
+        params.add("requestName", requestName);
+        params.add("mainData", JSON.toJSONString(outRepairFlows));
+        Map<String, String> other = new HashMap<>();
+        other.put("isnextflow", "1");
+        params.add("otherParams", JSON.toJSONString(other));
+        System.out.println("------------"+JSON.toJSONString(outRepairFlows));
+        // 3. 组合请求头和请求体
+        HttpEntity<MultiValueMap<String, Object>> requestEntityOut = new HttpEntity<>(params, headersOut);
+//        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+        String out = restTemplate.postForObject(outMaintainUrl, requestEntityOut, String.class);
+        JSONObject outInfo = JSON.parseObject(out);
+        //请求成功
+        if (Objects.isNull(outInfo) || !"success".equalsIgnoreCase(String.valueOf(outInfo.get("code")))) {
+            throw new ServiceException(new ErrorCode(777, String.valueOf(outInfo.get("msg"))));
+        }
+        JSONObject jsonObject = JSON.parseObject(outInfo.get("data").toString());
+        String requestid = String.valueOf(jsonObject.get("requestid"));
+        iotMaintainDO.setRequestId(requestid);
+        iotMaintainMapper.updateById(iotMaintainDO);
+
+    }
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class OutRepairFlow {
+        private String fieldName;
+        private String fieldValue;
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/oa/OaVo.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.pms.oa;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OaVo {
+    private String workflowId;
+    private String requestName;
+    private List<MainData> mainData;
+
+    @Data
+    public static class MainData{
+        private String fieldName;
+        private String fieldValue;
+    }
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/oa/SslSkippingRestTemplate.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.pms.oa;
+
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+import javax.net.ssl.*;
+import java.security.cert.X509Certificate;
+
+public class SslSkippingRestTemplate {
+
+    public static RestTemplate createRestTemplate() {
+        try {
+            // 创建不验证证书的SSL上下文
+            TrustManager[] trustAllCerts = new TrustManager[]{
+                    new X509TrustManager() {
+                        public X509Certificate[] getAcceptedIssuers() {
+                            return null;
+                        }
+                        public void checkClientTrusted(X509Certificate[] certs, String authType) {
+                        }
+                        public void checkServerTrusted(X509Certificate[] certs, String authType) {
+                        }
+                    }
+            };
+
+            SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
+
+            // 获取SSL连接工厂
+            HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
+
+            // 创建不验证主机名的主机名验证器
+            HostnameVerifier allHostsValid = (hostname, session) -> true;
+            HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
+
+            // 创建RestTemplate并设置自定义请求工厂
+            SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+            return new RestTemplate(requestFactory);
+        } catch (Exception e) {
+            throw new RuntimeException("创建RestTemplate失败", e);
+        }
+    }
+}