Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
d6e6e00f
Commit
d6e6e00f
authored
Apr 26, 2021
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
委托评审的时候修改保存 优化2
parent
730f9c75
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
10 deletions
+13
-10
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+13
-10
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
d6e6e00f
...
@@ -606,15 +606,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
...
@@ -606,15 +606,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if
(
StringUtils
.
isEmpty
(
sampleQuery
.
getOrigin
()))
{
if
(
StringUtils
.
isEmpty
(
sampleQuery
.
getOrigin
()))
{
return
BaseResponse
.
errorMsg
(
"请选择样品产地"
);
return
BaseResponse
.
errorMsg
(
"请选择样品产地"
);
}
}
}
//删除之前的样品
QueryWrapper
<
SampleTmp
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"entrust_id"
,
entrust
.
getId
());
sampleTmpService
.
remove
(
queryWrapper
);
List
<
SampleTmp
>
sampleTmpList
=
new
ArrayList
<>();
for
(
SampleQuery
sampleQuery
:
query
.
getSampleList
())
{
SampleTmp
sampleTmp
=
new
SampleTmp
();
BeanUtils
.
copyProperties
(
sampleQuery
,
sampleTmp
);
String
teamIds
=
sampleQuery
.
getTeamIds
();
//选择的检测项id集合
String
teamIds
=
sampleQuery
.
getTeamIds
();
//选择的检测项id集合
BigDecimal
charge
=
new
BigDecimal
(
"0.00"
);
BigDecimal
charge
=
new
BigDecimal
(
"0.00"
);
if
(
teamIds
!=
null
)
{
if
(
teamIds
!=
null
)
{
...
@@ -657,8 +649,19 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
...
@@ -657,8 +649,19 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if
(
entrust
.
getIsUrgent
()
==
1
)
{
if
(
entrust
.
getIsUrgent
()
==
1
)
{
charge
=
charge
.
multiply
(
new
BigDecimal
(
3
));
charge
=
charge
.
multiply
(
new
BigDecimal
(
3
));
}
}
sampleQuery
.
setCharge
(
charge
);
}
//删除之前的样品
QueryWrapper
<
SampleTmp
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"entrust_id"
,
entrust
.
getId
());
sampleTmpService
.
remove
(
queryWrapper
);
List
<
SampleTmp
>
sampleTmpList
=
new
ArrayList
<>();
for
(
SampleQuery
sampleQuery
:
query
.
getSampleList
())
{
SampleTmp
sampleTmp
=
new
SampleTmp
();
BeanUtils
.
copyProperties
(
sampleQuery
,
sampleTmp
);
sampleTmp
.
setEntrustId
(
entrust
.
getId
())
sampleTmp
.
setEntrustId
(
entrust
.
getId
())
.
setCharge
(
charge
)
.
setCharge
(
sampleQuery
.
getCharge
()
)
.
setCreateTime
(
LocalDateTime
.
now
());
.
setCreateTime
(
LocalDateTime
.
now
());
sampleTmpList
.
add
(
sampleTmp
);
sampleTmpList
.
add
(
sampleTmp
);
sampleTmpService
.
save
(
sampleTmp
);
sampleTmpService
.
save
(
sampleTmp
);
...
...
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