维修保养功能修复

2024年8月26日15:08:25

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

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);
                 }
             }