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

fix(工作台): 解决工作台相关问题 

--user=郭雨琦
--bug=1015035
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001015035
--bug=1015022
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001015022
--bug=1015006
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001015006
--bug=1014979
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001014979
--bug=1014973
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001014973
--bug=1014971
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001014971
--bug=1014963
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001014963
--bug=1014956
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001014956
This commit is contained in:
guoyuqi 2022-07-19 18:51:48 +08:00 committed by xiaomeinvG
parent 0856005aa5
commit fa6a096d7c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
View File

@ -147,9 +147,11 @@ public class ApiTestCaseService {
public List<ApiTestCaseDTO> listSimple(ApiTestCaseRequest request) {
request = this.initRequest(request, true, true);
if (request.getToBeUpdated() != null && request.getToBeUpdated()) {
Long toBeUpdatedTime = getToBeUpdatedTime(request.getProjectId());
if (toBeUpdatedTime != null) {
request.setToBeUpdateTime(toBeUpdatedTime);
if (request.getProjectId() != null) {
Long toBeUpdatedTime = getToBeUpdatedTime(request.getProjectId());
if (toBeUpdatedTime != null) {
request.setToBeUpdateTime(toBeUpdatedTime);
}
}
}
List<ApiTestCaseDTO> apiTestCases = extApiTestCaseMapper.listSimple(request);

4
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
View File

@ -751,10 +751,10 @@
<if test="request.moduleId != null">
AND api_definition.module_id = #{request.moduleId}
</if>
<if test="request.toBeUpdated != null">
<if test="request.toBeUpdated != null and request.toBeUpdated==true">
AND api_definition.to_be_updated = #{request.toBeUpdated}
</if>
<if test="request.toBeUpdateTime != null">
<if test="request.toBeUpdated != null and request.toBeUpdated==true and request.toBeUpdateTime != null">
AND api_definition.to_be_update_time >= #{request.toBeUpdateTime}
</if>
<if test="request.notInIds != null and request.notInIds.size() > 0">

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
View File

@ -505,7 +505,7 @@
<if test="request.toBeUpdated !=null and request.toBeUpdated == true">
and (t1.to_be_updated = #{request.toBeUpdated} or t3.status = 'error')
</if>
<if test="request.toBeUpdateTime !=null">
<if test="request.toBeUpdated !=null and request.toBeUpdated == true and request.toBeUpdateTime !=null">
and (t1.to_be_update_time >= #{request.toBeUpdateTime})
</if>
<include refid="queryVersionCondition">