Merge branch 'dev_bugfix_orderrequests' into 'develop'

修正语法错误

See merge request !132

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

@@ -16,7 +16,8 @@ public interface EngineerInfoMPDao extends BaseMapper<EngineerInfo> {
 	@Select("select * from engineer_info where engineer_code = #{engineerCode}")
 	List<EngineerInfo> selectByEngineerCode(String engineerCode);
 
-	@Select("select * from engineer_info where engineer_code in #{engineerCodes}")
+	//@Select("select * from engineer_info where engineer_code in #{engineerCodes}")
+	@Select("select * from order_request where engineer_code in <foreach item='engineerCode' collection='engineerCodes' open='(' separator=',' close=')'>#{engineerCodes}</foreach>")
 	List<EngineerInfo> selectByEngineerCodes(List<String> engineerCodes);
 
 	@Select("select * from engineer_info where group_id = #{groupId}")

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

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.dao;
 import com.dituhui.pea.order.entity.OrderRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -16,6 +17,6 @@ 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 #{orderIds}")
-	List<OrderRequest> selectByOrderIds(List<String> orderIds);
+	@Select("select * from order_request where order_id in <foreach item='orderId' collection='orderIds' open='(' separator=',' close=')'>#{orderId}</foreach>")
+	List<OrderRequest> selectByOrderIds(@Param("orderIds") List<String> orderIds);
 }
\ No newline at end of file