Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !81

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java

@@ -182,12 +182,10 @@ public class DispatchServiceImpl implements DispatchService {
 		lqw.in(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelIds);
 		lqw.in(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelIds);
 		lqw.in(levelType.equals("group"), OrderRequest::getOrgGroupId, levelIds);
 		lqw.in(levelType.equals("group"), OrderRequest::getOrgGroupId, levelIds);
 		lqw.eq(OrderRequest::getStatus, "open");
 		lqw.eq(OrderRequest::getStatus, "open");
+		lqw.eq(OrderRequest::getAppointmentStatus, "NOT_ASSIGNED");
 		lqw.ge(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(date, "00:00:00"));
 		lqw.ge(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(date, "00:00:00"));
 		lqw.le(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(date, "23:59:59"));
 		lqw.le(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(date, "23:59:59"));
 
 
-		List<String> statuses = List.of("", "未派单", "未派工");  // TODO
-		lqw.in(OrderRequest::getAppointmentStatus, statuses);
-
 		return orderRequestMPDao.selectList(lqw);
 		return orderRequestMPDao.selectList(lqw);
 	}
 	}