From 32815ac478c80b0776841dfecfd0e2307611014c Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Sat, 12 Oct 2024 08:49:46 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/common/entity/bracelet/vo/ShboxVo.java    | 5 +++++
 .../src/main/resources/mapper/bracelet/BraceletMapper.xml    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java
index b5bddff..6ef7c77 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java
@@ -91,4 +91,9 @@ public class ShboxVo
      */
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private Long updateUser = SecurityUtils.getUserId();
+
+    /**
+     * 班组id
+     */
+    private int teamId;
 }
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml
index f8ffc5b..8eb5153 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml
@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getShboxallLists" resultType="com.bonus.common.entity.bracelet.vo.ShboxVo">
         select * from (
         select tsb.id as shboxId,tsb.box_code as shboxCode,tsb.box_name as shboxName,count(tb.id) as shboxBindNum,
-        tsb.box_capacity as shboxCapacity,twt.team_leader as lyName,
+        tsb.box_capacity as shboxCapacity,twt.team_leader as lyName,tsb.team_id as teamId,
         case
         when twt.team_leader is not null and twt.team_leader != '' then tsb.team_id = 0 and tsb.team_id
         else 1
@@ -450,4 +450,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
         order by tb.id ASC
     </select>
-</mapper>
\ No newline at end of file
+</mapper>