Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 2fcdb5b4
authored
Jul 14, 2023
by
wangli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
表重命名修改
1 parent
2af5761c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
project-order/src/main/java/com/dituhui/pea/order/dao/WarehouseInfoMPDao.java
project-order/src/main/java/com/dituhui/pea/order/entity/OrgWarehouseInfo.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerTimelineServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/dao/WarehouseInfoMPDao.java
View file @
2fcdb5b
package
com
.
dituhui
.
pea
.
order
.
dao
;
import
com.dituhui.pea.order.entity.WarehouseInfo
;
import
com.dituhui.pea.order.entity.
Org
WarehouseInfo
;
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
<
Org
WarehouseInfo
>
{
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrgWarehouseInfo.java
View file @
2fcdb5b
...
...
@@ -3,7 +3,7 @@ package com.dituhui.pea.order.entity;
import
lombok.Data
;
@Data
public
class
WarehouseInfo
{
public
class
Org
WarehouseInfo
{
private
Integer
warehouseId
;
private
String
warehouseNname
;
private
String
branchId
;
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerTimelineServiceImpl.java
View file @
2fcdb5b
...
...
@@ -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
<
Org
WarehouseInfo
>
lqw
=
new
LambdaQueryWrapper
<>();
lqw
.
eq
(
Org
WarehouseInfo:
:
getBranchId
,
branchId
);
Org
WarehouseInfo
w
=
warehouseInfoMPDao
.
selectOne
(
lqw
);
return
String
.
format
(
"%s,%s"
,
w
.
getX
(),
w
.
getY
());
}
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment