From 8375e9e25800cde987dcccfa0af7e79346bbf088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?=
 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Date: Thu, 29 Jan 2026 09:50:34 +0000
Subject: [PATCH] Merge #35 into master from cc_20260128_fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat:PC端分配装修团队列表：查询条件：支持“施工团队”查询

* cc_20260128_fix: (1 commits squashed)

  - feat:PC端分配装修团队列表：查询条件：支持“施工团队”查询

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/35
---
 .../mapper/decoration/ShopDecorationAssignMapper.xml          | 4 ++++
 .../cool/store/request/decoration/DecorationListRequest.java  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/decoration/ShopDecorationAssignMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/decoration/ShopDecorationAssignMapper.xml
index ef36ac7e5..f4fd31177 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/decoration/ShopDecorationAssignMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/decoration/ShopDecorationAssignMapper.xml
@@ -52,6 +52,9 @@
       <if test="decorationDescStatus != null">
         AND zsda.decoration_desc_status = #{decorationDescStatus}
       </if>
+      <if test="teamId != null">
+        AND zsda.decoration_team_id = #{teamId}
+      </if>
       <if test="wantShopAreaIds != null and wantShopAreaIds.size() > 0">
         and b.want_shop_area_id in
         <foreach collection="wantShopAreaIds" item="item" separator="," open="(" close=")">
@@ -59,6 +62,7 @@
         </foreach>
       </if>
     </where>
+    order by decoration_desc_status asc , updated_time desc
   </select>
 
 
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/decoration/DecorationListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/decoration/DecorationListRequest.java
index 328e96bb8..bed84411c 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/decoration/DecorationListRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/decoration/DecorationListRequest.java
@@ -35,4 +35,7 @@ public class DecorationListRequest extends PageBasicInfo {
     @ApiModelProperty("门店装修分配状态")
     private Integer decorationDescStatus;
 
+    @ApiModelProperty("装修团队ID")
+    private Long teamId;
+
 }