Merge branch 'dev_engineer_work_dynamics' into 'develop'

Dev engineer work dynamics

See merge request !231

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

 package com.dituhui.pea.order.dao;
 
-import com.dituhui.pea.order.entity.WarehouseInfo;
+import com.dituhui.pea.order.entity.OrgWarehouseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface WarehouseInfoMPDao extends BaseMapper<WarehouseInfo> {
+public interface WarehouseInfoMPDao extends BaseMapper<OrgWarehouseInfo> {
 }

project-order/src/main/java/com/dituhui/pea/order/entity/WarehouseInfo.java → project-order/src/main/java/com/dituhui/pea/order/entity/OrgWarehouseInfo.java

@@ -3,7 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 
 @Data
-public class WarehouseInfo {
+public class OrgWarehouseInfo {
 	private Integer warehouseId;
 	private String warehouseNname;
 	private String branchId;

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

@@ -11,9 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.Timestamp;
 import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -100,9 +98,9 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 
 	private String getWarehouseLocation(String branchId) {
 		// 获取配送站location
-		LambdaQueryWrapper<WarehouseInfo> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(WarehouseInfo::getBranchId, branchId);
-		WarehouseInfo w = warehouseInfoMPDao.selectOne(lqw);
+		LambdaQueryWrapper<OrgWarehouseInfo> lqw = new LambdaQueryWrapper<>();
+		lqw.eq(OrgWarehouseInfo::getBranchId, branchId);
+		OrgWarehouseInfo w = warehouseInfoMPDao.selectOne(lqw);
 		return String.format("%s,%s", w.getX(), w.getY());
 	}