From 5868e3d214310c0dd3fa7632efc6906ce79217de Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期一, 29 三月 2021 17:29:19 +0800
Subject: [PATCH] 更新试验计划接口
---
src/main/java/com/whyc/service/TestPlanService.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/TestPlanService.java b/src/main/java/com/whyc/service/TestPlanService.java
index 9de3fac..0f8c125 100644
--- a/src/main/java/com/whyc/service/TestPlanService.java
+++ b/src/main/java/com/whyc/service/TestPlanService.java
@@ -5,14 +5,18 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.TestPlanMapper;
+import com.whyc.pojo.DeviceManage;
import com.whyc.pojo.TestPlan;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
+import java.util.List;
@Service
@Slf4j
@@ -37,6 +41,10 @@
TestPlan testPlan = mapper.selectById(num);
return new Response().set(1,testPlan);
}
+ public TestPlan getOneById(Integer num){
+ TestPlan testPlan = mapper.selectById(num);
+ return testPlan;
+ }
public Response startPlan(Integer num){
TestPlan testPlan = mapper.selectById(num);
@@ -54,14 +62,11 @@
return new Response<IPage<TestPlan>>().set(1,page);
}
- public Response<IPage<TestPlan>> getPageByCondition(int pageNum,int pageSize,TestPlan testPlan){
- QueryWrapper<TestPlan> wrapper = Wrappers.query();
- wrapper.eq(StringUtils.isNotEmpty(testPlan.getCreateTime().toString()),"create_time",testPlan.getCreateTime());
- wrapper.eq(StringUtils.isNotEmpty(testPlan.getStartTime().toString()), "start_time", testPlan.getCreateTime());
- wrapper.eq(StringUtils.isNotEmpty(testPlan.getTestType()),"test_type",testPlan.getTestType());
- wrapper.eq(StringUtils.isNotEmpty(testPlan.getState().toString()),"state",testPlan.getState());
-
- IPage<TestPlan> page = mapper.selectPage(new Page<>(pageNum,pageSize),wrapper);
+ public Response<IPage<TestPlan>> getPageByCondition(int pageNum, int pageSize, TestPlan testPlan){
+ QueryWrapper<TestPlan> queryWrapper = new QueryWrapper<>(testPlan);
+ List<TestPlan> testPlanList = mapper.selectList(queryWrapper);
+ IPage<TestPlan> page = mapper.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
return new Response<IPage<TestPlan>>().set(1,page);
+
}
}
--
Gitblit v1.9.1