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 2a5c24aa
authored
Jul 13, 2023
by
wangli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
1 parent
5da780c4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderAssignImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderAssignImpl.java
View file @
2a5c24a
package
com
.
dituhui
.
pea
.
order
.
service
.
impl
;
package
com
.
dituhui
.
pea
.
order
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.dituhui.pea.common.BusinessException
;
import
com.dituhui.pea.common.BusinessException
;
import
com.dituhui.pea.common.Result
;
import
com.dituhui.pea.common.Result
;
...
@@ -25,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -25,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.sql.Timestamp
;
import
java.sql.Timestamp
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -74,7 +72,7 @@ public class OrderAssignImpl implements OrderAssign {
...
@@ -74,7 +72,7 @@ public class OrderAssignImpl implements OrderAssign {
OrderRecommend
or
=
new
OrderRecommend
();
OrderRecommend
or
=
new
OrderRecommend
();
for
(
EngineerInfo
engineer
:
engineers
)
{
for
(
EngineerInfo
engineer
:
engineers
)
{
List
<
OrderAppointment
>
orderAppointments
=
this
.
queryOrderAppointments
(
engineer
.
getEngineerCode
(),
date
);
List
<
OrderAppointment
>
orderAppointments
=
orderAppointmentMPDao
.
selectByEngineerCodeAndDt
(
engineer
.
getEngineerCode
(),
order
.
getDt
()
);
RecommendResult
rr
=
or
.
recommend
(
order
,
orderAppointments
);
RecommendResult
rr
=
or
.
recommend
(
order
,
orderAppointments
);
if
(
rr
.
getIndex
()
==
-
1
)
{
if
(
rr
.
getIndex
()
==
-
1
)
{
continue
;
continue
;
...
@@ -214,10 +212,8 @@ public class OrderAssignImpl implements OrderAssign {
...
@@ -214,10 +212,8 @@ public class OrderAssignImpl implements OrderAssign {
return
Result
.
success
(
null
);
return
Result
.
success
(
null
);
}
}
private
List
<
OrderAppointment
>
queryOrderAppointments
(
String
engineerCode
,
String
date
)
{
private
List
<
String
>
searchEngineerCodes
(
Integer
distance
,
String
key
,
String
recommend
){
LambdaQueryWrapper
<
OrderAppointment
>
lqw
=
new
LambdaQueryWrapper
<>();
return
null
;
lqw
.
eq
(
OrderAppointment:
:
getEngineerCode
,
engineerCode
);
return
orderAppointmentMPDao
.
selectList
(
lqw
);
}
}
private
List
<
TimeLineDTO
>
packTimelines
(
List
<
OrderAppointment
>
orders
,
HashMap
<
String
,
List
<
LabelValueDTO
>>
orderTips
)
{
private
List
<
TimeLineDTO
>
packTimelines
(
List
<
OrderAppointment
>
orders
,
HashMap
<
String
,
List
<
LabelValueDTO
>>
orderTips
)
{
...
...
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