From 787118de51b4b7ca27abe99181d242c1020b6d4c Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Thu, 29 Feb 2024 14:11:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A0=A4=E9=98=B2=E5=85=BB=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kms/yxgh/df/domain/DfYhRecord.java    |  3 +
 .../kms/yxgh/df/dto/DfYhRecordDetailDto.java  | 72 +++++++++++--------
 .../yxgh/df/service/DfYhRecordService.java    |  6 ++
 3 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java
index e52d4084..a1c4aef8 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java
@@ -81,4 +81,7 @@ public class DfYhRecord extends SyBaseEntity {
   @Excel(name = "状态")
   @ApiModelProperty("状态")
   private String status;
+
+  @ApiModelProperty("文件档案")
+  private String doc;
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java
index 36085574..e23d2153 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java
@@ -2,9 +2,10 @@ package com.kms.yxgh.df.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * 堤防维修养护记录
@@ -16,48 +17,59 @@ import lombok.Data;
 @ApiModel("堤防维修养护记录")
 public class DfYhRecordDetailDto {
 
-  @ApiModelProperty("养护记录id")
-  private String id;
+    @ApiModelProperty("养护记录id")
+    private String id;
 
-  @ApiModelProperty("计划代码")
-  private String planId;
+    @ApiModelProperty("计划代码")
+    private String planId;
 
-  @ApiModelProperty("名称")
-  private String name;
+    @ApiModelProperty("名称")
+    private String name;
 
-  @ApiModelProperty("维护前")
-  private String before;
+    @ApiModelProperty("维护前")
+    private String before;
 
-  @ApiModelProperty("维护过程")
-  private String middle;
+    @ApiModelProperty("维护过程")
+    private String middle;
 
-  @ApiModelProperty("维护结束")
-  private String after;
+    @ApiModelProperty("维护结束")
+    private String after;
 
-  @ApiModelProperty("养护费用")
-  private Long maintenanceFunds;
+    @ApiModelProperty("养护费用")
+    private Long maintenanceFunds;
 
-  @ApiModelProperty("落实情况")
-  private String implement;
+    @ApiModelProperty("落实情况")
+    private String implement;
 
-  @ApiModelProperty("状态")
-  private String status;
+    @ApiModelProperty("状态")
+    private String status;
 
-  @ApiModelProperty("养护人员")
-  private List<OperatorDto> operators;
+    @ApiModelProperty("养护人员")
+    private List<OperatorDto> operators;
 
+    @ApiModelProperty("文档")
+    private Doc doc;
 
-  @Data
-  public static class OperatorDto {
 
-    @ApiModelProperty("主键")
-    private String id;
+    @Data
+    public static class Doc {
+        @ApiModelProperty(value = "图片")
+        private List<String> images;
+        @ApiModelProperty(value = "音频")
+        private List<String> audios;
+    }
 
-    @ApiModelProperty("用户id")
-    private String uid;
+    @Data
+    public static class OperatorDto {
 
-    @ApiModelProperty("用户名称")
-    private String name;
+        @ApiModelProperty("主键")
+        private String id;
+
+        @ApiModelProperty("用户id")
+        private String uid;
+
+        @ApiModelProperty("用户名称")
+        private String name;
 
-  }
+    }
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
index 22197216..784aeeaf 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
@@ -1,6 +1,7 @@
 package com.kms.yxgh.df.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.yxgh.base.DfException;
@@ -37,6 +38,9 @@ public class DfYhRecordService extends BaseService<DfYhRecordMapper, DfYhRecord>
         DfYhRecord record = this.getBaseMapper().selectById(id);
         if (record != null) {
             DfYhRecordDetailDto dto = BeanCopyUtils.copy(record, DfYhRecordDetailDto.class);
+            if (dto != null) {
+                dto.setDoc(JSON.parseObject(record.getDoc(), DfYhRecordDetailDto.Doc.class));
+            }
             Wrapper<DfYhOperator> wp = Wrappers.<DfYhOperator>lambdaQuery()
                     .eq(DfYhOperator::getRecordId, id);
             List<DfYhOperator> items = dfYhOperatorMapper.selectList(wp);
@@ -60,6 +64,7 @@ public class DfYhRecordService extends BaseService<DfYhRecordMapper, DfYhRecord>
         if (dfYhRecord != null) {
             dfYhRecord.setId(null);
             if (!existRecord(dto.getPlanId())) {
+                dfYhRecord.setDoc(JSON.toJSONString(dto.getDoc()));
                 getBaseMapper().insert(dfYhRecord);
                 dto.setId(dfYhRecord.getId());
                 if (CollectionUtil.isNotEmpty(dto.getOperators())) {
@@ -81,6 +86,7 @@ public class DfYhRecordService extends BaseService<DfYhRecordMapper, DfYhRecord>
             if (checkStatus(dfRecord.getId())) {
                 DfYhRecord dfYhRecord = BeanCopyUtils.copy(dfRecord, DfYhRecord.class);
                 if (dfYhRecord != null) {
+                    dfYhRecord.setDoc(JSON.toJSONString(dfRecord.getDoc()));
                     getBaseMapper().updateById(dfYhRecord);
                     String id = dfRecord.getId();
                     deleteItems(id);