Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 1b87d736 by wangli
Options

修改

1 parent 08684fde
Inline Side-by-side
Showing with 7 additions and 10 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java
...@@ -222,8 +222,8 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -222,8 +222,8 @@ public class DispatchServiceImpl implements DispatchService {
LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
lqw.eq(OrderAppointment::getEngineerCode, engineerCode); lqw.eq(OrderAppointment::getEngineerCode, engineerCode);
lqw.ge(OrderAppointment::getExpectStartTime, this.getTimestampFromDate(date, "00:00:00")); lqw.ge(OrderAppointment::getExpectStartTime, TimeUtils.IsoDateTime2Timestamp(String.format("%s 00:00:00", date)));
lqw.lt(OrderAppointment::getExpectStartTime, this.getTimestampFromDate(date, "23:59:59")); lqw.le(OrderAppointment::getExpectStartTime, TimeUtils.IsoDateTime2Timestamp(String.format("%s 23:59:59", date)));
lqw.orderByAsc(OrderAppointment::getExpectStartTime); lqw.orderByAsc(OrderAppointment::getExpectStartTime);
List<OrderAppointment> orderAppointments = orderAppointmentMPDao.selectList(lqw); List<OrderAppointment> orderAppointments = orderAppointmentMPDao.selectList(lqw);
...@@ -271,8 +271,8 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -271,8 +271,8 @@ public class DispatchServiceImpl implements DispatchService {
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.eq(OrderRequest::getAppointmentStatus, "NOT_ASSIGNED");
lqw.ge(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(date, "00:00:00")); lqw.ge(OrderRequest::getExpectTimeBegin, TimeUtils.IsoDateTime2Timestamp(String.format("%s 00:00:00", date)));
lqw.le(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(date, "23:59:59")); lqw.le(OrderRequest::getExpectTimeBegin, TimeUtils.IsoDateTime2Timestamp(String.format("%s 23:59:59", date)));
return orderRequestMPDao.selectList(lqw); return orderRequestMPDao.selectList(lqw);
} }
...@@ -294,8 +294,9 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -294,8 +294,9 @@ public class DispatchServiceImpl implements DispatchService {
LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
lqw.in(OrderAppointment::getEngineerCode, engineerCodes); lqw.in(OrderAppointment::getEngineerCode, engineerCodes);
lqw.ge(OrderAppointment::getExpectStartTime, this.getTimestampFromDate(date, "00:00:00"));
lqw.le(OrderAppointment::getExpectStartTime, this.getTimestampFromDate(date, "23:59:59")); lqw.ge(OrderAppointment::getExpectStartTime, TimeUtils.IsoDateTime2Timestamp(String.format("%s 00:00:00", date)));
lqw.le(OrderAppointment::getExpectStartTime, TimeUtils.IsoDateTime2Timestamp(String.format("%s 23:59:59", date)));
lqw.orderByAsc(OrderAppointment::getEngineerCode); lqw.orderByAsc(OrderAppointment::getEngineerCode);
lqw.orderByAsc(OrderAppointment::getExpectStartTime); lqw.orderByAsc(OrderAppointment::getExpectStartTime);
...@@ -346,10 +347,6 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -346,10 +347,6 @@ public class DispatchServiceImpl implements DispatchService {
return map; return map;
} }
public Timestamp getTimestampFromDate(String date, String time) {
return Timestamp.valueOf(date + " " + time);
}
private String parseTimeSlot(Timestamp t) { private String parseTimeSlot(Timestamp t) {
String h = TimeUtils.timestamp2DateTime(t, "HH"); String h = TimeUtils.timestamp2DateTime(t, "HH");
Integer hour = Integer.parseInt(h); Integer hour = Integer.parseInt(h);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!