Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
李苗
/
Vion-DevOps
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit e0276d75
authored
Apr 28, 2024
by
HlQ
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
[add] 设备返修添加设备编号和设备名称字段
1 parent
277228ac
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
src/main/java/vion/dto/RepairRecDTO.java
src/main/java/vion/service/impl/RepairRecServiceImpl.java
src/main/java/vion/dto/RepairRecDTO.java
View file @
e0276d7
...
@@ -126,4 +126,7 @@ public class RepairRecDTO extends BaseDTO {
...
@@ -126,4 +126,7 @@ public class RepairRecDTO extends BaseDTO {
private
Date
shipDateStart
;
private
Date
shipDateStart
;
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
shipDateEnd
;
private
Date
shipDateEnd
;
private
String
deviceName
;
private
String
deviceNo
;
}
}
\ No newline at end of file
\ No newline at end of file
src/main/java/vion/service/impl/RepairRecServiceImpl.java
View file @
e0276d7
...
@@ -95,6 +95,8 @@ public class RepairRecServiceImpl extends MPJBaseServiceImpl<RepairRecMapper, Re
...
@@ -95,6 +95,8 @@ public class RepairRecServiceImpl extends MPJBaseServiceImpl<RepairRecMapper, Re
.
leftJoin
(
RRepairDevice
.
class
,
on
->
on
.
eq
(
RRepairDevice:
:
getRId
,
RepairRec:
:
getId
).
eq
(
RRepairDevice:
:
getRType
,
2
))
.
leftJoin
(
RRepairDevice
.
class
,
on
->
on
.
eq
(
RRepairDevice:
:
getRId
,
RepairRec:
:
getId
).
eq
(
RRepairDevice:
:
getRType
,
2
))
.
between
(
RepairRec:
:
getCreateTime
,
dto
.
getCreateTimeStart
(),
dto
.
getCreateTimeEnd
())
.
between
(
RepairRec:
:
getCreateTime
,
dto
.
getCreateTimeStart
(),
dto
.
getCreateTimeEnd
())
.
between
(
ArrayUtil
.
isAllNotNull
(
dto
.
getShipDateStart
(),
dto
.
getShipDateEnd
()),
SparePart:
:
getShipDate
,
dto
.
getShipDateStart
(),
dto
.
getShipDateEnd
())
.
between
(
ArrayUtil
.
isAllNotNull
(
dto
.
getShipDateStart
(),
dto
.
getShipDateEnd
()),
SparePart:
:
getShipDate
,
dto
.
getShipDateStart
(),
dto
.
getShipDateEnd
())
.
like
(
StrUtil
.
isNotBlank
(
dto
.
getDeviceName
()),
RRepairDevice:
:
getDeviceName
,
dto
.
getDeviceName
())
.
like
(
StrUtil
.
isNotBlank
(
dto
.
getDeviceNo
()),
RRepairDevice:
:
getDeviceNo
,
dto
.
getDeviceNo
())
.
orderByDesc
(
RepairRec:
:
getCreateTime
);
.
orderByDesc
(
RepairRec:
:
getCreateTime
);
return
this
.
selectJoinList
(
RepairRecVO
.
class
,
wrapper
);
return
this
.
selectJoinList
(
RepairRecVO
.
class
,
wrapper
);
}
}
...
...
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