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
da75ca7f
Commit
da75ca7f
authored
Oct 13, 2023
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复气瓶充装后复查没有数据时追溯页面接口报错
parent
647ae98d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
TzCylinderServiceImpl.java
.../cylinder/flc/biz/service/impl/TzCylinderServiceImpl.java
+11
-3
No files found.
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 @
da75ca7f
...
@@ -9,16 +9,22 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
...
@@ -9,16 +9,22 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import
com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl
;
import
com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl
;
import
com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFileUrlDto
;
import
com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFileUrlDto
;
import
com.yeejoin.amos.boot.module.cylinder.api.entity.PageParam
;
import
com.yeejoin.amos.boot.module.cylinder.api.entity.PageParam
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.*
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderAfterCheckDto
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderBeforeCheckDto
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderCheckDto
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderFillingDto
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderInfoDto
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderInspectionDto
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderProduceDto
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderTagsDto
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderTraceDto
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInfo
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInfo
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.enums.CyclinderStatus
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.enums.CyclinderStatus
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.TzCylinderMapper
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.TzCylinderMapper
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.service.ITzCylinderService
;
import
com.yeejoin.amos.boot.module.cylinder.flc.api.service.ITzCylinderService
;
import
com.yeejoin.amos.feign.privilege.Privilege
;
import
com.yeejoin.amos.feign.privilege.Privilege
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.validation.ValidationUtils
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
...
@@ -148,6 +154,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
...
@@ -148,6 +154,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
List
<
TzCylinderCheckDto
>
tzCylinderAfterCheckDtoListResult
=
new
ArrayList
<>();
List
<
TzCylinderCheckDto
>
tzCylinderAfterCheckDtoListResult
=
new
ArrayList
<>();
TzCylinderAfterCheckDto
tzcylinderAfterCheckDto
=
tzCylinderMapper
TzCylinderAfterCheckDto
tzcylinderAfterCheckDto
=
tzCylinderMapper
.
getTzCylinderAfterCheck
(
tzCylinderFillingDto
.
getFillingCheckId
());
.
getTzCylinderAfterCheck
(
tzCylinderFillingDto
.
getFillingCheckId
());
if
(!
ValidationUtil
.
isEmpty
(
tzcylinderAfterCheckDto
))
{
JSONObject
obj
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
tzcylinderAfterCheckDto
));
JSONObject
obj
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
tzcylinderAfterCheckDto
));
for
(
String
str
:
obj
.
keySet
())
{
for
(
String
str
:
obj
.
keySet
())
{
String
explain
=
afterMap
.
get
(
str
);
String
explain
=
afterMap
.
get
(
str
);
...
@@ -160,6 +167,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
...
@@ -160,6 +167,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
}
}
tzCylinderFillingDto
.
setTzCylinderAfterCheckDtoList
(
tzCylinderAfterCheckDtoListResult
);
tzCylinderFillingDto
.
setTzCylinderAfterCheckDtoList
(
tzCylinderAfterCheckDtoListResult
);
}
}
}
if
(!
ValidationUtil
.
isEmpty
(
tzCylinderFillingDtoList
)){
if
(!
ValidationUtil
.
isEmpty
(
tzCylinderFillingDtoList
)){
String
fillingEndTime
=
tzCylinderFillingDtoList
.
iterator
().
next
().
getFillingEndtime
();
String
fillingEndTime
=
tzCylinderFillingDtoList
.
iterator
().
next
().
getFillingEndtime
();
...
...
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