在标注任务里修改返回已标注的文件列表需要包含已审核列表
This commit is contained in:
parent
9024d5dbd2
commit
782bb6d7e1
|
|
@ -221,8 +221,8 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService {
|
||||||
task.setAnnotatorId(String.valueOf(userId));
|
task.setAnnotatorId(String.valueOf(userId));
|
||||||
|
|
||||||
if ("1".equals(annotationStatus)) {
|
if ("1".equals(annotationStatus)) {
|
||||||
//已标注文件列表
|
//已标注文件列表包含已审核
|
||||||
task.setFileAnnotationStatus("1");
|
task.setFileAnnotationStatus("1,2");
|
||||||
}else if ("2".equals(annotationStatus)){
|
}else if ("2".equals(annotationStatus)){
|
||||||
//未标注文件列表
|
//未标注文件列表
|
||||||
task.setFileAnnotationStatus("0");
|
task.setFileAnnotationStatus("0");
|
||||||
|
|
|
||||||
|
|
@ -255,9 +255,15 @@
|
||||||
<if test="reviewerId != null and reviewerId != ''">
|
<if test="reviewerId != null and reviewerId != ''">
|
||||||
AND atap.reviewer_id = #{reviewerId}
|
AND atap.reviewer_id = #{reviewerId}
|
||||||
</if>
|
</if>
|
||||||
<if test="fileAnnotationStatus != null and fileAnnotationStatus != '' ">
|
<if test="fileAnnotationStatus != null and fileAnnotationStatus != ''">
|
||||||
AND atap.annotation_status = #{fileAnnotationStatus}
|
AND atap.annotation_status IN
|
||||||
|
<foreach item="status" collection="fileAnnotationStatus.split(',')" open="(" close=")" separator=",">
|
||||||
|
#{status}
|
||||||
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
|
<!-- <if test="fileAnnotationStatus != null and fileAnnotationStatus != '' ">-->
|
||||||
|
<!-- AND atap.annotation_status = #{fileAnnotationStatus}-->
|
||||||
|
<!-- </if>-->
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 根据taskid 和fileid 返回审核驳回的原因-->
|
<!-- 根据taskid 和fileid 返回审核驳回的原因-->
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue