From 0eccdb406d4a4ad121cb74bf5f061749b3ea26e9 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期五, 02 四月 2021 11:46:58 +0800
Subject: [PATCH] 更新试验计划接口

---
 src/main/java/com/whyc/service/TestPlanService.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/service/TestPlanService.java b/src/main/java/com/whyc/service/TestPlanService.java
index e2f236f..5205689 100644
--- a/src/main/java/com/whyc/service/TestPlanService.java
+++ b/src/main/java/com/whyc/service/TestPlanService.java
@@ -82,9 +82,17 @@
 
     public Response<IPage<TestPlan>> getPageByCondition(int pageNum, int pageSize, TestPlan testPlan){
         QueryWrapper<TestPlan> queryWrapper = new QueryWrapper<>(testPlan);
-        //鍘婚櫎宸插簾姝㈢殑璁″垝锛�6銆�8涓虹粨鏋滃鏍哥姸鎬侊紝璁″垝涓粛鏄剧ず2锛氬凡缁撴潫
-        queryWrapper.in("state",0,1,2,6,8);
-        List<TestPlan> testPlanList = mapper.selectList(queryWrapper);
+        //鍘婚櫎宸插簾姝㈢殑璁″垝
+        queryWrapper.in("state",0,1,2);
+        IPage<TestPlan> page = mapper.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
+        return new Response<IPage<TestPlan>>().set(1,page);
+
+    }
+
+    public Response<IPage<TestPlan>> getConclusion(int pageNum, int pageSize, TestPlan testPlan){
+        QueryWrapper<TestPlan> queryWrapper = new QueryWrapper<>(testPlan);
+        //6銆�8涓虹粨鏋滃鏍哥姸鎬侊紝2锛氳鍒掑凡缁撴潫锛岀粨璁烘湭瀹℃牳
+        queryWrapper.in("state",2,6,8);
         IPage<TestPlan> page = mapper.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
         return new Response<IPage<TestPlan>>().set(1,page);
 

--
Gitblit v1.9.1