Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dd_school
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqi
dd_school
Commits
c7646baf
Commit
c7646baf
authored
Oct 13, 2023
by
xuwenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改设备归还状态
parent
fce198a5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
0 deletions
+15
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java
+15
-0
No files found.
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java
View file @
c7646baf
...
...
@@ -8,15 +8,19 @@ import com.ruoyi.common.utils.DateUtils;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.system.mapper.SysUserMapper
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation
;
import
yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger
;
import
yangtz.cs.liu.campus.mapper.schoolEquipment.CirculationMapper
;
import
yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentLedgerMapper
;
import
yangtz.cs.liu.campus.service.schoolEquipment.ICirculationService
;
import
yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveQuery
;
...
...
@@ -28,6 +32,8 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
private
CirculationMapper
circulationMapper
;
@Autowired
private
SysUserMapper
sysUserMapper
;
@Autowired
private
EquipmentLedgerMapper
equipmentLedgerMapper
;
@Override
public
List
<
SchoolCirculationVo
>
getReturningEquipmentByadminId
(
SchoolReceiveQuery
schoolReceiveQuery
)
{
...
...
@@ -100,6 +106,15 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
String
userName
=
sysUserMapper
.
selectUserById
(
schoolCirculation
.
getReceivedById
()).
getUserName
();
schoolCirculation
.
setReceivedBy
(
userName
);
}
if
(
StringUtils
.
isNotNull
(
schoolCirculation
.
getReturnTime
())){
if
(
schoolCirculation
.
getReturnTime
().
before
(
DateUtils
.
getNowDate
())
||
schoolCirculation
.
getReturnTime
().
equals
(
DateUtils
.
getNowDate
())){
schoolCirculation
.
setReturnState
(
"1"
);
SchoolEquipmentLedger
schoolEquipmentLedger
=
new
SchoolEquipmentLedger
();
schoolEquipmentLedger
.
setId
(
schoolCirculation
.
getEquipmentId
());
schoolEquipmentLedger
.
setIsLend
(
"0"
);
equipmentLedgerMapper
.
updateById
(
schoolEquipmentLedger
);
}
}
schoolCirculation
.
setCreateBy
(
SecurityUtils
.
getLoginUser
().
getUser
().
getUserName
());
schoolCirculation
.
setCreateTime
(
DateUtils
.
getNowDate
());
return
circulationMapper
.
insert
(
schoolCirculation
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment