From 1d2fde65447c074dc555e74e088b15826be0d8c8 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期三, 07 四月 2021 10:55:07 +0800
Subject: [PATCH] 更新试验计划接口
---
src/main/java/com/whyc/pojo/TestPlan.java | 4 ++--
src/main/java/com/whyc/service/TestPlanService.java | 15 +++++++++++----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/TestPlan.java b/src/main/java/com/whyc/pojo/TestPlan.java
index e21681e..b1082db 100644
--- a/src/main/java/com/whyc/pojo/TestPlan.java
+++ b/src/main/java/com/whyc/pojo/TestPlan.java
@@ -40,8 +40,8 @@
private String creator;//鍒涘缓浜�
private Integer state;//鐘舵�侊細0:鏈紑濮嬶紝1:杩涜涓紝2:宸茬粨鏉�,3:浣滃簾锛涘鏍哥姸鎬侊細2锛堝凡缁撴潫鏃讹級:鏈鏍革紝6:宸插鏍革紝8:宸插綊妗�
private String verifier;//瀹℃牳浜�
- private int planCount;//璁″垝娆℃暟
- private int testCount;//瀹為檯娆℃暟
+ private Integer planCount;//璁″垝娆℃暟
+ private Integer testCount;//瀹為檯娆℃暟
private String conclusion;//璇曢獙缁撹
public TestPlan() {
diff --git a/src/main/java/com/whyc/service/TestPlanService.java b/src/main/java/com/whyc/service/TestPlanService.java
index 08c459a..7c58124 100644
--- a/src/main/java/com/whyc/service/TestPlanService.java
+++ b/src/main/java/com/whyc/service/TestPlanService.java
@@ -13,6 +13,7 @@
import com.whyc.pojo.TestPlan;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
+import lombok.val;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -51,8 +52,14 @@
public Response startPlan(Integer num){
TestPlan testPlan = mapper.selectById(num);
//鑾峰彇璁″垝閲嶅娆℃暟
- int planCount = testPlan.getPlanCount();
- int testCount = testPlan.getTestCount();
+ int planCount = 0;
+ int testCount = 0;
+ if (testPlan.getPlanCount()!=null){
+ planCount = testPlan.getPlanCount();
+ }
+ if (testPlan.getTestCount()!=null){
+ testCount= testPlan.getTestCount();
+ }
if (planCount!=0 && testCount==planCount){
return new Response().setMsg(0,"宸茶揪鍒拌鍒掗噸澶嶆鏁版渶澶у��");
}
@@ -106,7 +113,7 @@
public Response<IPage<TestPlan>> getPageByCondition(int pageNum, int pageSize, TestPlan testPlan){
QueryWrapper<TestPlan> queryWrapper = new QueryWrapper<>(testPlan);
//鍘婚櫎宸插簾姝㈢殑璁″垝
- queryWrapper.in("state",0,1,2,6,8);
+ queryWrapper.in("state",0,1,2,3,6,8);
IPage<TestPlan> page = mapper.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
return new Response<IPage<TestPlan>>().set(1,page);
@@ -115,7 +122,7 @@
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);
+ queryWrapper.in("state",3,6,8);
IPage<TestPlan> page = mapper.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
return new Response<IPage<TestPlan>>().set(1,page);
--
Gitblit v1.9.1