工作日报,附件设置

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java

@@ -8,6 +8,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
+import java.util.List;
 
 /**
  * 巡检日报对象 daily_inspection_report
@@ -44,6 +45,20 @@ public class DailyInspectionReport extends TenantEntity {
      */
     private String type;
 
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    private List<Attachment> attachments;
+
+
+    /**
+     * 巡检图片
+     */
+    @TableField(exist = false)
+    private List<Attachment> inspectionPhotos;
+
+
     /**
      * 巡检时间
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java

@@ -1,5 +1,7 @@
 package org.dromara.platform.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import org.dromara.platform.domain.Attachment;
 import org.dromara.platform.domain.DailyInspectionReport;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -9,6 +11,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
@@ -71,6 +75,19 @@ public class DailyInspectionReportBo extends BaseEntity {
     //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
     private String attachment;
 
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    private List<Attachment> attachments;
+
+    /**
+     * 巡检图片
+     */
+    @TableField(exist = false)
+    private List<Attachment> inspectionPhotos;
+
+
     /**
      * 运维单位
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java

@@ -1,7 +1,10 @@
 package org.dromara.platform.domain.vo;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.platform.domain.Attachment;
 import org.dromara.platform.domain.DailyInspectionReport;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -13,7 +16,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -110,4 +113,15 @@ public class DailyInspectionReportVo implements Serializable {
     private String inspectionPhoto;
 
 
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    private List<Attachment> attachments;
+
+    /**
+     * 巡检图片
+     */
+    @TableField(exist = false)
+    private List<Attachment> inspectionPhotos;
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DailyInspectionReportServiceImpl.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.platform.domain.Attachment;
+import org.dromara.platform.domain.AttachmentSerializer;
 import org.springframework.stereotype.Service;
 import org.dromara.platform.domain.bo.DailyInspectionReportBo;
 import org.dromara.platform.domain.vo.DailyInspectionReportVo;
@@ -39,7 +41,20 @@ public class DailyInspectionReportServiceImpl implements IDailyInspectionReportS
      */
     @Override
     public DailyInspectionReportVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+        DailyInspectionReportVo dailyInspectionReportVo = baseMapper.selectVoById(id);
+        String attachment = dailyInspectionReportVo.getAttachment();
+        if (StringUtils.isNotBlank(attachment)) {
+            AttachmentSerializer serializer = new AttachmentSerializer();
+            List<Attachment> attachments = serializer.deserializeAttachments(attachment);
+            dailyInspectionReportVo.setAttachments(attachments);
+        }
+        String inspectionPhoto = dailyInspectionReportVo.getInspectionPhoto();
+        if (StringUtils.isNotBlank(inspectionPhoto)) {
+            AttachmentSerializer serializer = new AttachmentSerializer();
+            List<Attachment> inspectionPhotos = serializer.deserializeAttachments(inspectionPhoto);
+            dailyInspectionReportVo.setAttachments(inspectionPhotos);
+        }
+        return dailyInspectionReportVo;
     }
 
     /**
@@ -98,6 +113,17 @@ public class DailyInspectionReportServiceImpl implements IDailyInspectionReportS
         add.setInspectionUnit("测试巡检单位");
         add.setType("前端(默认)");
         validEntityBeforeSave(add);
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer1 = new AttachmentSerializer();
+        String serializedAttachment = serializer1.serializeAttachments(attachments);
+        add.setAttachment(serializedAttachment);
+
+        List<Attachment> inspectionPhotos = bo.getInspectionPhotos();
+        AttachmentSerializer serializer2 = new AttachmentSerializer();
+        String serializedInspectionPhoto = serializer2.serializeAttachments(inspectionPhotos);
+        add.setInspectionPhoto(serializedInspectionPhoto);
+
+
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -114,7 +140,17 @@ public class DailyInspectionReportServiceImpl implements IDailyInspectionReportS
     @Override
     public Boolean updateByBo(DailyInspectionReportBo bo) {
         DailyInspectionReport update = MapstructUtils.convert(bo, DailyInspectionReport.class);
-        validEntityBeforeSave(update);
+        //validEntityBeforeSave(update);
+        List<Attachment> attachments = bo.getAttachments();
+        AttachmentSerializer serializer1 = new AttachmentSerializer();
+        String serializedAttachment = serializer1.serializeAttachments(attachments);
+        update.setAttachment(serializedAttachment);
+
+        List<Attachment> inspectionPhotos = bo.getInspectionPhotos();
+        AttachmentSerializer serializer2 = new AttachmentSerializer();
+        String serializedInspectionPhoto = serializer2.serializeAttachments(inspectionPhotos);
+        update.setInspectionPhoto(serializedInspectionPhoto);
+
         return baseMapper.updateById(update) > 0;
     }