From 7e9dd7ac44cec89b4588363166b408e15be2d78c Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期五, 02 四月 2021 11:10:29 +0800
Subject: [PATCH] 更新试验计划和试验数据接口

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

diff --git a/src/main/java/com/whyc/service/TestPlanService.java b/src/main/java/com/whyc/service/TestPlanService.java
index f9a3865..e2f236f 100644
--- a/src/main/java/com/whyc/service/TestPlanService.java
+++ b/src/main/java/com/whyc/service/TestPlanService.java
@@ -55,7 +55,7 @@
 
     public Response deletePlan(Integer num){
         TestPlan testPlan = mapper.selectById(num);
-        testPlan.setState(3);
+        testPlan.setState(-1);
         mapper.updateById(testPlan);
         return new Response().setMsg(1,"鍒犻櫎浣滃簾鎴愬姛");
     }
@@ -64,6 +64,13 @@
         testPlan.setState(2);
         mapper.updateById(testPlan);
         return new Response().setMsg(1,"鍋滄鎴愬姛");
+    }
+    public Response verifiedPlan(Integer num,String verifier){
+        TestPlan testPlan = mapper.selectById(num);
+        testPlan.setState(6);
+        testPlan.setVerifier(verifier);
+        mapper.updateById(testPlan);
+        return new Response().setMsg(1,"瀹℃牳鎴愬姛");
     }
 
 
@@ -75,6 +82,8 @@
 
     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);
         IPage<TestPlan> page = mapper.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
         return new Response<IPage<TestPlan>>().set(1,page);

--
Gitblit v1.9.1