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
e71ae4d7
Commit
e71ae4d7
authored
Jan 21, 2025
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):安装告知公用长输通过审核设备状态为:在用
parent
c2ed27a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
JgInstallationNoticeServiceImpl.java
.../jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
+4
-0
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+12
-5
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 @
e71ae4d7
...
...
@@ -50,6 +50,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
import
com.yeejoin.amos.boot.module.ymt.api.entity.*
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.mapper.*
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
...
...
@@ -1564,6 +1565,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
idxBizJgUseInfo
.
setStreetName
(
jgInstallationNotice
.
getStreetName
());
idxBizJgUseInfo
.
setAddress
(
jgInstallationNotice
.
getAddress
());
idxBizJgUseInfo
.
setIsNotXiXian
(
jgInstallationNotice
.
getIsXixian
());
if
(
"8100"
.
equals
(
jgInstallationNotice
.
getEquCategoryCode
())
||
"8200"
.
equals
(
jgInstallationNotice
.
getEquCategoryCode
()))
{
idxBizJgUseInfo
.
setEquState
(
String
.
valueOf
(
EquimentEnum
.
ZAIYONG
.
getCode
()));
}
idxBizJgUseInfo
.
setEstateUnitCreditCode
(
jgInstallationNotice
.
getPropertyUnitCreditCode
());
idxBizJgUseInfo
.
setEstateUnitName
(
jgInstallationNotice
.
getPropertyUnitName
());
idxBizJgUseInfo
.
setIsIntoManagement
(
Boolean
.
TRUE
);
...
...
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/JgUseRegistrationServiceImpl.java
View file @
e71ae4d7
...
...
@@ -2522,6 +2522,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
*/
private
boolean
checkEquStatusInUse
(
String
record
)
{
IdxBizJgUseInfo
useInfo
=
idxBizJgUseInfoService
.
lambdaQuery
().
eq
(
IdxBizJgUseInfo:
:
getRecord
,
record
).
one
();
if
(
ValidationUtil
.
isEmpty
(
useInfo
.
getEquState
()))
{
return
true
;
}
return
EquimentEnum
.
ZAIYONG
.
getCode
().
toString
().
equals
(
useInfo
.
getEquState
());
}
...
...
@@ -2624,11 +2627,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
String
useUnitCreditCode
=
String
.
valueOf
(
jsonObject
.
get
(
"useUnitCreditCode"
));
TzBaseEnterpriseInfo
enterpriseInfo
=
tzBaseEnterpriseInfoMapper
.
selectOne
(
new
LambdaQueryWrapper
<
TzBaseEnterpriseInfo
>().
eq
(
TzBaseEnterpriseInfo:
:
getUseCode
,
useUnitCreditCode
));
exportParamsMap
.
put
(
"fullAddress"
,
enterpriseInfo
.
getAddress
());
// 工程(装置)名称 取第一个设备的技术参数”工程装置名称“
JSONObject
eqJSON
=
(
JSONObject
)
equipmentLists
.
get
(
0
);
String
eqId
=
!
ValidationUtil
.
isEmpty
(
eqJSON
)
?
String
.
valueOf
(
eqJSON
.
get
(
"record"
))
:
""
;
IdxBizJgUseInfo
idxBizJgUseInfo
=
useInfoMapper
.
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgUseInfo
>().
eq
(
IdxBizJgUseInfo:
:
getRecord
,
eqId
));
exportParamsMap
.
put
(
"nameOfProjectDevice"
,
ValidationUtil
.
isEmpty
(
idxBizJgUseInfo
)
?
""
:
idxBizJgUseInfo
.
getProjectContraption
());
if
(
equipmentLists
.
isEmpty
())
{
exportParamsMap
.
put
(
"nameOfProjectDevice"
,
""
);
}
else
{
// 工程(装置)名称 取第一个设备的技术参数”工程装置名称“
JSONObject
eqJSON
=
(
JSONObject
)
equipmentLists
.
get
(
0
);
String
eqId
=
!
ValidationUtil
.
isEmpty
(
eqJSON
)
?
String
.
valueOf
(
eqJSON
.
get
(
"record"
))
:
""
;
IdxBizJgUseInfo
idxBizJgUseInfo
=
useInfoMapper
.
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgUseInfo
>().
eq
(
IdxBizJgUseInfo:
:
getRecord
,
eqId
));
exportParamsMap
.
put
(
"nameOfProjectDevice"
,
ValidationUtil
.
isEmpty
(
idxBizJgUseInfo
)
?
""
:
idxBizJgUseInfo
.
getProjectContraption
());
}
// 安全管理部门
exportParamsMap
.
put
(
"orgBranchName"
,
String
.
valueOf
(
jsonObject
.
get
(
"orgBranchCode"
)).
contains
(
"_"
)
?
String
.
valueOf
(
jsonObject
.
get
(
"orgBranchCode"
)).
split
(
"_"
)[
1
]
:
jsonObject
.
getString
(
"orgBranchName"
)
==
null
?
""
:
jsonObject
.
getString
(
"orgBranchName"
));
// 安全管理员
...
...
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