转岗使用部门

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

@@ -113,7 +113,7 @@
         SELECT
         ph.ID as ph_id,
         ph.*,
-        bd.TS_NAME as DEPT_NAME,
+        bd.DEPT_NAME as DEPT_NAME,
         cm.id as cm_id,
         cm.ph_id as cm_ph_id,
         cm.create_time as cm_create_time,
@@ -130,7 +130,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 BS_TEAM_SET bd ON ph.DEPT_ID = bd.ID
+        LEFT JOIN BLADE_DEPT 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 and ph.staff_type != 1

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

@@ -97,7 +97,7 @@
         SELECT
         ph.ID as ph_id,
         ph.*,
-        bd.TS_NAME as DEPT_NAME,
+        bd.DEPT_NAME as DEPT_NAME,
         em.id as em_id,
         em.ph_id as em_ph_id,
         em.equipment_id,
@@ -109,7 +109,7 @@
         equipment.mac_spec
         FROM MES_POST_HANDLE ph
         LEFT JOIN BLADE_USER bu ON ph.USER_ID = bu.ID
-        LEFT JOIN BS_TEAM_SET bd ON ph.DEPT_ID = bd.ID
+        LEFT JOIN BLADE_DEPT 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 and ph.staff_type != 1

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

@@ -102,10 +102,10 @@
         mph.*, -- 主表所有字段
         bu.REAL_NAME as USER_NAME, -- 用户姓名
         bu.CODE as USER_CODE, -- 用户工号
-        bd.TS_NAME as DEPT_NAME -- 班组名称
+        bd.DEPT_NAME as DEPT_NAME -- 班组名称
         FROM MES_POST_HANDLE mph
         LEFT JOIN BLADE_USER bu ON mph.USER_ID = bu.ID -- 关联用户表
-        LEFT JOIN BS_TEAM_SET bd ON mph.DEPT_ID = bd.ID -- 关联部门表
+        LEFT JOIN BLADE_DEPT 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

@@ -232,9 +232,11 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
             return R.fail("导入数据中存在重复的工号：" + duplicateCodes);
         }
         //获取用户与班组对应关系
-        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());
+        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());
@@ -298,7 +300,7 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
     /**
      * 转换单个对象
      */
-    private PostHandleEntity convertSingle(PostHandleImport excel, Map<Long, Long> map) {
+    private PostHandleEntity convertSingle(PostHandleImport excel) {
         PostHandleEntity entity = new PostHandleEntity();
         // 核心：属性拷贝，两个类的字段名和类型必须一致
         BeanUtils.copyProperties(excel, entity);
@@ -313,7 +315,7 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
         }
         entity.setUserId(userByCode.getUser().getId());
         entity.setName(userByCode.getUser().getRealName());
-        entity.setDeptId(map.get(userByCode.getUser().getId()));
+        entity.setDeptId(Long.valueOf(userByCode.getUser().getDeptId()));
         //技能等级
         entity.setSkill(SkillEnum.of(excel.getSkillName()).getCode().shortValue());
         //婚姻状态