转岗管理相关：人员与班组关联关系映射

blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml

@@ -110,7 +110,7 @@
         SELECT
         ph.ID as ph_id,
         ph.*,
-        bd.DEPT_NAME as DEPT_NAME,
+        bd.TS_NAME as DEPT_NAME,
         cm.id as cm_id,
         cm.ph_id as cm_ph_id,
         cm.certificate_id,
@@ -126,7 +126,7 @@
         ct.astronaut_validity_period as astronaut_validity_period
         FROM MES_POST_HANDLE ph
         LEFT JOIN BLADE_USER bu ON ph.USER_ID = bu.ID
-        LEFT JOIN BLADE_DEPT bd ON ph.DEPT_ID = bd.ID
+        LEFT JOIN BA_TEAM_SET bd ON ph.DEPT_ID = bd.ID
         LEFT JOIN MES_CERTIFICATE_MAINTENANCE cm ON ph.id = cm.ph_id AND cm.is_deleted = 0
         LEFT JOIN MES_CERTIFICATE_TYPE ct ON cm.certificate_id = ct.id AND ct.is_deleted = 0
         WHERE ph.is_deleted = 0

blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml

@@ -95,7 +95,7 @@
         SELECT
         ph.ID as ph_id,
         ph.*,
-        bd.DEPT_NAME as DEPT_NAME,
+        bd.TS_NAME as DEPT_NAME,
         em.id as em_id,
         em.ph_id as em_ph_id,
         em.equipment_id,
@@ -107,7 +107,7 @@
         equipment.mac_spec
         FROM MES_POST_HANDLE ph
         LEFT JOIN BLADE_USER bu ON ph.USER_ID = bu.ID
-        LEFT JOIN BLADE_DEPT bd ON ph.DEPT_ID = bd.ID
+        LEFT JOIN BA_TEAM_SET bd ON ph.DEPT_ID = bd.ID
         LEFT JOIN MES_EQUIPMENT_MAINTENANCE em ON ph.id = em.ph_id AND em.is_deleted = 0
         LEFT JOIN MES_EQUIPMENT equipment ON em.equipment_id = equipment.id AND equipment.is_deleted = 0
         WHERE ph.is_deleted = 0

blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml

@@ -98,10 +98,10 @@
         mph.*, -- 主表所有字段
         bu.REAL_NAME as USER_NAME, -- 用户姓名
         bu.CODE as USER_CODE, -- 用户工号
-        bd.DEPT_NAME as DEPT_NAME -- 班组名称
+        bd.TS_NAME as DEPT_NAME -- 班组名称
         FROM MES_POST_HANDLE mph
         LEFT JOIN BLADE_USER bu ON mph.USER_ID = bu.ID -- 关联用户表
-        LEFT JOIN BLADE_DEPT bd ON mph.DEPT_ID = bd.ID -- 关联部门表
+        LEFT JOIN BA_TEAM_SET bd ON mph.DEPT_ID = bd.ID -- 关联部门表
         WHERE mph.IS_DELETED = 0
         <if test="postHandle.userCode != null and postHandle.userCode != ''">
             AND bu.CODE = #{postHandle.userCode}

blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java

@@ -3,6 +3,8 @@ package org.springblade.desk.jobTransfer.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import jakarta.annotation.Resource;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.basic.pojo.entity.RelTeamSetUser;
+import org.springblade.desk.basic.service.IRelTeamSetUserService;
 import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
 import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
 import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity;
@@ -44,7 +46,7 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
     private ICultivateDetailService iCultivateDetailService;
     private ICertificateMaintenanceService certificateMaintenanceService;
     private IEquipmentMaintenanceService equipmentMaintenanceService;
-
+    private IRelTeamSetUserService relTeamSetUserService;
     @Resource
     public void setICultivateDetailService(ICultivateDetailService iCultivateDetailService) {
         this.iCultivateDetailService = iCultivateDetailService;
@@ -60,6 +62,11 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
         this.equipmentMaintenanceService = equipmentMaintenanceService;
     }
 
+    @Resource
+    public void setRelTeamSetUserService(IRelTeamSetUserService relTeamSetUserService) {
+        this.relTeamSetUserService = relTeamSetUserService;
+    }
+
     @Override
     public IPage<PostHandleVO> selectPostHandlePage(IPage<PostHandleVO> page, PostHandleQuery postHandleQuery) {
 //		return page.setRecords(baseMapper.selectPostHandlePage(page, postHandle));
@@ -227,7 +234,10 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
             // 存在重复的用户code，返回错误信息。假设R是统一的返回结果类
             return R.fail("导入数据中存在重复的工号：" + duplicateCodes);
         }
-        List<PostHandleEntity> list = postHandleImports.stream().map(this::convertSingle).collect(Collectors.toList());
+        //获取用户与班组对应关系
+        List<RelTeamSetUser> relTeamSetUsers = relTeamSetUserService.list();
+        Map<Long, Long> relTeamSetUserMap = relTeamSetUsers.stream().collect(Collectors.toMap(item -> item.getUserId(), item -> item.getTeamSetId()));
+        List<PostHandleEntity> list = postHandleImports.stream().map((PostHandleImport excel) -> convertSingle(excel, relTeamSetUserMap)).collect(Collectors.toList());
         //获取全部用户id，对比PostHandleEntity已有数据，不允许重复添加
         List<Long> ids = list.stream().map(PostHandleEntity::getUserId)
                 .collect(Collectors.toList());
@@ -287,7 +297,7 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
     /**
      * 转换单个对象
      */
-    private PostHandleEntity convertSingle(PostHandleImport excel) {
+    private PostHandleEntity convertSingle(PostHandleImport excel, Map<Long, Long> map) {
         PostHandleEntity entity = new PostHandleEntity();
         // 核心：属性拷贝，两个类的字段名和类型必须一致
         BeanUtils.copyProperties(excel, entity);
@@ -302,7 +312,7 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
         }
         entity.setUserId(userByCode.getUser().getId());
         entity.setName(userByCode.getUser().getRealName());
-        entity.setDeptId(Long.valueOf(userByCode.getUser().getDeptId()));
+        entity.setDeptId(map.get(userByCode.getUser().getId()));
         //技能等级
         entity.setSkill(SkillEnum.of(excel.getSkillName()).getCode().shortValue());
         //婚姻状态