diff --git a/pom.xml b/pom.xml
index 066faf11056570bf19869d42e6ef2bdfaaaceebe..1487de21351eb02d1f8919d5bf24598e96c4de7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.luckyframe
LuckyFrameWeb
- 3.5
+ 3.5.1
jar
LuckyFrameWeb
diff --git a/src/main/java/com/luckyframe/project/api/OpenGetApiController.java b/src/main/java/com/luckyframe/project/api/OpenGetApiController.java
index 94c2ba091d8a43739b2d1557fcd6e979bd63c6ec..8f37a2b76768b2c17904d1a65b77c6306bc4afa7 100644
--- a/src/main/java/com/luckyframe/project/api/OpenGetApiController.java
+++ b/src/main/java/com/luckyframe/project/api/OpenGetApiController.java
@@ -217,8 +217,8 @@ public class OpenGetApiController {
//在客戶端获取测试用例步骤时，把PO转换为具体的包|路径
for (ProjectCaseSteps step : projectCaseStepsList) {
if (POUtil.isPO(step)) {
- POUtil.transPOToStepPath(step);
- }
+ POUtil.transPOToStepPath(step);
+ }
}
// 转换成json字符串
JSONArray array = JSONArray.parseArray(JSON.toJSONString(projectCaseStepsList));
diff --git a/src/main/java/com/luckyframe/project/api/OpenPostApiController.java b/src/main/java/com/luckyframe/project/api/OpenPostApiController.java
index 556c58059d91bc2f6a2966af18b1c006343d0664..0b7ec1de78768b3bdbe065a3c810e986bc6c27b6 100644
--- a/src/main/java/com/luckyframe/project/api/OpenPostApiController.java
+++ b/src/main/java/com/luckyframe/project/api/OpenPostApiController.java
@@ -101,10 +101,16 @@ public class OpenPostApiController
// 更新实体
int result = 0;
try {
+ log.info("增加用例执行明细>>>>>{}",jsonObject.toJSONString());
TaskCaseExecute taskCaseExecute = JSONObject.parseObject(jsonObject.toJSONString(), TaskCaseExecute.class);
taskCaseExecute.setCreateTime(new Date());
taskCaseExecute.setUpdateTime(new Date());
- result = taskCaseExecuteService.insertTaskCaseExecute(taskCaseExecute);
+ int caseCount = taskCaseExecuteService.selectTaskCaseExecuteCountByTaskIdAndCaseId(taskCaseExecute);
+ if(caseCount>0){
+ log.info("当前任务中存在多条重复用例执行(已在{}条)，请检查。",caseCount);
+ }else{
+ result = taskCaseExecuteService.insertTaskCaseExecute(taskCaseExecute);
+ }
} catch (Exception e) {
log.error("增加用例执行明细出现异常", e);
}
@@ -127,6 +133,7 @@ public class OpenPostApiController
// 更新实体
int result = 0;
try {
+ log.info("修改用例执行状态入参>>>>>{}",jsonObject.toJSONString());
TaskCaseExecute taskCaseExecute = JSONObject.parseObject(jsonObject.toJSONString(), TaskCaseExecute.class);
Integer caseStatus = taskCaseExecute.getCaseStatus();
TaskCaseExecute tce=null;
@@ -169,6 +176,7 @@ public class OpenPostApiController
// 更新实体
int result = 0;
try {
+ log.info("增加用例日志明细>>>>>{}",jsonObject.toJSONString());
TaskCaseLog taskCaseLog = JSONObject.parseObject(jsonObject.toJSONString(), TaskCaseLog.class);
taskCaseLog.setCreateTime(new Date());
taskCaseLog.setUpdateTime(new Date());
@@ -205,6 +213,7 @@ public class OpenPostApiController
int casefail = 0;
int caselock = 0;
int casenoexec = 0;
+ log.info("更新任务执行数据>>>>>{}",jsonObject.toJSONString());
Integer taskId = jsonObject.getInteger("taskId");
Integer caseCount = jsonObject.getInteger("caseCount");
Integer taskStatus = jsonObject.getInteger("taskStatus");
@@ -256,6 +265,7 @@ public class OpenPostApiController
@PostMapping("/clientDeleteTaskCaseLog")
@ResponseBody
public String clientDeleteTaskCaseLog(@RequestBody JSONObject jsonObject) {
+ log.info("删除用例执行日志>>>>>{}",jsonObject.toJSONString());
Integer taskId = jsonObject.getInteger("taskId");
Integer caseId = jsonObject.getInteger("caseId");
int result = 0;
@@ -285,6 +295,7 @@ public class OpenPostApiController
@PostMapping("/getLogDetailResult")
@ResponseBody
public String getLogDetailResult(@RequestBody JSONObject jsonObject) {
+ log.info("提取测试结果的详细日志>>>>>{}",jsonObject.toJSONString());
String taskName = jsonObject.getString("taskName");
String caseSign = jsonObject.getString("caseSign");
String result = "未能提取到相关的测试结果...";
@@ -319,6 +330,7 @@ public class OpenPostApiController
@PostMapping("/runTaskBySchedulingName")
@ResponseBody
public String runTaskBySchedulingName(@RequestBody JSONObject jsonObject) {
+ log.info("对外接口,根据调度任务的名称，触发测试任务>>>>>{}",jsonObject.toJSONString());
String schedulingName = jsonObject.getString("schedulingName");
try {
TaskScheduling taskScheduling = taskSchedulingService.selectTaskSchedulingByName(schedulingName);
diff --git a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/mapper/TaskCaseExecuteMapper.java b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/mapper/TaskCaseExecuteMapper.java
index f76f93408aec406d891d828f0816e073b1a09009..f45127a3590279e376fdf1def0ef981f4632918b 100644
--- a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/mapper/TaskCaseExecuteMapper.java
+++ b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/mapper/TaskCaseExecuteMapper.java
@@ -31,6 +31,15 @@ public interface TaskCaseExecuteMapper
*/
TaskCaseExecute selectTaskCaseExecuteByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute);
+ /**
+ * 根据任务ID以及用例ID查询单任务中条数
+ * @param taskCaseExecute 执行用例对象
+ * @return 返回用例执行条数
+ * @author Seagull
+ * @date 2022年5月7日
+ */
+ int selectTaskCaseExecuteCountByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute);
+
/**
* 根据任务ID以及计划ID和用例ID查询实体
* @param taskCaseExecute
diff --git a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/ITaskCaseExecuteService.java b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/ITaskCaseExecuteService.java
index c391cc8016970c374ea81ac00d482dd092bacd2a..969e728fede2502e1db9fbcce4b5b88091f8fb5b 100644
--- a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/ITaskCaseExecuteService.java
+++ b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/ITaskCaseExecuteService.java
@@ -29,6 +29,15 @@ public interface ITaskCaseExecuteService
*/
TaskCaseExecute selectTaskCaseExecuteByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute);
+ /**
+ * 根据taskId跟caseId查询用例执行条数
+ * @param taskCaseExecute 用例执行对象中的taskId以及caseId
+ * @return 用例执行条数
+ * @author Seagull
+ * @date 2022年5月7日
+ */
+ int selectTaskCaseExecuteCountByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute);
+
/**
* 根据taskid planid caseid查询用例执行信息
* @param taskCaseExecute
diff --git a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/TaskCaseExecuteServiceImpl.java b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/TaskCaseExecuteServiceImpl.java
index 8a68950ac634dd249268684a66306dd3a52d1913..657e9afcc180caa7946858116e2593cfa4886d19 100644
--- a/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/TaskCaseExecuteServiceImpl.java
+++ b/src/main/java/com/luckyframe/project/testexecution/taskCaseExecute/service/TaskCaseExecuteServiceImpl.java
@@ -46,6 +46,19 @@ public class TaskCaseExecuteServiceImpl implements ITaskCaseExecuteService
return taskCaseExecuteMapper.selectTaskCaseExecuteByTaskIdAndCaseId(taskCaseExecute);
}
+ /**
+ * 根据taskId跟caseId查询用例执行条数
+ * @param taskCaseExecute 用例执行对象中的taskId以及caseId
+ * @return 执行用例条数
+ * @author Seagull
+ * @date 2022年5月7日
+ */
+ @Override
+ public int selectTaskCaseExecuteCountByTaskIdAndCaseId(TaskCaseExecute taskCaseExecute)
+ {
+ return taskCaseExecuteMapper.selectTaskCaseExecuteCountByTaskIdAndCaseId(taskCaseExecute);
+ }
+
@Override
public TaskCaseExecute selectTaskCaseExecuteByTaskIdAndPlanIdAndCaseId(TaskCaseExecute taskCaseExecute)
{
diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/controller/ProjectSuitePlanController.java b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/controller/ProjectSuitePlanController.java
index ea2051ed42eb14abcfd930a5ce14e300693264ab..abdcaec1128e0dd388130292829604f919ec5b60 100644
--- a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/controller/ProjectSuitePlanController.java
+++ b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/controller/ProjectSuitePlanController.java
@@ -8,7 +8,11 @@ import com.luckyframe.framework.web.controller.BaseController;
import com.luckyframe.framework.web.domain.AjaxResult;
import com.luckyframe.framework.web.page.TableDataInfo;
import com.luckyframe.project.system.project.service.IProjectService;
+import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCase;
+import com.luckyframe.project.testmanagmt.projectCase.service.IProjectCaseService;
import com.luckyframe.project.testmanagmt.projectPlan.domain.ProjectPlan;
+import com.luckyframe.project.testmanagmt.projectPlan.domain.ProjectPlanCase;
+import com.luckyframe.project.testmanagmt.projectPlan.service.IProjectPlanCaseService;
import com.luckyframe.project.testmanagmt.projectPlan.service.IProjectPlanService;
import com.luckyframe.project.testmanagmt.projectSuite.domain.ProjectSuite;
import com.luckyframe.project.testmanagmt.projectSuite.domain.ProjectSuitePlan;
@@ -20,6 +24,8 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/***
@@ -41,7 +47,10 @@ public class ProjectSuitePlanController extends BaseController {
private IProjectPlanService projectPlanService;
@Autowired
- private IProjectService projectService;
+ private IProjectPlanCaseService projectPlanCaseService;
+
+ @Autowired
+ private IProjectCaseService projectCaseService;
@RequiresPermissions("testmanagmt:projectSuite:view")
@GetMapping("/{suiteId}")
@@ -86,17 +95,39 @@ public class ProjectSuitePlanController extends BaseController {
return error("没有此项目保存测试计划用例权限");
}
+ //不同的测试计划存在同一个用例，不能添加到同一个聚合计划中
+ HashMap map = new HashMap();
+ for(ProjectPlan projectPlan:projectPlans){
+ if(projectPlan.isFlag()){
+ List projectPlanCaseList= projectPlanCaseService.selectProjectPlanCaseListByPlanId(projectPlan.getPlanId());
+ for(ProjectPlanCase ppc:projectPlanCaseList){
+ if(!map.containsKey(ppc.getCaseId())){
+ map.put(ppc.getCaseId(),ppc.getPlanId());
+ }else {
+ ProjectCase projectCase = projectCaseService.selectProjectCaseById(ppc.getCaseId());
+ Integer oldPlanId=map.get(ppc.getCaseId());
+ ProjectPlan oldProjectPlan = projectPlanService.selectProjectPlanById(oldPlanId);
+ return error("用例重复存在，计划【"+projectPlan.getPlanName()+"】中的用例【"+projectCase.getCaseSign()+"】在计划【"+oldProjectPlan.getPlanName()+"】中已存在");
+ }
+ }
+ }
+ }
+
for(ProjectPlan projectPlan:projectPlans){
if(StringUtils.isNotEmpty(projectPlan.getSuitePlanId())&&!projectPlan.isFlag()){
resultCount = resultCount+projectSuitePlanService.deleteProjectSuitePlanById(projectPlan.getSuitePlanId());
}
-
if(projectPlan.isFlag()&&StringUtils.isEmpty(projectPlan.getSuitePlanId())){
ProjectSuitePlan projectSuitePlan = new ProjectSuitePlan();
projectSuitePlan.setSuiteId(projectPlan.getSuiteId());
projectSuitePlan.setPlanId(projectPlan.getPlanId());
projectSuitePlan.setPriority(projectPlan.getPriority());
- resultCount = resultCount+projectSuitePlanService.insertProjectSuitePlan(projectSuitePlan);
+ Integer sameSuitePlanCount = projectSuitePlanService.selectProjectSuitePlanCountBySuiteIdAndPlanId(projectSuitePlan.getSuiteId(),projectSuitePlan.getPlanId());
+ if(sameSuitePlanCount==0){
+ resultCount = resultCount+projectSuitePlanService.insertProjectSuitePlan(projectSuitePlan);
+ }else{
+ resultCount++;
+ }
}else{
resultCount++;
}
diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/mapper/ProjectSuitePlanMapper.java b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/mapper/ProjectSuitePlanMapper.java
index b3f9aecc8a0d802c50faa30302901324103999c7..d2524e8cdb8e76f5faa5431928f5092b54306d6a 100644
--- a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/mapper/ProjectSuitePlanMapper.java
+++ b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/mapper/ProjectSuitePlanMapper.java
@@ -31,8 +31,6 @@ public interface ProjectSuitePlanMapper {
*/
List selectProjectSuitePlanList(ProjectSuitePlan projectSuitePlan);
-
-
/**
* 新增聚合计划
*
@@ -89,5 +87,13 @@ public interface ProjectSuitePlanMapper {
*/
int selectProjectSuitePlanCountBySuiteId(Integer suiteId);
+ /**
+ * 查询同一聚合计划下同一个计划的数量
+ * @param suiteId 聚合测试计划ID planId 测试计划ID
+ * @author Seagull
+ * @date 2022年5月10日
+ */
+ int selectProjectSuitePlanCountBySuiteIdAndPlanId(ProjectSuitePlan projectSuitePlan);
+
}
diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/IprojectSuitePlanService.java b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/IprojectSuitePlanService.java
index 82ffdd42487932f5b2481e6cf56c9543979f440c..3d954594e51e6948ac0c85937a3e552349b37485 100644
--- a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/IprojectSuitePlanService.java
+++ b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/IprojectSuitePlanService.java
@@ -2,6 +2,8 @@ package com.luckyframe.project.testmanagmt.projectSuite.service;
import com.luckyframe.project.testmanagmt.projectSuite.domain.ProjectSuitePlan;
+import java.util.List;
+
/**
* 聚合计划 服务层
*
@@ -19,6 +21,13 @@ public interface IprojectSuitePlanService {
*/
ProjectSuitePlan selectProjectSuitePlanById(Integer suitePlanId);
+ /**
+ * 查询聚合计划用例列表
+ *
+ * @param projectSuitePlan 聚合计划用例列表信息
+ * @return 聚合计划集合
+ */
+ List selectProjectSuitePlanList(ProjectSuitePlan projectSuitePlan);
/**
* 新增聚合计划
@@ -57,4 +66,12 @@ public interface IprojectSuitePlanService {
* @param suiteId 测试计划ID
*/
int selectProjectSuitePlanCountBySuiteId(Integer suiteId);
+
+ /**
+ * 查询同一聚合计划下同一个计划的数量
+ * @param suiteId 聚合测试计划ID planId 测试计划ID
+ * @author Seagull
+ * @date 2022年5月10日
+ */
+ int selectProjectSuitePlanCountBySuiteIdAndPlanId(Integer suiteId,Integer planId);
}
diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/ProjectSuitePlanServiceImpl.java b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/ProjectSuitePlanServiceImpl.java
index b53afc664d7d35a5a5cdfe7fac4ee751d6addc6a..8cc4978abf3cf72e462c07e5b7e5e0b642a0117e 100644
--- a/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/ProjectSuitePlanServiceImpl.java
+++ b/src/main/java/com/luckyframe/project/testmanagmt/projectSuite/service/ProjectSuitePlanServiceImpl.java
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.List;
/**
* 聚合计划 服务层实现
@@ -39,6 +40,18 @@ public class ProjectSuitePlanServiceImpl implements IprojectSuitePlanService {
return projectSuitePlanMapper.selectProjectSuitePlanById(suitePlanId);
}
+ /**
+ * 查询聚合计划用例列表
+ *
+ * @param projectSuitePlan 聚合计划用例列表信息
+ * @return 聚合计划集合
+ */
+ @Override
+ public List selectProjectSuitePlanList(ProjectSuitePlan projectSuitePlan)
+ {
+ return projectSuitePlanMapper.selectProjectSuitePlanList(projectSuitePlan);
+ }
+
/**
* 新增测试计划用例
*
@@ -104,5 +117,19 @@ public class ProjectSuitePlanServiceImpl implements IprojectSuitePlanService {
return projectSuitePlanMapper.selectProjectSuitePlanCountBySuiteId(suiteId);
}
+ /**
+ * 查询同一聚合计划下同一个计划的数量
+ * @param suiteId 聚合测试计划ID planId 测试计划ID
+ * @author Seagull
+ * @date 2022年5月10日
+ */
+ @Override
+ public int selectProjectSuitePlanCountBySuiteIdAndPlanId(Integer suiteId,Integer planId)
+ {
+ ProjectSuitePlan projectSuitePlan = new ProjectSuitePlan();
+ projectSuitePlan.setSuiteId(suiteId);
+ projectSuitePlan.setPlanId(planId);
+ return projectSuitePlanMapper.selectProjectSuitePlanCountBySuiteIdAndPlanId(projectSuitePlan);
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 77c7503231ea64ea73ae78ca02ed7f4ae763b486..c883c79ff26ef053787a0f599278fdc40d6dfe05 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,7 +3,7 @@ luckyframe:
# 名称
name: LuckyFrame
# 版本
- version: 3.5
+ version: 3.5.1
# 版权年份
copyrightYear: 2021
# 获取ip地址开关
diff --git a/src/main/resources/db/migration/V3.5.1__upgradeData.sql b/src/main/resources/db/migration/V3.5.1__upgradeData.sql
index 4570581007afb23e548d8050b546d314ed627b1e..61b1d4bdf3c9472854813a22bfc1b5b91787d8b6 100644
--- a/src/main/resources/db/migration/V3.5.1__upgradeData.sql
+++ b/src/main/resources/db/migration/V3.5.1__upgradeData.sql
@@ -7,7 +7,9 @@
************ WARNING ************
此脚本属于应用自动升级数据库表结构以及数据脚本，无需手动执行，请慎重！！！！
*/
---1、PO模式功能
+-- ----------------------------
+-- 页面配置
+-- ----------------------------
CREATE TABLE if not exists `project_page_object` (
`project_id` int NULL DEFAULT NULL COMMENT '关联项目ID',
`create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
@@ -23,6 +25,9 @@ CREATE TABLE if not exists `project_page_object` (
PRIMARY KEY (`page_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '页面配置管理' ROW_FORMAT = DYNAMIC;
+-- ----------------------------
+-- 页面元素关联表
+-- ----------------------------
CREATE TABLE if not exists `project_page_detail` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '系统主键',
`create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
@@ -37,13 +42,13 @@ CREATE TABLE if not exists `project_page_detail` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 76 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '页面详情' ROW_FORMAT = DYNAMIC;
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2001, '页面管理', 4, 3, '/testmanagmt/projectPageObject', 'C', '0', 'testmanagmt:projectPageObject:view', '#', 'admin', '2018-03-01 00:00:00', 'dyl', '2022-03-31 17:48:28', '页面配置管理菜单');
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2002, '页面配置管理查询', 2001, 1, '#', 'F', '0', 'testmanagmt:projectPageObject:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:36', '');
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2003, '页面配置管理新增', 2001, 2, '#', 'F', '0', 'testmanagmt:projectPageObject:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:52', '');
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2004, '页面配置管理修改', 2001, 3, '#', 'F', '0', 'testmanagmt:projectPageObject:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:00', '');
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2005, '页面配置管理删除', 2001, 4, '#', 'F', '0', 'testmanagmt:projectPageObject:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:08', '');
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2006, '页面详情', 4, 1, '/testmanagmt/projectPageDetail', 'C', '1', 'testmanagmt:projectPageDetail:view', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-03-10 17:32:07', '页面详情菜单');
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2007, '页面详情查询', 2006, 1, '#', 'F', '0', 'testmanagmt:projectPageDetail:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:24', '');
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2008, '页面详情新增', 2006, 2, '#', 'F', '0', 'testmanagmt:projectPageDetail:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:47', '');
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2009, '页面详情修改', 2006, 3, '#', 'F', '0', 'testmanagmt:projectPageDetail:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:53', '');
-INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2010, '页面详情删除', 2006, 4, '#', 'F', '0', 'testmanagmt:projectPageDetail:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:30:00', '');
\ No newline at end of file
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2001, '页面管理', 4, 3, '/testmanagmt/projectPageObject', 'C', '0', 'testmanagmt:projectPageObject:view', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-03-31 17:48:28', '页面配置管理菜单');
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2002, '页面配置管理查询', 2001, 1, '#', 'F', '0', 'testmanagmt:projectPageObject:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:36', '');
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2003, '页面配置管理新增', 2001, 2, '#', 'F', '0', 'testmanagmt:projectPageObject:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:52', '');
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2004, '页面配置管理修改', 2001, 3, '#', 'F', '0', 'testmanagmt:projectPageObject:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:00', '');
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2005, '页面配置管理删除', 2001, 4, '#', 'F', '0', 'testmanagmt:projectPageObject:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:08', '');
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2006, '页面详情', 4, 1, '/testmanagmt/projectPageDetail', 'C', '1', 'testmanagmt:projectPageDetail:view', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-03-10 17:32:07', '页面详情菜单');
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2007, '页面详情查询', 2006, 1, '#', 'F', '0', 'testmanagmt:projectPageDetail:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:24', '');
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2008, '页面详情新增', 2006, 2, '#', 'F', '0', 'testmanagmt:projectPageDetail:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:47', '');
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2009, '页面详情修改', 2006, 3, '#', 'F', '0', 'testmanagmt:projectPageDetail:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:53', '');
+INSERT INTO sys_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `url`, `menu_type`, `visible`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2010, '页面详情删除', 2006, 4, '#', 'F', '0', 'testmanagmt:projectPageDetail:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:30:00', '');
\ No newline at end of file
diff --git a/src/main/resources/mybatis/testexecution/TaskCaseExecuteMapper.xml b/src/main/resources/mybatis/testexecution/TaskCaseExecuteMapper.xml
index fee7c622d467c6de01a757448dde08da8783fd26..15d9b8fa9044ba7b478116c9d1cad6d48b9911f0 100644
--- a/src/main/resources/mybatis/testexecution/TaskCaseExecuteMapper.xml
+++ b/src/main/resources/mybatis/testexecution/TaskCaseExecuteMapper.xml
@@ -136,6 +136,10 @@
select count(1) from task_case_execute where project_id=#{project_id}
+
+
diff --git a/src/main/resources/mybatis/testmanagmt/ProjectSuitePlanMapper.xml b/src/main/resources/mybatis/testmanagmt/ProjectSuitePlanMapper.xml
index 386d4980c70becf96ef86e3b280f17f9d7fa4f06..e4209f106353785650b36090434eaf4f7cd246c0 100644
--- a/src/main/resources/mybatis/testmanagmt/ProjectSuitePlanMapper.xml
+++ b/src/main/resources/mybatis/testmanagmt/ProjectSuitePlanMapper.xml
@@ -79,4 +79,12 @@
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/testexecution/taskCaseExecute/taskCaseExecute.html b/src/main/resources/templates/testexecution/taskCaseExecute/taskCaseExecute.html
index faaaa28136a1f95f9e31e232ced098cd8be62c6b..f7a8db0008700d1463a873d222781ce04751517e 100644
--- a/src/main/resources/templates/testexecution/taskCaseExecute/taskCaseExecute.html
+++ b/src/main/resources/templates/testexecution/taskCaseExecute/taskCaseExecute.html
@@ -213,19 +213,19 @@
field : 'caseId',
title : '用例ID',
width : '5%',
- visible: true
+ visible: false
},
{
field : 'taskId',
title : '任务ID',
width : '5%',
- visible: true
+ visible: false
},
{
field : 'projectId',
title : '项目ID',
width : '5%',
- visible: true
+ visible: false
},
{
field : 'caseSign',
diff --git a/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html b/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html
index 2117ebb381ca5d1ddfed987f08a24f732ff9553e..bb0c799b59c35fd3099e165f4675b2514ab65981 100644
--- a/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html
+++ b/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html
@@ -69,6 +69,9 @@
type: "post",
dataType: "json",
data: {
+ paramsId: function () {
+ return $.common.trim($("#paramsId").val());
+ },
name: function () {
return $.common.trim($("#paramsName").val());
},
diff --git a/src/main/resources/templates/testmanagmt/projectSuite/projectSuitePlan.html b/src/main/resources/templates/testmanagmt/projectSuite/projectSuitePlan.html
index 8030183867d6770c65001e34a105606371b821f3..f1eb1f4d8b5220e188c52f14d6ec2d4475d46e0a 100644
--- a/src/main/resources/templates/testmanagmt/projectSuite/projectSuitePlan.html
+++ b/src/main/resources/templates/testmanagmt/projectSuite/projectSuitePlan.html
@@ -89,7 +89,7 @@
{
field : 'priority',
title : '执行优先级',
- width : '40%',
+ width : '10%',
editable : {
type : 'text',
title : '执行优先级',
@@ -106,7 +106,7 @@
{
field : 'planName',
title : '计划名称',
- width : '50%',
+ width : '60%',
class : 'myTDLengthHidden',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -136,7 +136,7 @@
{
field : 'remark',
title : '备注',
- width : '15%',
+ width : '30%',
class : 'myTDLengthHidden',
formatter: function(value, row, index) {
return $.table.tooltip(value);