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
6830228d
Commit
6830228d
authored
Dec 18, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):管道列表去掉使用地点字段
parent
f4ddd84b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
IdxBizJgProjectContraptionServiceImpl.java
...z/service/impl/IdxBizJgProjectContraptionServiceImpl.java
+9
-6
IdxBizJgProjectContraption.java
...oot/module/ymt/api/entity/IdxBizJgProjectContraption.java
+2
-2
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/IdxBizJgProjectContraptionServiceImpl.java
View file @
6830228d
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
service
.
impl
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
service
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
java.util.stream.Stream
;
import
java.util.stream.Collectors
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.bo.CompanyBo
;
import
com.yeejoin.amos.boot.biz.common.bo.CompanyBo
;
...
@@ -19,10 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
...
@@ -19,10 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
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
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
/**
* 管道工程装置表服务实现类
* 管道工程装置表服务实现类
...
@@ -120,9 +119,13 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
...
@@ -120,9 +119,13 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
.
page
(
page
);
.
page
(
page
);
pageList
.
getRecords
().
forEach
(
record
->
{
pageList
.
getRecords
().
forEach
(
record
->
{
record
.
setDataSourceName
(
EquipSourceEnum
.
getDataSourceName
(
record
.
getDataSource
()));
record
.
setDataSourceName
(
EquipSourceEnum
.
getDataSourceName
(
record
.
getDataSource
()));
record
.
setFullAddress
(
record
.
getProvinceName
()+
record
.
getCityName
()+
record
.
getCountyName
()+
record
.
getStreetName
()+
record
.
getAddress
());
record
.
setFullAddress
(
record
.
setCan_edit
(
this
.
checkContraptionIsCanEdit
(
record
.
getSequenceNbr
()));
Stream
.
of
(
record
.
getProvinceName
(),
record
.
getCityName
(),
record
.
getCountyName
(),
record
.
getStreetName
(),
record
.
getAddress
())
record
.
setCan_delete
(
this
.
checkContraptionIsCanDelete
(
record
.
getSequenceNbr
()));
.
map
(
value
->
value
==
null
?
""
:
value
)
.
collect
(
Collectors
.
joining
())
);
record
.
setCanEdit
(
this
.
checkContraptionIsCanEdit
(
record
.
getSequenceNbr
()));
record
.
setCanDelete
(
this
.
checkContraptionIsCanDelete
(
record
.
getSequenceNbr
()));
});
});
return
pageList
;
return
pageList
;
}
}
...
...
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 @
6830228d
...
@@ -237,13 +237,13 @@ public class IdxBizJgProjectContraption extends BaseEntity {
...
@@ -237,13 +237,13 @@ public class IdxBizJgProjectContraption extends BaseEntity {
* 是否可编辑
* 是否可编辑
*/
*/
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
Boolean
can
_e
dit
;
private
Boolean
can
E
dit
;
/**
/**
* 是否可删除
* 是否可删除
*/
*/
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
Boolean
can
_d
elete
;
private
Boolean
can
D
elete
;
/**
/**
* 使用地址
* 使用地址
...
...
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