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
3a47a6f4
Commit
3a47a6f4
authored
Aug 06, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):1,安装告知审批通过后,设备流转到使用单位,安改维单位看不到设备;
2,设备流转中只允许一家安改维单位操作,发起告知
parent
0ab6b2bb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
10 deletions
+9
-10
JgInstallationNoticeServiceImpl.java
.../jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
+2
-3
EquipmentCategoryServiceImpl.java
...le/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java
+7
-7
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
View file @
3a47a6f4
...
@@ -1143,7 +1143,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
...
@@ -1143,7 +1143,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
}
}
tzsJgOtherInfo
.
setSupervisoryCode
(
mapCode
.
get
(
"superviseCode"
).
toString
());
tzsJgOtherInfo
.
setSupervisoryCode
(
mapCode
.
get
(
"superviseCode"
).
toString
());
tzsJgOtherInfoMapper
.
updateById
(
tzsJgOtherInfo
);
tzsJgOtherInfoMapper
.
updateById
(
tzsJgOtherInfo
);
List
<
LinkedHashMap
>
tree
=
commonServiceImpl
.
getCreatTree
();
// 更新设备监管部门信息
// 更新设备监管部门信息
LambdaQueryWrapper
<
IdxBizJgSupervisionInfo
>
eq
=
new
QueryWrapper
<
IdxBizJgSupervisionInfo
>().
lambda
()
LambdaQueryWrapper
<
IdxBizJgSupervisionInfo
>
eq
=
new
QueryWrapper
<
IdxBizJgSupervisionInfo
>().
lambda
()
.
eq
(
IdxBizJgSupervisionInfo:
:
getRecord
,
jgRelationEquip
.
getEquId
());
.
eq
(
IdxBizJgSupervisionInfo:
:
getRecord
,
jgRelationEquip
.
getEquId
());
...
@@ -1324,8 +1323,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
...
@@ -1324,8 +1323,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
map1
.
put
(
"USE_UNIT_NAME"
,
jgInstallationNotice
.
getUseUnitName
());
map1
.
put
(
"USE_UNIT_NAME"
,
jgInstallationNotice
.
getUseUnitName
());
map1
.
put
(
"IS_INTO_MANAGEMENT"
,
true
);
map1
.
put
(
"IS_INTO_MANAGEMENT"
,
true
);
map1
.
put
(
"USE_PLACE_CODE"
,
dto
.
getProvince
().
split
(
"_"
)[
0
]
+
"#"
+
dto
.
getCity
().
split
(
"_"
)[
0
]
+
"#"
+
dto
.
getCounty
().
split
(
"_"
)[
0
]
+
"#"
+
dto
.
getFactoryUseSiteStreet
().
split
(
"_"
)[
0
]);
map1
.
put
(
"USE_PLACE_CODE"
,
dto
.
getProvince
().
split
(
"_"
)[
0
]
+
"#"
+
dto
.
getCity
().
split
(
"_"
)[
0
]
+
"#"
+
dto
.
getCounty
().
split
(
"_"
)[
0
]
+
"#"
+
dto
.
getFactoryUseSiteStreet
().
split
(
"_"
)[
0
]);
map1
.
put
(
"USC_UNIT_CREDIT_CODE"
,
jgInstallationNotice
.
getInstallUnitCreditCode
()
);
map1
.
put
(
"USC_UNIT_CREDIT_CODE"
,
""
);
map1
.
put
(
"USC_UNIT_NAME"
,
jgInstallationNotice
.
getInstallUnitName
()
);
map1
.
put
(
"USC_UNIT_NAME"
,
""
);
map1
.
put
(
"USE_PLACE"
,
String
.
format
(
"%s/%s/%s/%s"
,
jgInstallationNotice
.
getProvinceName
(),
jgInstallationNotice
.
getCityName
(),
jgInstallationNotice
.
getCountyName
(),
jgInstallationNotice
.
getStreetName
()));
map1
.
put
(
"USE_PLACE"
,
String
.
format
(
"%s/%s/%s/%s"
,
jgInstallationNotice
.
getProvinceName
(),
jgInstallationNotice
.
getCityName
(),
jgInstallationNotice
.
getCountyName
(),
jgInstallationNotice
.
getStreetName
()));
map1
.
put
(
"ADDRESS"
,
jgInstallationNotice
.
getAddress
());
map1
.
put
(
"ADDRESS"
,
jgInstallationNotice
.
getAddress
());
objMap
.
put
(
tzsJgOtherInfo
.
getRecord
(),
map1
);
objMap
.
put
(
tzsJgOtherInfo
.
getRecord
(),
map1
);
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @
3a47a6f4
...
@@ -2480,15 +2480,15 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
...
@@ -2480,15 +2480,15 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
Bean
.
copyExistPropertis
(
newData
,
oldData
);
Bean
.
copyExistPropertis
(
newData
,
oldData
);
// 处理施工单位信息[去重]
// 处理施工单位信息[去重]
if
(!
ValidationUtil
.
isEmpty
(
newUscUnitCreditCode
))
{
if
(!
ValidationUtil
.
isEmpty
(
newUscUnitCreditCode
))
{
if
(!
ValidationUtil
.
isEmpty
(
oldUscUnitCreditCode
))
{
//
if (!ValidationUtil.isEmpty(oldUscUnitCreditCode)) {
if
(!
oldUscUnitCreditCode
.
contains
(
newUscUnitCreditCode
))
{
//
if (!oldUscUnitCreditCode.contains(newUscUnitCreditCode)) {
oldData
.
setUSC_UNIT_CREDIT_CODE
(
oldUscUnitCreditCode
+
","
+
newUscUnitCreditCode
);
//
oldData.setUSC_UNIT_CREDIT_CODE(oldUscUnitCreditCode + "," + newUscUnitCreditCode);
oldData
.
setUSC_UNIT_NAME
(
oldUscUnitName
+
","
+
newUscUnitName
);
//
oldData.setUSC_UNIT_NAME(oldUscUnitName + "," + newUscUnitName);
}
//
}
}
else
{
//
} else {
oldData
.
setUSC_UNIT_CREDIT_CODE
(
newUscUnitCreditCode
);
oldData
.
setUSC_UNIT_CREDIT_CODE
(
newUscUnitCreditCode
);
oldData
.
setUSC_UNIT_NAME
(
newUscUnitName
);
oldData
.
setUSC_UNIT_NAME
(
newUscUnitName
);
}
//
}
}
}
}
}
...
...
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