mp2jpa

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

@@ -45,7 +45,10 @@ public class EngineerServiceImpl implements EngineerService {
     private OrgGroupDao orgGroupDao;
     private OrgGroupDao orgGroupDao;
 
 
     @Autowired
     @Autowired
-    private EngineerBusinessMPDao engineerBusinessDao;
+    private EngineerBusinessMPDao engineerBusinessMPDao;
+
+    @Autowired
+    private EngineerBusinessDao engineerBusinessDao;
 
 
     @Transactional
     @Transactional
     @Override
     @Override
@@ -216,7 +219,7 @@ public class EngineerServiceImpl implements EngineerService {
         wrapper.set(EngineerBusiness::getMaxMinute, minute);
         wrapper.set(EngineerBusiness::getMaxMinute, minute);
         wrapper.set(EngineerBusiness::getVehicle, transportMode);
         wrapper.set(EngineerBusiness::getVehicle, transportMode);
         // 更新字段
         // 更新字段
-        engineerBusinessDao.update(null, wrapper);
+        engineerBusinessMPDao.update(null, wrapper);
 
 
         return Result.success(null);
         return Result.success(null);
     }
     }
@@ -304,15 +307,13 @@ public class EngineerServiceImpl implements EngineerService {
         return map;
         return map;
     }
     }
 
 
-    private HashMap<String, EngineerBusiness> queryEngineerBusiness(List<String> engineerCodes) {
-        HashMap<String, EngineerBusiness> map = new HashMap<>();
+    private HashMap<String, EngineerBusinessEntity> queryEngineerBusiness(List<String> engineerCodes) {
+        HashMap<String, EngineerBusinessEntity> map = new HashMap<>();
         if (engineerCodes.isEmpty()) {
         if (engineerCodes.isEmpty()) {
             return map;
             return map;
         }
         }
-        LambdaQueryWrapper<EngineerBusiness> lqw = new LambdaQueryWrapper<>();
-        lqw.in(EngineerBusiness::getEngineerCode, engineerCodes);
-        List<EngineerBusiness> records = engineerBusinessDao.selectList(lqw);
-        for (EngineerBusiness r : records) {
+        List<EngineerBusinessEntity> records =  engineerBusinessDao.findByEngineerCodeIn(engineerCodes);
+        for (EngineerBusinessEntity r : records) {
             map.put(r.getEngineerCode(), r);
             map.put(r.getEngineerCode(), r);
         }
         }
         return map;
         return map;
@@ -403,12 +404,12 @@ public class EngineerServiceImpl implements EngineerService {
         List<String> groupIds = engineers.stream().map(EngineerInfoEntity::getGroupId).collect(Collectors.toList());
         List<String> groupIds = engineers.stream().map(EngineerInfoEntity::getGroupId).collect(Collectors.toList());
         HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
         HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
 
 
-        HashMap<String, EngineerBusiness> buss = this.queryEngineerBusiness(engineerCodes);
+        HashMap<String, EngineerBusinessEntity> buss = this.queryEngineerBusiness(engineerCodes);
 
 
         List<EngineerBusinessListResp.EngineerBusiness> items = new ArrayList<>();
         List<EngineerBusinessListResp.EngineerBusiness> items = new ArrayList<>();
         for (EngineerInfoEntity e : engineers) {
         for (EngineerInfoEntity e : engineers) {
             EngineerBusinessListResp.EngineerBusiness item = new EngineerBusinessListResp.EngineerBusiness();
             EngineerBusinessListResp.EngineerBusiness item = new EngineerBusinessListResp.EngineerBusiness();
-            EngineerBusiness b = buss.getOrDefault(e.getEngineerCode(), null);
+            EngineerBusinessEntity b = buss.getOrDefault(e.getEngineerCode(), null);
             if(b == null){
             if(b == null){
                 // 若没有配置，则不返回, 由同步程序初始化
                 // 若没有配置，则不返回, 由同步程序初始化
                 continue;
                 continue;