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
da698ec0
Commit
da698ec0
authored
Mar 10, 2021
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
S03 计算结果 优化
parent
7dbe1ea0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+6
-1
CheckCountUtil.java
.../java/cn/wise/sc/cement/business/util/CheckCountUtil.java
+2
-1
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
da698ec0
...
...
@@ -395,6 +395,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
public
static
void
main
(
String
[]
args
)
{
BigDecimal
displaySO3
=
new
BigDecimal
(
0.01
);
BigDecimal
count
=
displaySO3
.
multiply
(
new
BigDecimal
(
2.5
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_EVEN
);
System
.
out
.
println
(
count
.
toString
());
String
URL
=
"https://lab.wisenergy.cn/lab-bangye?id="
+
12
+
"&path=/blanche/entrustdetail¬ice="
+
21
;
String
a
=
URLUtil
.
encodeAll
(
URL
);
String
b
=
URLUtil
.
encode
(
URL
).
replaceAll
(
"&"
,
"%26"
);
...
...
@@ -1172,7 +1178,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if
(
sampleList
==
null
||
sampleList
.
size
()==
0
){
return
BaseResponse
.
errorMsg
(
"样品等待检测"
);
}
List
<
SampleVo
>
sampleVoList
=
new
ArrayList
<>();
if
(
sampleList
!=
null
&&
sampleList
.
size
()
>
0
)
{
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java
View file @
da698ec0
...
...
@@ -433,7 +433,7 @@ public class CheckCountUtil {
BigDecimal
elseResult
=
displaySO3
.
multiply
(
new
BigDecimal
(
2.5
));
BigDecimal
countResult
=
weightSO3
.
compareTo
(
new
BigDecimal
(
0
))==
1
?
weightSO3:
elseResult
;
BigDecimal
result1
=
countResult
.
multiply
(
param100
0
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
BigDecimal
jsResult
=
weightSO3
.
compareTo
(
new
BigDecimal
(
0
))==
1
?
...
...
@@ -444,6 +444,7 @@ public class CheckCountUtil {
weightSO3:
elseResult
.
multiply
(
mSO3
).
divide
(
mSO3
,
4
);
count
=
osResult
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
else
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"显示值"
))){
BigDecimal
displaySO3
=
getBigDecimal
(
resultMap
.
get
(
"显示值"
).
trim
());
count
=
displaySO3
.
multiply
(
new
BigDecimal
(
2.5
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_EVEN
);
...
...
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