From 263f1f3aee66528d219afc2e5dcffde524c0a6b0 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Fri, 12 Jul 2024 11:31:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/tag/controller/TagDataController.java |  3 ++-
 .../qs/serve/modules/tbs/entity/TbsCostApply.java |  6 ++++++
 .../modules/tbs/entity/vo/TbsCostApplyVo.java     |  6 ++++++
 .../resources/mapper/tbs/TbsCostApplyMapper.xml   | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

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<String> 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<String> 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}
             </foreach> )
         </if>
+
+        <if test="query.tagIds!=null and query.tagIds.size > 0">
+          and tbs_cost_apply.supplier_id in
+          (
+            select target_id from tag_data
+            where del_flag = 0
+            and target_id in
+            <foreach collection="query.tagIds" item="selectId" index="i" open="(" close=")" separator=",">
+                #{selectId}
+            </foreach>
+            and target_type = 'customer'
+            group by target_id
+          )
+        </if>
+
         order by tbs_cost_apply.`create_time` DESC
 
     </select>