Merge branch 'dev_mybatisplus_optimize' into 'develop'

Dev mybatisplus optimize

See merge request !126

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

@@ -3,7 +3,19 @@ package com.dituhui.pea.order.dao;
 import com.dituhui.pea.order.entity.OrderRequest;
 import com.dituhui.pea.order.entity.OrderRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 @Mapper
 @Mapper
 public interface OrderRequestMPDao extends BaseMapper<OrderRequest> {
 public interface OrderRequestMPDao extends BaseMapper<OrderRequest> {
-}
+
+	@Select("select * from order_request where order_id = #{orderId}")
+	OrderRequest getByOrderId(String orderId);
+
+	@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);
+}
\ No newline at end of file

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

@@ -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.lt(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::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 {
 		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.le(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(date, "23:59:59"));
+		lqw.ge(OrderRequest::getExpectTimeBegin, TimeUtils.IsoDateTime2Timestamp(String.format("%s 00:00:00", date)));
+		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 {
 
 
 		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 {
 		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);