Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/common/EngineerUtil.java

@@ -63,7 +63,7 @@ public class EngineerUtil {
 
 
     public Page<EngineerInfoEntity> findEngineersByKeyAndPage(List<String> engineerCodes, String key, Integer page, Integer size) {
     public Page<EngineerInfoEntity> findEngineersByKeyAndPage(List<String> engineerCodes, String key, Integer page, Integer size) {
         Pageable pageable = PageRequest.of(page - 1, size);
         Pageable pageable = PageRequest.of(page - 1, size);
-        return engineerInfoDao.findAllByEngineerCodeIn(engineerCodes, buildSpecification(key), pageable);
+        return engineerInfoDao.findAllByEngineerCodeIn(buildSpecification(key), engineerCodes, pageable);
     }
     }
 
 
 
 

project-order/src/main/java/com/dituhui/pea/order/dao/EngineerInfoDao.java

@@ -6,12 +6,13 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
-public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integer> {
+public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integer>, JpaSpecificationExecutor<EngineerInfoEntity> {
     EngineerInfoEntity getByEngineerCode(String engineerCode);
     EngineerInfoEntity getByEngineerCode(String engineerCode);
 
 
     List<EngineerInfoEntity> findByGroupId(String groupId);
     List<EngineerInfoEntity> findByGroupId(String groupId);
@@ -20,5 +21,5 @@ public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integ
 
 
     List<EngineerInfoEntity> findByEngineerCodeIn(List<String> engineerCodes);
     List<EngineerInfoEntity> findByEngineerCodeIn(List<String> engineerCodes);
 
 
-    Page<EngineerInfoEntity> findAllByEngineerCodeIn(List<String> engineerCodes, Specification<EngineerInfoEntity> engineerInfoEntitySpecification, Pageable pageable);
+    Page<EngineerInfoEntity> findAllByEngineerCodeIn(Specification<EngineerInfoEntity> engineerInfoEntitySpecification, List<String> engineerCodes, Pageable pageable);
 }
 }

project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamDetailDTO.java

@@ -47,7 +47,7 @@ public class BusinessTeamDetailDTO {
         /**
         /**
          * 网点指派策略
          * 网点指派策略
          */
          */
-        private String assiginStrategy;
+        private String assignStrategy;
         /**
         /**
          * cutoff时间
          * cutoff时间
          */
          */

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

@@ -246,7 +246,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
         }).collect(Collectors.toList());
         }).collect(Collectors.toList());
         rs.setEngineers(engineers);
         rs.setEngineers(engineers);
         BusinessTeamDetailDTO.ScheduleConfig config = new BusinessTeamDetailDTO.ScheduleConfig();
         BusinessTeamDetailDTO.ScheduleConfig config = new BusinessTeamDetailDTO.ScheduleConfig();
-        config.setAssiginStrategy(teamEntity.getStrategyAppointment())
+        config.setAssignStrategy(teamEntity.getStrategyAppointment())
                 .setCutoffTime(teamEntity.getCuteOff())
                 .setCutoffTime(teamEntity.getCuteOff())
                 .setTransportMode(teamEntity.getTransportMode())
                 .setTransportMode(teamEntity.getTransportMode())
                 .setScheduleStrategy(teamEntity.getStrategySchedule())
                 .setScheduleStrategy(teamEntity.getStrategySchedule())