Merge branch 'dev_mp2jpa' into 'develop'

Dev mp2jpa

See merge request !314

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

+package com.dituhui.pea.order.dao;
+
+import com.dituhui.pea.order.entity.EngineerSkillGroupEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupEntity, Integer> {
+	List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
+	List<EngineerSkillGroupEntity> findByEngineerCodeAndStatus(String engineerCode, Integer status);
+	List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatus(List<String> engineerCodes, Integer status);
+	List<EngineerSkillGroupEntity> findBySkillGroupCode(String skillGroupCode);
+	List<EngineerSkillGroupEntity> findBySkillGroupCodeAnd(String skillGroupCode, Integer status);
+}

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

@@ -8,10 +8,13 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.Date;
+import java.util.List;
 
 @Repository
 public interface OrderEventDao extends JpaRepository<OrderEventEntity, Integer> {
 
+    List<OrderEventEntity> findByOrderId(String orderId);
+
     @Query("select a from OrderEventEntity a join OrderInfoEntity b on a.orderId=b.orderId where b.orgClusterId = :clusterId and DATE(a.createTime) = :date")
     Page<OrderEventEntity> findAllByClusterId(String clusterId, Date date, Pageable pageable);
 

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

@@ -10,6 +10,8 @@ import java.util.List;
 public interface OrderInfoDao extends JpaRepository<OrderInfoEntity, Long> {
     OrderInfoEntity getByOrderId(String orderId);
 
+    List<OrderInfoEntity> findByOrderId(String orderId);
+
     List<OrderInfoEntity> findByDtAndEngineerCodeIn(LocalDate date, List<String> engineerCodes);
 
     @Query("SELECT o.orderId, s.skillCategory as skillCaption FROM OrderInfoEntity o  JOIN SkillInfoEntity s on o.brand=s.brand and o.type=s.type and o.skill=s.skill WHERE o.orderId = :orderId")