From 6a378aaca0809b0b5db179452b317f1e9d294792 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 05 Jun 2026 09:45:51 +0800
Subject: [PATCH] fix(workorder): 修复任务结果转换中的字段映射错误
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java
index 120168c..acd8178 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java
@@ -18,9 +18,13 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.sxkj.gd.workorder.dto.GdTaskResultDTO;
import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
import org.sxkj.gd.workorder.vo.GdTaskResultVO;
+
+import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 成果表 包装类,返回视图层所需的字段
@@ -36,15 +40,56 @@
@Override
public GdTaskResultVO entityVO(GdTaskResultEntity gdTaskResult) {
- GdTaskResultVO gdTaskResultVO = Objects.requireNonNull(BeanUtil.copy(gdTaskResult, GdTaskResultVO.class));
-
- //User createUser = UserCache.getUser(gdTaskResult.getCreateUser());
- //User updateUser = UserCache.getUser(gdTaskResult.getUpdateUser());
- //gdTaskResultVO.setCreateUserName(createUser.getName());
- //gdTaskResultVO.setUpdateUserName(updateUser.getName());
-
- return gdTaskResultVO;
+ return Objects.requireNonNull(BeanUtil.copy(gdTaskResult, GdTaskResultVO.class));
}
+ /**
+ * 将DTO列表转换为Entity列表
+ *
+ * @param gdTaskResultDTOList DTO列表
+ * @return Entity列表
+ */
+ public List<GdTaskResultEntity> listEntity(List<GdTaskResultDTO> gdTaskResultDTOList) {
+ return gdTaskResultDTOList.stream()
+ .map(this::convertDtoToEntity)
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * 将单个DTO转换为Entity
+ *
+ * @param dto DTO对象
+ * @return Entity对象
+ */
+ private GdTaskResultEntity convertDtoToEntity(GdTaskResultDTO dto) {
+ GdTaskResultEntity entity = BeanUtil.copy(dto, GdTaskResultEntity.class);
+
+ if (dto.getDateType() != null) {
+ entity.setAttachmentType(dto.getDateType());
+ }
+
+ return entity;
+ }
+
+ /**
+ * 将文件类型字符串转换为附件类型编码
+ *
+ * @param fileType 文件类型字符串（图片/视频/照片）
+ * @return 附件类型编码：0-图片，1-视频，2-其他
+ */
+ private Integer convertFileTypeToAttachmentType(String fileType) {
+ if (fileType == null) {
+ return 2;
+ }
+ switch (fileType.trim()) {
+ case "图片":
+ case "照片":
+ return 0;
+ case "视频":
+ return 1;
+ default:
+ return 2;
+ }
+ }
}
--
Gitblit v1.9.3