diff --git a/src/main/resources/mapper/ZtReleaseDetailsMapper.xml b/src/main/resources/mapper/ZtReleaseDetailsMapper.xml index 1597596..75ba9ce 100644 --- a/src/main/resources/mapper/ZtReleaseDetailsMapper.xml +++ b/src/main/resources/mapper/ZtReleaseDetailsMapper.xml @@ -153,7 +153,7 @@ left join zt_storyspec sp on s.id = sp.story where 1=1 and s.status='active' - and stage in ('wait','projected','developing','developed','testing','tested') + and stage in ('wait','projected','developing','developed','testing','tested','productWaitVerified','productVerified') and s.id in diff --git a/src/main/resources/mapper/ZtStoryMapper.xml b/src/main/resources/mapper/ZtStoryMapper.xml index 17a62db..eed7f83 100644 --- a/src/main/resources/mapper/ZtStoryMapper.xml +++ b/src/main/resources/mapper/ZtStoryMapper.xml @@ -1378,7 +1378,8 @@ #{id} ) planReleaseStoryNum, (SELECT count(1) waitRelease from zt_story - WHERE plan_end_date >=#{startTime} and plan_end_date <=#{endTime} and releasedDate >=#{startTime} + WHERE plan_end_date >=#{startTime} and plan_end_date <=#{endTime} + and releasedDate <=plan_end_date and releasedDate <=#{endTime} and status not in ('closed') AND product in