bonus
/
smart_platform_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
LHD_HY 2026-02-06 09:08:52 +08:00
parent 7782d7d195
commit ab663eec14
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-admin/src/main/java/com/bonus/web/service/data/LabelService.java
View File

@ -287,7 +287,7 @@ public class LabelService {
.mapToInt(Integer::intValue) .mapToInt(Integer::intValue)
.sum(); .sum();
if (sum > 0) { if (sum > 0) {
return AjaxResult.error("团队被关联使用，无法删除"); return AjaxResult.error("标签被关联使用，无法删除");
} }
} }
// 2.删除标签数据 // 2.删除标签数据

8
bonus-data/src/main/resources/mapper/DIAuditMapper.xml
View File

@ -213,7 +213,7 @@
<select id="getAuditPictures" parameterType="com.bonus.common.domain.data.dto.LabelingTaskDto" resultMap="LabelingTaskVoResult"> <select id="getAuditPictures" parameterType="com.bonus.common.domain.data.dto.LabelingTaskDto" resultMap="LabelingTaskVoResult">
SELECT SELECT
tls.labeling_sample_id,tls.is_invalid_data,tls.dataset_sample_id,t1.file_path, tls.labeling_sample_id,tls.is_invalid_data,tls.dataset_sample_id,t1.file_path,
tld.label_id,tld.labeling_color,tld.labeling_coordinate,tld.box_type,tld.text_content t2.label_id,t2.labeling_color,t2.labeling_coordinate,t2.box_type,t2.text_content,t2.label_name
FROM tb_labeling_sample tls FROM tb_labeling_sample tls
LEFT JOIN ( LEFT JOIN (
SELECT tds.sample_id,tds.dataset_sample_id,ts.file_path SELECT tds.sample_id,tds.dataset_sample_id,ts.file_path
@ -221,8 +221,12 @@
LEFT JOIN tb_sample ts ON ts.sample_id = tds.sample_id LEFT JOIN tb_sample ts ON ts.sample_id = tds.sample_id
WHERE ts.del_flag = '0' WHERE ts.del_flag = '0'
) t1 ON t1.dataset_sample_id = tls.dataset_sample_id ) t1 ON t1.dataset_sample_id = tls.dataset_sample_id
LEFT JOIN tb_labeling_data tld ON tld.labeling_sample_id = tls.labeling_sample_id
LEFT JOIN tb_labeling_sample_audit_record tlsar ON tlsar.labeling_sample_id = tls.labeling_sample_id LEFT JOIN tb_labeling_sample_audit_record tlsar ON tlsar.labeling_sample_id = tls.labeling_sample_id
LEFT JOIN
(SELECT tld.label_id,tld.labeling_color,tld.labeling_sample_id,tld.labeling_coordinate,tld.box_type,tld.text_content,tl.label_name
FROM tb_labeling_data tld
LEFT JOIN tb_label tl ON tl.label_id = tld.label_id
) t2 ON t2.labeling_sample_id = tls.labeling_sample_id
WHERE tls.del_flag = '0' WHERE tls.del_flag = '0'
AND tlsar.audit_node = #{labelingTaskNode} AND tlsar.audit_node = #{labelingTaskNode}
AND tls.labeling_status ='1' AND tls.labeling_status ='1'

3
bonus-data/src/main/resources/mapper/DLabelMapper.xml
View File

@ -110,7 +110,8 @@
update_time AS updateTime, update_time AS updateTime,
create_time AS createTime create_time AS createTime
FROM tb_label FROM tb_label
WHERE label_group_id = #{labelGroupId} WHERE del_flag = '0'
AND label_group_id = #{labelGroupId}
<if test="labelName != null and labelName != ''"> <if test="labelName != null and labelName != ''">
AND label_name LIKE CONCAT('%', #{labelName}, '%') AND label_name LIKE CONCAT('%', #{labelName}, '%')
</if> </if>