From be976b400e96db62099960402aac12d47b4f94b5 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Sat, 31 Jan 2026 17:01:20 +0800
Subject: [PATCH] add-实施清单管理-配置材料关联、流程关联

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/dto/GdThingListMaterialRelDTO.java |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/dto/GdThingListMaterialRelDTO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/dto/GdThingListMaterialRelDTO.java
index 1b37350..6aa6601 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/dto/GdThingListMaterialRelDTO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/dto/GdThingListMaterialRelDTO.java
@@ -16,9 +16,16 @@
  */
 package org.sxkj.gd.implement.dto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
 import org.sxkj.gd.implement.entity.GdThingListMaterialRelEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * 实施清单-材料关联表(情形化配置) 数据传输对象实体类
@@ -27,8 +34,35 @@
  * @since 2026-01-31
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class GdThingListMaterialRelDTO extends GdThingListMaterialRelEntity {
+public class GdThingListMaterialRelDTO implements Serializable {
+
 	private static final long serialVersionUID = 1L;
 
+	@JsonSerialize(
+		using = ToStringSerializer.class
+	)
+	@ApiModelProperty("主键id")
+	private Long id;
+
+	/**
+	 * 关联实施清单ID
+	 */
+	@ApiModelProperty(value = "关联实施清单ID")
+	private Long implementListId;
+	/**
+	 * 关联材料ID
+	 */
+	@ApiModelProperty(value = "关联材料ID")
+	private Long materialId;
+	/**
+	 * 材料序号(列表展示字段)
+	 */
+	@ApiModelProperty(value = "材料序号(列表展示字段)")
+	private Integer sort;
+	/**
+	 * 材料情形化配置:{"scenario_name":"情形1","is_need":1,"remark":"仅情形1需提供"}
+	 */
+	@ApiModelProperty(value = "材料情形化配置:{\"scenario_name\":\"情形1\",\"is_need\":1,\"remark\":\"仅情形1需提供\"}")
+	private String scenarioConfig;
+
 }

--
Gitblit v1.9.3