Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-service-hmhj
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-service-hmhj
Commits
f032ea05
Commit
f032ea05
authored
Aug 18, 2022
by
lijingjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对对比值添加默认值;
parent
06ecc877
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
ItemComparisonServiceImpl.java
...ice/lims/hmhj/service/impl/ItemComparisonServiceImpl.java
+9
-7
No files found.
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ItemComparisonServiceImpl.java
View file @
f032ea05
...
...
@@ -56,19 +56,21 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
Map
<
String
,
String
>
limitValueMap
=
materialItemService
.
listAlLimitItemMap
();
Map
<
String
,
List
<
ItemComparison
>>
slotItemMap
=
new
HashMap
<>(
16
);
itemCompareVOList
.
forEach
(
item
->
{
item
.
setLimitValue
(
limitValueMap
.
get
(
item
.
getSampleName
()
+
item
.
getName
()));
String
limitValueStr
=
limitValueMap
.
get
(
item
.
getSampleName
()
+
item
.
getName
());
if
(
StringUtils
.
isBlank
(
limitValueStr
))
{
limitValueStr
=
Objects
.
equals
(
item
.
getName
(),
"原铝Fe"
)
?
"0.04"
:
"0.02"
;
}
item
.
setLimitValue
(
limitValueStr
);
item
.
setReclaim
(
false
);
try
{
BigDecimal
newVal
=
new
BigDecimal
(
item
.
getTestValue
());
BigDecimal
oldVal
=
new
BigDecimal
(
item
.
getPrevTestValue
());
BigDecimal
difVal
=
newVal
.
subtract
(
oldVal
);
item
.
setDiffValue
(
difVal
.
doubleValue
());
if
(
StringUtils
.
isNotBlank
(
item
.
getLimitValue
()))
{
BigDecimal
limitValue
=
new
BigDecimal
(
item
.
getLimitValue
());
// 差值与限定值相比,大于0需要重取
if
(
difVal
.
abs
().
compareTo
(
limitValue
)
>
0
)
{
item
.
setReclaim
(
true
);
}
BigDecimal
limitValue
=
new
BigDecimal
(
item
.
getLimitValue
());
// 差值与限定值相比,大于0需要重取
if
(
difVal
.
abs
().
compareTo
(
limitValue
)
>
0
)
{
item
.
setReclaim
(
true
);
}
}
catch
(
Exception
e
)
{
logger
.
error
(
"数据转换错误!"
);
...
...
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