diff --git a/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java b/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java index 0f7724ad..72264049 100644 --- a/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java +++ b/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java @@ -129,7 +129,7 @@ public class TagDataController { .in(BmsSupplier::getCode,param.getTargetCodeList())); for (BmsSupplier supplier : bmsSuppliers) { TagData data = new TagData(); - data.setTenantId(supplier.getId()); + data.setTargetId(supplier.getId()); data.setTargetCode(supplier.getCode()); data.setTargetName(supplier.getName()); tagDataList.add(data); @@ -148,6 +148,7 @@ public class TagDataController { data.setTagName(tagInfo.getTagName()); data.setTagId(tagInfo.getId()); } + tagDataService.saveBatch(tagDataList); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index 3b80e143..543bbb74 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -283,5 +283,11 @@ public class TbsCostApply implements Serializable { @TableField(exist = false) List changeInfoLogs; + /** + * 选择的标签ID + */ + @TableField(exist = false) + List tagIds; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java index 46cf515c..2d2be233 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java @@ -4,7 +4,9 @@ import java.time.LocalDate; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -104,5 +106,9 @@ public class TbsCostApplyVo implements Serializable { */ private Integer checkState; + /** + * 选择的标签ID + */ + List tagIds; } diff --git a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml index 3403822d..780745cc 100644 --- a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml +++ b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml @@ -143,6 +143,21 @@ #{selectId} ) + + + and tbs_cost_apply.supplier_id in + ( + select target_id from tag_data + where del_flag = 0 + and target_id in + + #{selectId} + + and target_type = 'customer' + group by target_id + ) + + order by tbs_cost_apply.`create_time` DESC