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
fd37e376
Commit
fd37e376
authored
Jun 27, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(已纳管设备无证时可编辑):已纳管设备调整
1.已纳管设备调整 2.技术参数整理
parent
c6575ca2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
IdxBizJgProjectContraptionServiceImplService.java
...ce/impl/IdxBizJgProjectContraptionServiceImplService.java
+3
-1
IdxBizJgProjectContraption.java
...oot/module/ymt/api/entity/IdxBizJgProjectContraption.java
+8
-0
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/IdxBizJgProjectContraptionServiceImplService.java
View file @
fd37e376
...
@@ -346,7 +346,8 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
...
@@ -346,7 +346,8 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
}
}
IPage
<
IdxBizJgProjectContraption
>
pageList
=
queryWrapper
.
page
(
page
);
IPage
<
IdxBizJgProjectContraption
>
pageList
=
queryWrapper
.
page
(
page
);
// 单位类型区分的企业还是监管
String
companyType2
=
CommonServiceImpl
.
getCompanyType
(
company
);
if
(!
ValidationUtil
.
isEmpty
(
pageList
.
getRecords
()))
{
if
(!
ValidationUtil
.
isEmpty
(
pageList
.
getRecords
()))
{
pageList
.
getRecords
().
forEach
(
record
->
{
pageList
.
getRecords
().
forEach
(
record
->
{
BigDecimal
pipelineLength
=
BigDecimal
.
valueOf
(
record
.
getPipelineLength
());
BigDecimal
pipelineLength
=
BigDecimal
.
valueOf
(
record
.
getPipelineLength
());
...
@@ -360,6 +361,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
...
@@ -360,6 +361,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
.
map
(
value
->
value
==
null
?
""
:
value
)
.
map
(
value
->
value
==
null
?
""
:
value
)
.
collect
(
Collectors
.
joining
())
.
collect
(
Collectors
.
joining
())
);
);
record
.
setCompanyType
(
companyType2
);
});
});
List
<
Long
>
projectContraptionIdList
=
pageList
.
getRecords
().
stream
().
map
(
IdxBizJgProjectContraption:
:
getSequenceNbr
).
collect
(
Collectors
.
toList
());
List
<
Long
>
projectContraptionIdList
=
pageList
.
getRecords
().
stream
().
map
(
IdxBizJgProjectContraption:
:
getSequenceNbr
).
collect
(
Collectors
.
toList
());
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java
View file @
fd37e376
...
@@ -312,4 +312,12 @@ public class IdxBizJgProjectContraption extends BaseEntity {
...
@@ -312,4 +312,12 @@ public class IdxBizJgProjectContraption extends BaseEntity {
*/
*/
@TableField
(
"create_date"
)
@TableField
(
"create_date"
)
private
Date
createDate
;
private
Date
createDate
;
/**
* 公司类型区分监督还是企业
*/
@TableField
(
exist
=
false
)
private
String
companyType
;
}
}
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