From f7f68dceb2717ed4ca92f71eeb5442e1a45864d1 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Mon, 16 Dec 2024 09:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=95=86=E8=AF=84=E4=BB=B7/?=
 =?UTF-8?q?=E6=A0=B8=E5=BF=83=E4=BA=BA=E5=91=98=E8=AF=84=E4=BB=B7=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=A0=B8=E5=BF=83=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/bmw/team/dao/PersonSettingDao.java   |  2 ++
 .../bmw/team/service/PersonSettingServiceImpl.java |  7 ++++++-
 .../resources/mapper/team/PersonSettingMapper.xml  | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/dao/PersonSettingDao.java b/modules/bmw/src/main/java/com/bonus/bmw/team/dao/PersonSettingDao.java
index a666dc7..d937167 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/team/dao/PersonSettingDao.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/team/dao/PersonSettingDao.java
@@ -71,4 +71,6 @@ public interface PersonSettingDao {
     Boolean selectFormanIsExist(TeamPersonBean o);
 
     int updateTeamForeman(TeamPersonBean o);
+
+    int updateTeamBasicForeman(TeamPersonBean o);
 }
diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/service/PersonSettingServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/team/service/PersonSettingServiceImpl.java
index 35735e0..152b4db 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/team/service/PersonSettingServiceImpl.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/team/service/PersonSettingServiceImpl.java
@@ -12,6 +12,7 @@ import com.bonus.bmw.team.entity.TeamPersonTransferBean;
 import com.bonus.common.core.constant.Constants;
 import com.bonus.common.core.domain.R;
 import com.bonus.common.core.utils.poi.ExcelUtil;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -204,7 +205,11 @@ public class PersonSettingServiceImpl implements PersonSettingService {
             }
         }
         int i = dao.updateTeamForeman(o);
-        return i > 0 ? R.ok(Constants.UPDATE_SUCCESS) : R.fail(Constants.UPDATE_FAIL);
+        if(StringUtils.isNotBlank(o.getIsForeman()) && StringUtils.isNotBlank(o.getIdNumber())) {
+          int j = dao.updateTeamBasicForeman(o);
+          i += j;
+        }
+        return i > 1 ? R.ok(Constants.UPDATE_SUCCESS) : R.fail(Constants.UPDATE_FAIL);
     }
 
 }
diff --git a/modules/bmw/src/main/resources/mapper/team/PersonSettingMapper.xml b/modules/bmw/src/main/resources/mapper/team/PersonSettingMapper.xml
index 43c9838..8c3dd11 100644
--- a/modules/bmw/src/main/resources/mapper/team/PersonSettingMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/team/PersonSettingMapper.xml
@@ -328,5 +328,19 @@
 		where t.is_foreman = 1
 	</select>
 
+	<update id="updateTeamBasicForeman">
+		update bm_sub_team set
+		<if test="isForeman == 1">
+			team_Idnumber = #{idNumber}
+		</if>
+		<if test="isForeman == 0">
+			team_Idnumber = null
+		</if>
+			, update_time = now()
+		where id = (
+			select team_id from bm_team_user_relation
+			where id_number = #{idNumber} and is_active = 1)
+	</update>
+
 
 </mapper>
\ No newline at end of file