feat: 费用申请添加标签查询

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();
     }
 

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;
+
 }
 

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;
 }
 

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>