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 + + update bm_sub_team set + + team_Idnumber = #{idNumber} + + + team_Idnumber = null + + , update_time = now() + where id = ( + select team_id from bm_team_user_relation + where id_number = #{idNumber} and is_active = 1) + + \ No newline at end of file