画像及公共标签
This commit is contained in:
parent
bf28fd557c
commit
504f036599
@ -294,8 +294,8 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
|
||||
if (StringUtils.isBlank(portraitSnVO.getPortraitSn())) {
|
||||
portraitSnVO.setPortraitSn(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")));
|
||||
portraitSnVO.getGroupingValues().forEach(item -> item.setPortraitSn(portraitSnVO.getPortraitSn()));
|
||||
groupingValues.addAll(portraitSnVO.getGroupingValues());
|
||||
}
|
||||
groupingValues.addAll(portraitSnVO.getGroupingValues());
|
||||
TimeUnit.MILLISECONDS.sleep(10);
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
|
||||
@ -75,7 +75,7 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
int i = 1;
|
||||
//查询细分
|
||||
//根据细分id查询细分标签
|
||||
List<LabelFieldVO> labelFieldList = labelFieldInfoMapper.selectLabelFieldList(taskPartitionDictId, fieldType);
|
||||
List<Long> taskPartitionDictIds = labelFieldList.stream().filter(Objects::nonNull).map(LabelFieldVO::getTaskPartitionDictId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
|
||||
if (taskPartitionDictIds.size() == 0) {
|
||||
|
||||
@ -71,10 +71,13 @@
|
||||
LEFT JOIN task_type_dict ttd ON ttd.id = tpd.task_type_id
|
||||
<where>
|
||||
<if test="fieldType != null and fieldType != ''">
|
||||
lfi.field_type = #{fieldType}
|
||||
and lfi.field_type = #{fieldType}
|
||||
</if>
|
||||
<if test="taskPartitionDictId != null">
|
||||
tpd.id = #{taskPartitionDictId}
|
||||
and tpd.id = #{taskPartitionDictId}
|
||||
</if>
|
||||
<if test="taskPartitionDictId != null">
|
||||
or tpd.apply_range = 'PUBLIC'
|
||||
</if>
|
||||
</where>
|
||||
group by task_partition_dict_id
|
||||
|
||||
Loading…
Reference in New Issue
Block a user