From 66fd6a13cfc2da23fede609bd4a1924eccf13cb0 Mon Sep 17 00:00:00 2001 From: bynt Date: Tue, 11 May 2021 20:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E5=87=8F=E9=80=BB=E8=BE=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20=E5=8E=BB=E9=99=A4=E4=BB=BB=E5=8A=A1=E5=88=86?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/taskrecord/domain/TaskRecord.java | 12 ------------ .../taskrecord/repository/TaskRecordRepository.java | 9 +-------- .../taskrecord/service/dto/TaskRecordDto.java | 3 +-- .../service/dto/TaskRecordQueryCriteria.java | 3 +-- 4 files changed, 3 insertions(+), 24 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/domain/TaskRecord.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/domain/TaskRecord.java index 09236ac..ddb45ea 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/domain/TaskRecord.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/domain/TaskRecord.java @@ -100,18 +100,6 @@ public class TaskRecord implements Serializable { private Long taskPushId; - @Column(name = "level") - @ApiModelProperty(value = "等级") - private Integer level; - - @Column(name = "parent_id") - @ApiModelProperty(value = "父类id") - private Integer parentId; - - - @Transient - @ApiModelProperty(value = "父类id") - private List children; public void copy(TaskRecord source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/repository/TaskRecordRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/repository/TaskRecordRepository.java index d311350..4f54f35 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/repository/TaskRecordRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/repository/TaskRecordRepository.java @@ -20,8 +20,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; -import java.util.List; - /** * @website https://el-admin.vip * @author x @@ -30,11 +28,6 @@ import java.util.List; @Repository public interface TaskRecordRepository extends JpaRepository, JpaSpecificationExecutor { - /** - * 查找所有一级父类 - * @param parentId - * @return - */ - List findByParentId(Long parentId); + } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordDto.java index 636403d..a09fe49 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordDto.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordDto.java @@ -72,6 +72,5 @@ public class TaskRecordDto implements Serializable { */ private Long taskPushId; - /*** 子数据*/ - private List children; + } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordQueryCriteria.java index 4272f57..63af797 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordQueryCriteria.java @@ -47,6 +47,5 @@ public class TaskRecordQueryCriteria{ @Query private String oprationName; - @Query - private Long parentId; + }