From c90f55045d34d77051c858c5c21ce0f313753017 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Mon, 26 Aug 2024 15:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BF=9D=E5=85=BB=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E5=A4=8D=202024=E5=B9=B48=E6=9C=8826?=
 =?UTF-8?q?=E6=97=A515:08:25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thing/eq/eqby/entity/EqByTemplateDetailEntity.java | 10 ++++++++--
 .../eq/eqby/service/impl/EqByPlanServiceImpl.java      |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/equipment/src/main/java/com/thing/eq/eqby/entity/EqByTemplateDetailEntity.java b/modules/equipment/src/main/java/com/thing/eq/eqby/entity/EqByTemplateDetailEntity.java
index f7a96ad..f0545f6 100644
--- a/modules/equipment/src/main/java/com/thing/eq/eqby/entity/EqByTemplateDetailEntity.java
+++ b/modules/equipment/src/main/java/com/thing/eq/eqby/entity/EqByTemplateDetailEntity.java
@@ -1,10 +1,14 @@
 package com.thing.eq.eqby.entity;
 
 import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
+import com.mybatisflex.core.keygen.KeyGenerators;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -16,10 +20,12 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @Table("eq_by_template_detail")
-public class EqByTemplateDetailEntity {
+public class EqByTemplateDetailEntity implements Serializable {
+
+	@Serial
 	private static final long serialVersionUID = 1L;
 
-	@Id
+	@Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId)
 	private Long id;
 	/**
 	 * 保养模板id
diff --git a/modules/equipment/src/main/java/com/thing/eq/eqby/service/impl/EqByPlanServiceImpl.java b/modules/equipment/src/main/java/com/thing/eq/eqby/service/impl/EqByPlanServiceImpl.java
index 48a1718..4c2a730 100644
--- a/modules/equipment/src/main/java/com/thing/eq/eqby/service/impl/EqByPlanServiceImpl.java
+++ b/modules/equipment/src/main/java/com/thing/eq/eqby/service/impl/EqByPlanServiceImpl.java
@@ -252,6 +252,8 @@ public class EqByPlanServiceImpl extends BaseServiceImpl<EqByPlanMapper, EqByPla
             if (CollectionUtil.isNotEmpty(byTemplateIds)) {
                 for (String byTemplateId : byTemplateIds) {
                     EqByTemplateDTO eqByTemplateDTO = eqByTemplateService.getByIdAs(Long.parseLong(byTemplateId),EqByTemplateDTO.class);
+                    List<EqByTemplateDetailDTO> details = eqByTemplateDetailService.getDetails(eqByTemplateDTO.getId());
+                    eqByTemplateDTO.setDatas(details);
                     byTemplateInfos.add(eqByTemplateDTO);
                 }
             }