Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
b3bdaf96
Commit
b3bdaf96
authored
Oct 17, 2023
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
气瓶充装修改
parent
805d17ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CyclinderStatus.java
...s/boot/module/cylinder/flc/api/enums/CyclinderStatus.java
+1
-0
TzCylinderServiceImpl.java
.../cylinder/flc/biz/service/impl/TzCylinderServiceImpl.java
+2
-2
No files found.
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/enums/CyclinderStatus.java
View file @
b3bdaf96
...
@@ -6,6 +6,7 @@ import lombok.Getter;
...
@@ -6,6 +6,7 @@ import lombok.Getter;
public
enum
CyclinderStatus
{
public
enum
CyclinderStatus
{
NOHEGE
(
"3139"
,
"不合格"
),
NOHEGE
(
"3139"
,
"不合格"
),
NOT_UPLOAD
(
""
,
"未上传"
),
HEGE
(
"3140"
,
"合格"
);
HEGE
(
"3140"
,
"合格"
);
private
String
code
;
private
String
code
;
private
String
name
;
private
String
name
;
...
...
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/TzCylinderServiceImpl.java
View file @
b3bdaf96
...
@@ -183,8 +183,8 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
...
@@ -183,8 +183,8 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
}
}
for
(
TzCylinderFillingDto
tzCylinderFillingDto
:
tzCylinderFillingDtoList
)
{
for
(
TzCylinderFillingDto
tzCylinderFillingDto
:
tzCylinderFillingDtoList
)
{
if
(
ValidationUtil
.
isEmpty
(
tzCylinderFillingDto
.
getTzCylinderAfterCheckDtoList
()))
{
// 充装后复查记录没有默认
不合格
if
(
ValidationUtil
.
isEmpty
(
tzCylinderFillingDto
.
getTzCylinderAfterCheckDtoList
()))
{
// 充装后复查记录没有默认
未上传
tzCylinderFillingDto
.
setCheckResultsAfter
(
CyclinderStatus
.
NO
HEGE
.
getName
());
tzCylinderFillingDto
.
setCheckResultsAfter
(
CyclinderStatus
.
NO
T_UPLOAD
.
getName
());
}
else
{
}
else
{
List
<
TzCylinderCheckDto
>
collect
=
tzCylinderFillingDto
.
getTzCylinderAfterCheckDtoList
().
stream
().
filter
(
dto
->
dto
.
getResult
().
equals
(
"0"
)).
collect
(
Collectors
.
toList
());
List
<
TzCylinderCheckDto
>
collect
=
tzCylinderFillingDto
.
getTzCylinderAfterCheckDtoList
().
stream
().
filter
(
dto
->
dto
.
getResult
().
equals
(
"0"
)).
collect
(
Collectors
.
toList
());
if
(
collect
.
size
()
!=
0
)
{
if
(
collect
.
size
()
!=
0
)
{
...
...
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