From b3d3d76d48fc714970c821b7bec146eef9f25a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Fri, 23 Aug 2024 10:03:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/muyu/domain/TaskInfo.java   |  9 +++++++++
 .../muyu/service/impl/TaskServiceImpl.java    | 19 +++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/cloud-task-common/src/main/java/com/muyu/domain/TaskInfo.java b/cloud-task-common/src/main/java/com/muyu/domain/TaskInfo.java
index c3d7d86..e03af69 100644
--- a/cloud-task-common/src/main/java/com/muyu/domain/TaskInfo.java
+++ b/cloud-task-common/src/main/java/com/muyu/domain/TaskInfo.java
@@ -1,5 +1,8 @@
 package com.muyu.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -16,8 +19,14 @@ import lombok.experimental.SuperBuilder;
 @AllArgsConstructor
 @NoArgsConstructor
 @SuperBuilder
+@TableName(value = "task_info",autoResultMap = true)
 public class TaskInfo extends BaseEntity {
 
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id",type = IdType.AUTO)
     private Integer id;
 
     /**
diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
index e592ddd..cb761c7 100644
--- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
+++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
@@ -39,14 +39,16 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
                 StringUtils.isNotEmpty(taskInfo.getName()),
                 TaskInfo::getName, taskInfo.getName()
         );
-//        queryWrapper.ne(TaskInfo::getStatus, 0);
-//        queryWrapper.eq(
-//                TaskInfo::getStatus,taskInfo.getStatus()
-//        );
-//        queryWrapper.ne(TaskInfo::getWeigh, 0);
-//        queryWrapper.eq(
-//                TaskInfo::getStatus,taskInfo.getWeigh()
-//        );
+        if(taskInfo.getStatus()!=0){
+            queryWrapper.eq(
+                    TaskInfo::getStatus,taskInfo.getStatus()
+            );
+        }
+        if(taskInfo.getWeigh()!=0){
+            queryWrapper.eq(
+                    TaskInfo::getWeigh,taskInfo.getWeigh()
+            );
+        }
         return this.list(queryWrapper);
     }
 
@@ -56,6 +58,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
         return "success";
     }
 
+
     @Override
     public String updById(TaskInfo taskInfo) {
         this.updateById(taskInfo);