修改

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

@@ -46,6 +46,9 @@ public class EngineerServiceImpl implements EngineerService {
     private EngineerSkillGroupMPDao engineerSkillGroupMPDao;
 
     @Autowired
+    private EngineerSkillGroupDao engineerSkillGroupDao;
+
+    @Autowired
     private OrgGroupDao orgGroupDao;
 
     @Autowired
@@ -135,9 +138,13 @@ public class EngineerServiceImpl implements EngineerService {
         // 更新技术员技能
 
         // 先将所有技能更新为0-不可用状态
-        LambdaUpdateWrapper<EngineerSkillGroup> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(EngineerSkillGroup::getEngineerCode, engineerCode).set(EngineerSkillGroup::getStatus, 0);
-        engineerSkillGroupMPDao.update(null, wrapper);
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+        CriteriaUpdate<EngineerSkillGroupEntity> update = cb.createCriteriaUpdate(EngineerSkillGroupEntity.class);
+        Root<EngineerSkillGroupEntity> root = update.from(EngineerSkillGroupEntity.class);
+        update.set(root.get("status"), 0);
+        update.where(cb.equal(root.get("engineerCode"), engineerCode));
+        entityManager.createQuery(update).executeUpdate();
+
         if (skillGroupIds.isEmpty()) {
             return null;
         }
@@ -214,8 +221,8 @@ public class EngineerServiceImpl implements EngineerService {
 
         // 技术员业务属性配置修改
         CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-        CriteriaUpdate<EngineerBusiness> update = cb.createCriteriaUpdate(EngineerBusiness.class);
-        Root<EngineerBusiness> root = update.from(EngineerBusiness.class);
+        CriteriaUpdate<EngineerBusinessEntity> update = cb.createCriteriaUpdate(EngineerBusinessEntity.class);
+        Root<EngineerBusinessEntity> root = update.from(EngineerBusinessEntity.class);
         update.set(root.get("maxNum"), maxNum);
         update.set(root.get("departure"), departure);
         update.set(root.get("priority"), priority);
@@ -285,7 +292,6 @@ public class EngineerServiceImpl implements EngineerService {
 
     private HashMap<String, List<String>> queryEngineerSkills(List<String> engineerCodes, List<Integer> statuses) {
         // 获取engineerCode对应的技能表, HashMap<engineerCode, List<skillId>>
-
         HashMap<String, List<String>> map = new HashMap<>();
         if (engineerCodes.isEmpty()) {
             return map;