Commit 479d5ad2 by 丁伟峰

字段命名修改

1 parent 02a238e7
......@@ -8,6 +8,6 @@ import java.util.List;
public interface OrderAppointmentDao extends JpaRepository<OrderAppointmentEntity, Integer> {
@Query("from OrderAppointmentEntity a where DATE_FORMAT(a.expectBeginTime, '%Y-%m-%d') = :date and a.engineerCode in :engineerCodes")
@Query("from OrderAppointmentEntity a where DATE_FORMAT(a.expectStartTime, '%Y-%m-%d') = :date and a.engineerCode in :engineerCodes")
List<?> findByDateAndEngineerCodeIn(String date, List<?> engineerCodes);
}
......@@ -60,7 +60,7 @@ public class OrderAppointmentEntity {
/**
* 客户预约上门时间
*/
private Date expectBeginTime;
private Date expectStartTime;
private Date expectEndTime;
/**
......
......@@ -83,7 +83,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
log.info("===== order_id: [{}]", entity.getOrderId());
WorkbenchEngineersGanttRespDTO.Order order = new WorkbenchEngineersGanttRespDTO.Order();
// todo 需要根据订单时间和状态,采用expectXXXX或者actualXXXX
order.setStartTime(entity.getExpectBeginTime()).setEndTime(entity.getExpectEndTime());
order.setStartTime(entity.getExpectStartTime()).setEndTime(entity.getExpectEndTime());
order.setOrderId(entity.getOrderId()).setOrderStatus(entity.getStatus());
order.setTips(getOrderTips(entity.getOrderId()));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!