fix：甘特图取消筛选工程师

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerGanttServiceImpl.java

@@ -180,19 +180,19 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
             // 最后，还需要根据key进行过滤（需要结合数据库表）
             // 最后，还需要根据key进行过滤（需要结合数据库表）
             engineerCodes = engineerUtils.filterEngineersByKey(engineerCodes, key).stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toList());
             engineerCodes = engineerUtils.filterEngineersByKey(engineerCodes, key).stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toList());
         }
         }
-        if (CollectionUtils.isNotEmpty(orderIds)) {
-            List<OrderInfoEntity> infoEntities = orderInfoDao.findAllByOrderIdIn(orderIds);
-            Set<String> skillGroupCodes = Sets.newConcurrentHashSet();
-            for (OrderInfoEntity orderInfo : infoEntities) {
-                //查询对应的技能信息
-                SkillInfoEntity skill = skillInfoDao.getByBrandAndTypeAndSkill(orderInfo.getBrand(), orderInfo.getType(), orderInfo.getSkill());
-                if (Objects.isNull(skill)) {
-                    throw new BusinessException("查询不到对应的技能组信息:" + String.join(",", orderInfo.getType(), orderInfo.getSkill()));
-                }
-                skillGroupCodes.add(skill.getSkillGroupCode());
-            }
-            engineerCodes = engineerInfoDao.findByEngineerCodesBySkillCodes(engineerCodes, skillGroupCodes);
-        }
+        // if (CollectionUtils.isNotEmpty(orderIds)) {
+        //     List<OrderInfoEntity> infoEntities = orderInfoDao.findAllByOrderIdIn(orderIds);
+        //     Set<String> skillGroupCodes = Sets.newConcurrentHashSet();
+        //     for (OrderInfoEntity orderInfo : infoEntities) {
+        //         //查询对应的技能信息
+        //         SkillInfoEntity skill = skillInfoDao.getByBrandAndTypeAndSkill(orderInfo.getBrand(), orderInfo.getType(), orderInfo.getSkill());
+        //         if (Objects.isNull(skill)) {
+        //             throw new BusinessException("查询不到对应的技能组信息:" + String.join(",", orderInfo.getType(), orderInfo.getSkill()));
+        //         }
+        //         skillGroupCodes.add(skill.getSkillGroupCode());
+        //     }
+        //     engineerCodes = engineerInfoDao.findByEngineerCodesBySkillCodes(engineerCodes, skillGroupCodes);
+        // }
 
 
         return engineerCodes;
         return engineerCodes;
     }
     }

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderAssignImpl.java

@@ -206,16 +206,15 @@ public class OrderAssignImpl implements OrderAssign {
         OrgTeamEntity orgTeam = orgTeamDao.getByTeamId(order.getOrgTeamId());
         OrgTeamEntity orgTeam = orgTeamDao.getByTeamId(order.getOrgTeamId());
         // 判断cutoff
         // 判断cutoff
         Integer cutoff = CommonUtil.isCutoff(order.getExpectTimeBegin(), orgTeam.getWorkOff());
         Integer cutoff = CommonUtil.isCutoff(order.getExpectTimeBegin(), orgTeam.getWorkOff());
+        order.setAppointmentStatus(OrderFlowEnum.INIT.name());
+        order.setServiceStatus(OrderFlowEnum.INIT.name());
         if (cutoff > 0) {
         if (cutoff > 0) {
             // cutoff更新order_request表为人工指派
             // cutoff更新order_request表为人工指派
-            order.setAppointmentStatus(AppointmentMethodEnum.MANUAL.name());
-            order.setServiceStatus(OrderFlowEnum.INIT.name());
+            order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
             order = OrderUtil.handleErrorOrder(order);
             order = OrderUtil.handleErrorOrder(order);
             order.setIsCutoff(cutoff);
             order.setIsCutoff(cutoff);
         } else {
         } else {
             // 更新order_request表为未指派
             // 更新order_request表为未指派
-            order.setAppointmentStatus(OrderFlowEnum.INIT.name());
-            order.setServiceStatus(OrderFlowEnum.INIT.name());
             order = OrderUtil.handleErrorOrder2(order);
             order = OrderUtil.handleErrorOrder2(order);
         }
         }
         orderInfoDao.save(order);
         orderInfoDao.save(order);

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -909,7 +909,7 @@ public class UserService {
         }
         }
         byUserId.forEach(e -> {
         byUserId.forEach(e -> {
             OrgInfo orgInfo = new OrgInfo();
             OrgInfo orgInfo = new OrgInfo();
-            orgInfo.setId(e.getId());
+            orgInfo.setId(e.getOrgId());
             orgInfo.setOrgLevel(e.getOrgLevel());
             orgInfo.setOrgLevel(e.getOrgLevel());
             orgInfos.add(orgInfo);
             orgInfos.add(orgInfo);
         });
         });