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
f3cce5c9
Commit
f3cce5c9
authored
Oct 11, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样品处理 派发任务 完成接口 不用判断状态 ,可以直接11111
parent
7eda2e22
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+7
-3
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
f3cce5c9
...
...
@@ -252,7 +252,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
String
[]
teamIdS
=
teamIds
.
split
(
"、"
);
for
(
String
teamId
:
teamIdS
)
{
Team
team
=
teamMapper
.
selectById
(
Integer
.
valueOf
(
teamId
));
if
(
team
!=
null
)
{
charge
=
charge
.
compareTo
(
BigDecimal
.
ZERO
)
==
0
?
team
.
getCharge
()
:
(
charge
.
add
(
team
.
getCharge
()));
}
...
...
@@ -2245,18 +2244,23 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
// sampleNames = sampleNames.equals("") ? sampleTmp.getName() : (sampleNames + "、" + sampleTmp.getName());
String
teamIds
=
sampleTmp
.
getTeamIds
();
String
checkTeam
=
""
;
String
checkMethod
=
""
;
if
(
teamIds
!=
null
)
{
String
[]
teamIdS
=
teamIds
.
split
(
"、"
);
for
(
String
teamId
:
teamIdS
)
{
Team
team
=
teamMapper
.
selectById
(
Integer
.
valueOf
(
teamId
));
if
(
team
!=
null
&&
team
.
getQualifications
()
==
1
)
{
checkTeam
=
checkTeam
.
equals
(
""
)
?
team
.
getName
()
:
(
checkTeam
+
"、"
+
team
.
getName
());
Method
method
=
methodMapper
.
selectById
(
team
.
getMethodId
());
if
(
method
!=
null
){
checkMethod
=
checkMethod
.
equals
(
""
)
?
method
.
getNumber
()
:
(
checkMethod
+
"、"
+
method
.
getNumber
());
}
}
}
}
String
spampe_checkTeam
=
sampleTmp
.
getName
()+
":"
+
checkTeam
;
checkTeamStr
=
checkTeamStr
.
equals
(
""
)
?
spampe_checkTeam
:
(
checkTeamStr
+
"\n"
+
spampe_checkTeam
);
;
String
spampe_checkMethod
=
sampleTmp
.
getName
()+
":"
+
sampleTmp
.
getMethodNumbers
()
;
checkTeamStr
=
checkTeamStr
.
equals
(
""
)
?
spampe_checkTeam
:
(
checkTeamStr
+
"\n"
+
spampe_checkTeam
);
String
spampe_checkMethod
=
sampleTmp
.
getName
()+
":"
+
checkMethod
;
checkMethodStr
=
checkMethodStr
.
equals
(
""
)
?
spampe_checkMethod
:
(
checkMethodStr
+
"\n"
+
spampe_checkMethod
);
}
}
...
...
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