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 22382147
authored
Nov 27, 2023
by
Ren Ping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:双人上门工单,指定了副工程师不参与自动派单
1 parent
1af5afa4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
project-dispatch/src/main/java/com/dituhui/pea/dispatch/dao/DispatchOrderRepository.java
project-dispatch/src/main/resources/application-dev.yaml
project-dispatch/src/main/java/com/dituhui/pea/dispatch/dao/DispatchOrderRepository.java
View file @
2238214
...
...
@@ -50,7 +50,6 @@ public interface DispatchOrderRepository extends CrudRepository<DispatchOrder, L
List
<
Map
<
String
,
Object
>>
getNewDispatchOrder
(
String
groupId
,
String
batchNo
,
String
teamId
,
String
batchDay
);
@Query
(
value
=
" select ?1 group_id, ?2 batch_no, a.org_team_id team_id, a.order_id, date_format(a.dt,'%Y-%m-%d') dt, a.x, a.y , \n"
+
" a.expect_time_begin, a.expect_time_end, a.tags, a.priority , \n"
+
" concat(a.brand, '-', a.type, '-', a.skill) skills , a.take_time, a.appointment_status status, \n"
+
...
...
@@ -59,6 +58,7 @@ public interface DispatchOrderRepository extends CrudRepository<DispatchOrder, L
" where a.org_team_id=?3 and a.dt = ?4 and bean_status='OPEN'\n"
+
" and (appointment_method like 'AUTO%' or appointment_method='MANUAL') and a.appointment_status in ('CONFIRM')\n"
+
" and order_status in ('NORMAL','RESCHEDULED') and service_status='INIT'\n"
+
" and (a.is_multiple<>1 or a.engineer_code_sub is null)"
+
//指定了辅助工程师的不参与自动派单
" order by a.expect_time_begin asc "
,
nativeQuery
=
true
)
List
<
Map
<
String
,
Object
>>
getNewDispatchConfirmOrder
(
String
groupId
,
String
batchNo
,
String
teamId
,
String
batchDay
);
...
...
project-dispatch/src/main/resources/application-dev.yaml
View file @
2238214
...
...
@@ -3,7 +3,7 @@ server:
dispatch
:
cron
:
expr
:
0
22
8-23 * * ?
expr
:
0
57
8-23 * * ?
next-day-limit
:
2
scheduler
:
...
...
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