Merge branch 'dev_bugfix_orderrequests' into 'develop'

修复语法错误

See merge request !138

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

@@ -19,19 +19,10 @@ public interface EngineerInfoMPDao extends BaseMapper<EngineerInfo> {
 	@Select("select * from engineer_info where engineer_code = #{engineerCode}")
 	List<EngineerInfo> selectByEngineerCode(String engineerCode);
 
-	@SelectProvider(type= EngineerInfoSqlProvider.class, method = "selectByEngineerCodes")
+	@Select("<script> select * from engineer_info where engineer_code in " +
+			"<foreach item='engineerCode' collection='engineerCodes' open='(' separator=',' close=')'>#{engineerCode}</foreach></script>")
 	List<EngineerInfo> selectByEngineerCodes(@Param("engineerCodes") List<String> engineerCodes);
 
 	@Select("select * from engineer_info where group_id = #{groupId}")
 	List<EngineerInfo> selectByGroupId(String groupId);
-}
-
-
-class EngineerInfoSqlProvider {
-	public String selectByEngineerCodes(@Param("engineerCodes") List<String> engineerCodes) {
-		StringBuilder sb = new StringBuilder();
-		sb.append("SELECT * FROM engineer_info WHERE engineer_code IN ");
-		sb.append("<foreach item='engineerCode' collection='engineerCodes' open='(' separator=',' close=')'>#{engineerCode}</foreach>");
-		return sb.toString();
-	}
 }
\ No newline at end of file

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

@@ -18,16 +18,7 @@ public interface OrderRequestMPDao extends BaseMapper<OrderRequest> {
 	@Select("select * from order_request where order_id = #{orderId}")
 	List<OrderRequest> selectByOrderId(String orderId);
 
-	//@Select({"select * from order_request where order_id in <foreach item='orderId' index='index' collection='orderIds' open='(' separator=',' close=')'>#{orderId}</foreach>"})
-	@SelectProvider(type = OrderRequestSqlProvider.class, method = "selectByOrderIds")
+	@Select("<script> select * from order_request where order_id in " +
+			"<foreach item='orderId' index='index' collection='orderIds' open='(' separator=',' close=')'>#{orderId}</foreach></script>")
 	List<OrderRequest> selectByOrderIds(@Param("orderIds") List<String> orderIds);
-}
-
-class OrderRequestSqlProvider {
-	public String selectByOrderIds(@Param("orderIds") List<String> orderIds) {
-		StringBuilder sb = new StringBuilder();
-		sb.append("SELECT * FROM order_request WHERE order_id IN ");
-		sb.append("<foreach item='orderId' collection='orderIds' open='(' separator=',' close=')'>#{orderId}</foreach>");
-		return sb.toString();
-	}
 }
\ No newline at end of file