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
da590571
Commit
da590571
authored
Apr 10, 2023
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
4d0f2994
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
EquipmentCategoryServiceImpl.java
...le/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
+2
-2
No files found.
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @
da590571
...
...
@@ -147,6 +147,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
@Override
public
Map
<
String
,
String
>
createSupervisorCode
(
Map
<
String
,
Object
>
map
,
String
record
)
{
String
city
,
county
,
equipCategory
;
EquInfoDto
equInfoDto
=
new
EquInfoDto
();
if
(
ObjectUtils
.
isEmpty
(
record
))
{
//获取对应行政区划
county
=
EquipmentCategoryEnum
.
XZQH
.
getCode
();
...
...
@@ -154,7 +155,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
//获取对应设备分类
equipCategory
=
map
.
get
(
"equCategory"
).
toString
();
}
else
{
EquInfoDto
equInfoDto
=
categoryOtherInfoMapper
.
selectEquipInfo
(
record
);
equInfoDto
=
categoryOtherInfoMapper
.
selectEquipInfo
(
record
);
//判断这条数据认领状态是否为已认领(6035),且是否已经有电梯96333码和监管码
//如果都满足则直接返回不做生成码操作
if
(!
ObjectUtils
.
isEmpty
(
equInfoDto
)
&&
"6035"
.
equals
(
equInfoDto
.
getStatus
()))
{
...
...
@@ -177,7 +178,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
String
equState
=
EquipmentCategoryEnum
.
CSZT
.
getCode
();
if
(!
ObjectUtils
.
isEmpty
(
record
))
{
EquInfoDto
equInfoDto
=
categoryOtherInfoMapper
.
selectEquipInfo
(
record
);
String
supervisorCode
,
elevatorCode
;
//设备状态为报废,对应电梯码作废
equState
=
EquipmentCategoryEnum
.
BF
.
getCode
().
equals
(
equInfoDto
.
getEquState
())
?
EquipmentCategoryEnum
.
WSY
.
getCode
()
:
EquipmentCategoryEnum
.
YSY
.
getCode
();
...
...
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