Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
H
hzsomms
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ZTGK
hzsomms
Commits
577addc5
Commit
577addc5
authored
Jan 25, 2024
by
hkl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:1.站名bug
parent
2523344a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
WorkBatchServiceImpl.java
...es/maintenanceWork/service/impl/WorkBatchServiceImpl.java
+6
-6
TrainStationController.java
...ules/subwayNetwork/controller/TrainStationController.java
+5
-0
No files found.
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchServiceImpl.java
View file @
577addc5
...
@@ -115,7 +115,7 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
...
@@ -115,7 +115,7 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
List
<
WorkBatchSaveOrUpdateDetailDTO
>
transfiniteList
=
dto
.
getDetailList
();
List
<
WorkBatchSaveOrUpdateDetailDTO
>
transfiniteList
=
dto
.
getDetailList
();
//获取当前登录人信息
//获取当前登录人信息
LoginUser
user
=
(
LoginUser
)
SecurityUtils
.
getSubject
().
getPrincipal
();
LoginUser
user
=
(
LoginUser
)
SecurityUtils
.
getSubject
().
getPrincipal
();
String
realname
=
user
.
getReal
name
();
String
username
=
user
.
getUser
name
();
for
(
WorkBatchSaveOrUpdateDetailDTO
detailDTO
:
transfiniteList
)
{
for
(
WorkBatchSaveOrUpdateDetailDTO
detailDTO
:
transfiniteList
)
{
WorkBatchDetail
workBatchDetail
=
new
WorkBatchDetail
();
WorkBatchDetail
workBatchDetail
=
new
WorkBatchDetail
();
workBatchDetail
.
setId
(
UUIDGenerator
.
generate
());
workBatchDetail
.
setId
(
UUIDGenerator
.
generate
());
...
@@ -134,8 +134,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
...
@@ -134,8 +134,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
workBatchDetail
.
setRemark
(
detailDTO
.
getRemark
());
workBatchDetail
.
setRemark
(
detailDTO
.
getRemark
());
workBatchDetail
.
setUpdateTime
(
new
Date
());
workBatchDetail
.
setUpdateTime
(
new
Date
());
workBatchDetail
.
setCreateTime
(
new
Date
());
workBatchDetail
.
setCreateTime
(
new
Date
());
workBatchDetail
.
setCreateBy
(
real
name
);
workBatchDetail
.
setCreateBy
(
user
name
);
workBatchDetail
.
setUpdateBy
(
real
name
);
workBatchDetail
.
setUpdateBy
(
user
name
);
workBatchDetail
.
setWorkStatus
(
0
);
workBatchDetail
.
setWorkStatus
(
0
);
workBatchDetailMapper
.
insert
(
workBatchDetail
);
workBatchDetailMapper
.
insert
(
workBatchDetail
);
}
}
...
@@ -167,7 +167,7 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
...
@@ -167,7 +167,7 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
// 保存明细
// 保存明细
//获取当前登录人信息
//获取当前登录人信息
LoginUser
user
=
(
LoginUser
)
SecurityUtils
.
getSubject
().
getPrincipal
();
LoginUser
user
=
(
LoginUser
)
SecurityUtils
.
getSubject
().
getPrincipal
();
String
realname
=
user
.
getReal
name
();
String
username
=
user
.
getUser
name
();
List
<
DispatchDTO
>
transfiniteList
=
dto
.
getDetailList
();
List
<
DispatchDTO
>
transfiniteList
=
dto
.
getDetailList
();
List
<
WorkBatchDetail
>
workBatchDetailList
=
new
ArrayList
<>();
List
<
WorkBatchDetail
>
workBatchDetailList
=
new
ArrayList
<>();
for
(
DispatchDTO
transfiniteDTO
:
transfiniteList
)
{
for
(
DispatchDTO
transfiniteDTO
:
transfiniteList
)
{
...
@@ -192,8 +192,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
...
@@ -192,8 +192,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
workBatchDetail
.
setWorkStatus
(
0
);
workBatchDetail
.
setWorkStatus
(
0
);
workBatchDetail
.
setUpdateTime
(
new
Date
());
workBatchDetail
.
setUpdateTime
(
new
Date
());
workBatchDetail
.
setCreateTime
(
new
Date
());
workBatchDetail
.
setCreateTime
(
new
Date
());
workBatchDetail
.
setCreateBy
(
real
name
);
workBatchDetail
.
setCreateBy
(
user
name
);
workBatchDetail
.
setUpdateBy
(
real
name
);
workBatchDetail
.
setUpdateBy
(
user
name
);
workBatchDetailList
.
add
(
workBatchDetail
);
workBatchDetailList
.
add
(
workBatchDetail
);
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/controller/TrainStationController.java
View file @
577addc5
...
@@ -81,6 +81,11 @@ public class TrainStationController extends JeecgController<TrainStation, ITrain
...
@@ -81,6 +81,11 @@ public class TrainStationController extends JeecgController<TrainStation, ITrain
if
(
record
.
getId
().
equals
(
dto
.
getId
()))
{
if
(
record
.
getId
().
equals
(
dto
.
getId
()))
{
continue
;
continue
;
}
}
if
(
record
.
getStationName
().
equals
(
dto
.
getStationName
())){
throw
JeecgBootException
.
error
(
"同一线路,线别下已存在该站名"
);
}
BigDecimal
currentStartMileage
=
record
.
getStartingMileage
();
BigDecimal
currentStartMileage
=
record
.
getStartingMileage
();
BigDecimal
currentEndMileage
=
record
.
getEndMileage
();
BigDecimal
currentEndMileage
=
record
.
getEndMileage
();
...
...
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