Merge branch 'dev_mp2jpa' into 'develop'

Dev mp2jpa

See merge request !316

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

@@ -8,8 +8,8 @@ import java.util.List;
 
 
 public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupEntity, Integer> {
 public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupEntity, Integer> {
 	List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
 	List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
-	List<EngineerSkillGroupEntity> findByEngineerCodeAndStatus(String engineerCode, Integer status);
-	List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatus(List<String> engineerCodes, Integer status);
+	List<EngineerSkillGroupEntity> findByEngineerCodeAndStatus(String engineerCode, boolean status);
+	List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatus(List<String> engineerCodes, boolean status);
 	List<EngineerSkillGroupEntity> findBySkillGroupCode(String skillGroupCode);
 	List<EngineerSkillGroupEntity> findBySkillGroupCode(String skillGroupCode);
-	List<EngineerSkillGroupEntity> findBySkillGroupCodeAndStatus(String skillGroupCode, Integer status);
+	List<EngineerSkillGroupEntity> findBySkillGroupCodeAndStatus(String skillGroupCode, boolean status);
 }
 }

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

@@ -217,7 +217,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 		if (egCodes.isEmpty()) {
 		if (egCodes.isEmpty()) {
 			return map;
 			return map;
 		}
 		}
-		List<EngineerSkillGroupEntity> rows = engineerSkillGroupDao.findByEngineerCodeInAndStatus(egCodes, 1);
+		List<EngineerSkillGroupEntity> rows = engineerSkillGroupDao.findByEngineerCodeInAndStatus(egCodes, true);
 
 
 		// 根据engineerCode排序
 		// 根据engineerCode排序
 		Comparator<EngineerSkillGroupEntity> cmp = Comparator.comparing(EngineerSkillGroupEntity::getEngineerCode);
 		Comparator<EngineerSkillGroupEntity> cmp = Comparator.comparing(EngineerSkillGroupEntity::getEngineerCode);