zhangcl 1 неделя назад
Родитель
Сommit
a6a34a7b1c

+ 37 - 0
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/AttachmentCategoryEnum.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.pms.enums;
+
+/**
+ * @description: 附件类别
+ * @author: ruiqi
+ * @create: 2025-10-20
+ **/
+public enum AttachmentCategoryEnum {
+    MAINTENANCE("MAINTENANCE", "保养", 1),
+    REPAIR("REPAIR", "维修", 2),
+    INSPECTION("INSPECTION", "巡检", 3),
+    OPERATION_RECORD("OPERATION_RECORD", "运行记录", 4),
+    DAILY_REPORT("DAILY_REPORT", "日报", 5),
+    QHSE("QHSE", "QHSE", 6);
+
+    private String code;
+    private String msg;
+    private Integer num;
+
+    AttachmentCategoryEnum(String code, String msg, Integer num) {
+        this.code = code;
+        this.msg = msg;
+        this.num = num;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+}

+ 7 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrddailyreport/vo/IotRdDailyReportRespVO.java

@@ -248,4 +248,11 @@ public class IotRdDailyReportRespVO {
     @Schema(description = "工作量属性", example = "累计施工-层,当日泵车台次...")
     @ExcelProperty("工作量属性")
     private List<IotDailyReportAttrsDO> dailyReportAttrs;
+
+    /**
+     * 扩展属性
+     */
+    @Schema(description = "附件列表", example = "https://aims.deepoil.cc/admin-api/infra/file/29/get/人力资源.png")
+    @ExcelProperty("附件列表")
+    private List<IotDailyReportAttrsDO> attachments;
 }

+ 6 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrddailyreport/vo/IotRdDailyReportSaveReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotrddailyreport.vo;
 
+import cn.iocoder.yudao.module.pms.controller.admin.iotattachment.vo.IotAttachmentSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -136,4 +137,9 @@ public class IotRdDailyReportSaveReqVO {
     @Schema(description = "审批意见", example = "审核通过")
     private String opinion;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "附件列表")
+    private List<IotAttachmentSaveReqVO> attachments;
 }

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

@@ -1,8 +1,10 @@
 package cn.iocoder.yudao.module.pms.service.iotrddailyreport;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotattachment.vo.IotAttachmentSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrddailyreport.vo.IotRdDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrddailyreport.vo.IotRdDailyReportSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrddailyreport.IotRdDailyReportDO;
@@ -50,6 +52,12 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
         // 设置 日报审批状态为 审批中 auditStatus = 10
         updateObj.setAuditStatus(10);
         iotRdDailyReportMapper.updateById(updateObj);
+        // 如果上传了附件 保存附件
+        if (CollUtil.isNotEmpty(updateReqVO.getAttachments())) {
+            List<IotAttachmentSaveReqVO> attachments = updateReqVO.getAttachments();
+
+        }
+        ;
     }
 
     @Override