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 ec227128
authored
Jan 11, 2024
by
yangxiujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:去掉通知bean和删除品牌
1 parent
de81a3e2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
3 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/FileController.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderInfoServiceImpl.java
project-order/src/main/resources/static/doc/index.html
project-order/src/main/resources/static/doc/search.js
project-order/src/main/java/com/dituhui/pea/order/controller/FileController.java
View file @
ec22712
...
...
@@ -156,7 +156,7 @@ public class FileController {
/**
* 订单批量模版下载
*
*
@param
*
*/
@GetMapping
(
value
=
"/file/downOrder"
)
public
ResponseEntity
<
byte
[]>
downOrderTemplate
()
{
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java
View file @
ec22712
...
...
@@ -400,7 +400,7 @@ public class DispatchServiceImpl implements DispatchService {
if
(
reqDTO
.
getIsSub
()
&&
entity
.
getIsMultiple
()
!=
1
)
{
return
Result
.
failed
(
"订单无需指派辅助工程师"
);
}
SkillInfoEntity
skill
=
skillInfoDao
.
getByBrandAndTypeAndSkill
(
CommonUtil
.
fixBrand
(
entity
.
getBrand
()
),
entity
.
getType
(),
entity
.
getSkill
());
SkillInfoEntity
skill
=
skillInfoDao
.
getByBrandAndTypeAndSkill
(
entity
.
getBrand
(
),
entity
.
getType
(),
entity
.
getSkill
());
List
<
OrderInfoEntity
>
engineerOrders
=
orderInfoDao
.
findByDtAndEngineerCode
(
localDate
,
engineer
.
getEngineerCode
());
List
<
OrderInfoEntity
>
engineerSubOrders
=
orderInfoDao
.
findByDtAndEngineerCodeSubAndAppointmentStatusNot
(
localDate
,
engineer
.
getEngineerCode
(),
OrderFlowEnum
.
CANCELED
.
name
());
engineerOrders
.
addAll
(
engineerSubOrders
);
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderInfoServiceImpl.java
View file @
ec22712
...
...
@@ -517,7 +517,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
@Override
public
Boolean
rescheduled
(
OrderInfoEntity
source
,
OrderInfoEntity
target
,
Boolean
isRescheduled
,
String
reason
,
String
operator
,
OrderEventEntity
eventEntity
)
{
if
(
source
.
getOrderId
().
startsWith
(
"peatest"
)
||
Objects
.
equals
(
operator
,
"BEAN"
))
{
if
(
true
)
{
//暂时不用通知
return
true
;
}
operator
=
"11020276"
;
...
...
project-order/src/main/resources/static/doc/index.html
View file @
ec22712
This diff could not be displayed because it is too large.
project-order/src/main/resources/static/doc/search.js
View file @
ec22712
...
...
@@ -465,6 +465,12 @@ api[1].list[12].list.push({
api
[
1
].
list
[
12
].
list
.
push
({
order
:
'3'
,
deprecated
:
'false'
,
url
:
'/pea-order/file/errorTemplate'
,
desc
:
'错误模版下载'
,
});
api
[
1
].
list
[
12
].
list
.
push
({
order
:
'4'
,
deprecated
:
'false'
,
url
:
'/pea-order/file/downOrder'
,
desc
:
'订单批量模版下载'
,
});
...
...
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