fix(系统设置): 修复任务中心筛选有问题的缺陷

--bug=1038927 --user=王孝刚 【项目任务中心】实时任务-接口用例-模糊搜索内容不正确
https://www.tapd.cn/55049933/s/1492239
This commit is contained in:
wxg0103 2024-04-09 20:43:42 +08:00 committed by 刘瑞斌
parent 2022245d00
commit 6bfe966372
7 changed files with 28 additions and 10 deletions

View File

@ -161,6 +161,11 @@
CASE CASE
WHEN api_report.integrated = 0 THEN WHEN api_report.integrated = 0 THEN
c.num ELSE api_report.id c.num ELSE api_report.id
END AS resourceNum,
CASE
WHEN api_report.integrated = 0 THEN
c.id ELSE api_report.id
END AS resourceId, END AS resourceId,
CASE CASE
@ -182,9 +187,10 @@
#{projectId} #{projectId}
</foreach> </foreach>
<if test="request.keyword != null and request.keyword != ''"> <if test="request.keyword != null and request.keyword != ''">
and ( and ( (api_report.name like concat('%', #{request.keyword},'%')
api_report.name like concat('%', #{request.keyword},'%') and c.name like concat('%', #{request.keyword},'%'))
or c.name like concat('%', #{request.keyword},'%') or (api_report.id like concat('%', #{request.keyword},'%')
and c.num like concat('%', #{request.keyword},'%'))
) )
</if> </if>
<include refid="filters"> <include refid="filters">

View File

@ -152,13 +152,18 @@
CASE CASE
WHEN api_scenario_report.integrated = 0 THEN WHEN api_scenario_report.integrated = 0 THEN
s.num ELSE api_scenario_report.id s.num ELSE api_scenario_report.id
END AS resourceId, END AS resourceNum,
CASE CASE
WHEN api_scenario_report.integrated = 0 THEN WHEN api_scenario_report.integrated = 0 THEN
s.NAME ELSE api_scenario_report.NAME s.NAME ELSE api_scenario_report.NAME
END AS resourceName, END AS resourceName,
CASE
WHEN api_scenario_report.integrated = 0 THEN
s.id ELSE api_scenario_report.id
END AS resourceId,
t.name as poolName t.name as poolName
from api_scenario_report from api_scenario_report
left join api_scenario_record a on api_scenario_report.id = a.api_scenario_report_id left join api_scenario_record a on api_scenario_report.id = a.api_scenario_report_id
@ -173,8 +178,10 @@
</foreach> </foreach>
<if test="request.keyword != null and request.keyword != ''"> <if test="request.keyword != null and request.keyword != ''">
and ( and (
api_scenario_report.name like concat('%', #{request.keyword},'%') (api_scenario_report.name like concat('%', #{request.keyword},'%')
or s.name like concat('%', #{request.keyword},'%') and s.name like concat('%', #{request.keyword},'%'))
or (api_scenario_report.id like concat('%', #{request.keyword},'%')
and s.num like concat('%', #{request.keyword},'%'))
) )
</if> </if>
<include refid="filters"> <include refid="filters">

View File

@ -31,6 +31,9 @@ public class TaskCenterDTO implements Serializable {
@Schema(description = "资源Id 单独报告显示模块业务id 集合报告显示报告id") @Schema(description = "资源Id 单独报告显示模块业务id 集合报告显示报告id")
private String resourceId; private String resourceId;
@Schema(description = "资源编号 单独报告显示模块编号 集合报告显示报告编号")
private String resourceNum;
@Schema(description = "资源名称 单独报告显示模块名称 集合报告显示报告名称") @Schema(description = "资源名称 单独报告显示模块名称 集合报告显示报告名称")
private String resourceName; private String resourceName;

View File

@ -50,7 +50,7 @@
and ( and (
task.resource_name like concat('%', #{request.keyword},'%') task.resource_name like concat('%', #{request.keyword},'%')
or or
task.resource_id like concat('%', #{request.keyword},'%') task.resource_num like concat('%', #{request.keyword},'%')
) )
</if> </if>
<include refid="taskCenterScheduleFilters"> <include refid="taskCenterScheduleFilters">

View File

@ -13,6 +13,7 @@ import io.metersphere.system.dto.taskcenter.TaskCenterScheduleDTO;
import io.metersphere.system.dto.taskcenter.enums.ScheduleTagType; import io.metersphere.system.dto.taskcenter.enums.ScheduleTagType;
import io.metersphere.system.dto.taskcenter.request.TaskCenterSchedulePageRequest; import io.metersphere.system.dto.taskcenter.request.TaskCenterSchedulePageRequest;
import io.metersphere.system.mapper.*; import io.metersphere.system.mapper.*;
import io.metersphere.system.schedule.BaseScheduleJob;
import io.metersphere.system.schedule.ScheduleService; import io.metersphere.system.schedule.ScheduleService;
import io.metersphere.system.utils.PageUtils; import io.metersphere.system.utils.PageUtils;
import io.metersphere.system.utils.Pager; import io.metersphere.system.utils.Pager;
@ -206,7 +207,7 @@ public class TaskCenterService {
schedule.setEnable(!schedule.getEnable()); schedule.setEnable(!schedule.getEnable());
scheduleService.editSchedule(schedule); scheduleService.editSchedule(schedule);
scheduleService.addOrUpdateCronJob(schedule, new JobKey(schedule.getKey(), schedule.getJob()), scheduleService.addOrUpdateCronJob(schedule, new JobKey(schedule.getKey(), schedule.getJob()),
new TriggerKey(schedule.getKey(),schedule.getJob()), schedule.getJob().getClass()); new TriggerKey(schedule.getKey(),schedule.getJob()), BaseScheduleJob.class);
} }

View File

@ -5,6 +5,7 @@ export interface RealTaskCenterApiCaseItem {
projectId: string; projectId: string;
id: string; id: string;
resourceId: string; resourceId: string;
resourceNum: number; // 资源业务id
resourceName: string; // 资源名称 单独报告显示模块名称 集合报告显示报告名称 resourceName: string; // 资源名称 单独报告显示模块名称 集合报告显示报告名称
triggerMode: string; // 触发模式(手动,定时,批量,测试计划) triggerMode: string; // 触发模式(手动,定时,批量,测试计划)
poolName: string; // 资源池名称 poolName: string; // 资源池名称

View File

@ -193,8 +193,8 @@
const columns: MsTableColumn = [ const columns: MsTableColumn = [
{ {
title: 'project.taskCenter.resourceID', title: 'project.taskCenter.resourceID',
dataIndex: 'resourceId', dataIndex: 'resourceNum',
slotName: 'resourceId', slotName: 'resourceNum',
width: 200, width: 200,
showTooltip: true, showTooltip: true,
showDrag: false, showDrag: false,