test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 修改任务中心下次执行时间排序报错的缺陷 

--bug=1039584 --user=王孝刚 【项目/组织/系统任务中心】定时任务列表-下次执行时间排序报SQL异常
https://www.tapd.cn/55049933/s/1499639
This commit is contained in:
wxg0103 2024-04-17 13:57:15 +08:00 committed by Craftsman
parent cab1b4d1e0
commit fe9d313c2a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
View File

@ -149,7 +149,7 @@
</foreach> </foreach>
</when> </when>
<when test="key=='organizationIds'"> <when test="key=='organizationIds'">
and project.organization_id in and api_report.organization_id in
<foreach collection="values" item="value" separator="," open="(" close=")"> <foreach collection="values" item="value" separator="," open="(" close=")">
#{value} #{value}
</foreach> </foreach>
@ -171,6 +171,7 @@
ar.create_user AS operationName, ar.create_user AS operationName,
ar.trigger_mode, ar.trigger_mode,
ar.start_time, ar.start_time,
project.organization_id,
CASE CASE
WHEN ar.integrated = 0 THEN WHEN ar.integrated = 0 THEN

3
backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
View File

@ -151,6 +151,7 @@
asr.trigger_mode, asr.trigger_mode,
asr.script_identifier, asr.script_identifier,
asr.start_time, asr.start_time,
project.organization_id,
CASE CASE
WHEN asr.integrated = 0 THEN WHEN asr.integrated = 0 THEN
@ -293,7 +294,7 @@
</foreach> </foreach>
</when> </when>
<when test="key=='organizationIds'"> <when test="key=='organizationIds'">
and project.organization_id in and api_scenario_report.organization_id in
<foreach collection="values" item="value" separator="," open="(" close=")"> <foreach collection="values" item="value" separator="," open="(" close=")">
#{value} #{value}
</foreach> </foreach>

2
backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="io.metersphere.system.mapper.ExtScheduleMapper"> <mapper namespace="io.metersphere.system.mapper.ExtScheduleMapper">
<select id="taskCenterSchedulelist" resultType="io.metersphere.system.dto.taskcenter.TaskCenterScheduleDTO"> <select id="taskCenterSchedulelist" resultType="io.metersphere.system.dto.taskcenter.TaskCenterScheduleDTO">
select task.*, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS nextTime from ( select task.*, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time from (
<if test="request.scheduleTagType == 'API_IMPORT'"> <if test="request.scheduleTagType == 'API_IMPORT'">
SELECT SELECT
schedule.id, schedule.id,