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
e4d60f82
Commit
e4d60f82
authored
May 27, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(大编辑):bug修复
1.前端根据dateSource无法判断设备来源,后端处理后返回,前端业务块显示隐藏使用
parent
20725ceb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
CommonEquipDataProcessService.java
...biz/edit/process/equip/CommonEquipDataProcessService.java
+13
-0
IdxBizJgOtherInfo.java
...in/amos/boot/module/ymt/api/entity/IdxBizJgOtherInfo.java
+2
-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/edit/process/equip/CommonEquipDataProcessService.java
View file @
e4d60f82
...
...
@@ -761,9 +761,21 @@ public class CommonEquipDataProcessService {
result
.
put
(
"maintenanceSeq"
,
idxBizJgMaintenanceRecordInfo
!=
null
?
idxBizJgMaintenanceRecordInfo
.
getSequenceNbr
()
:
null
);
result
.
put
(
"constructionInfoSeq"
,
constructionInfo
!=
null
?
constructionInfo
.
getSequenceNbr
()
:
null
);
result
.
put
(
"record"
,
useInfo
.
getRecord
());
// 设备来源,前端无法判断,故后端进行判断,分为新设备(new)、历史有证设备(his)、历史无证设备(black)
result
.
put
(
"dataSourceClassify"
,
this
.
genDataSource
(
useInfo
.
getDataSource
()));
return
result
;
}
private
String
genDataSource
(
String
dataSource
)
{
if
(
dataSource
.
contains
(
"jg_his_black"
))
{
return
"black"
;
}
else
if
(
dataSource
.
contains
(
"jg_his"
))
{
return
"his"
;
}
else
{
return
"new"
;
}
}
public
IPage
<?>
getEquListByRecords
(
Set
<
String
>
eqs
,
JSONObject
map
)
{
if
(
map
.
containsKey
(
"flag"
)
&&
!
map
.
containsKey
(
"USE_UNIT_CREDIT_CODE"
))
{
return
new
Page
<>();
...
...
@@ -886,6 +898,7 @@ public class CommonEquipDataProcessService {
equList
.
stream
().
filter
(
e
->
e
.
get
(
"inspectReport"
)
!=
null
).
forEach
(
item
->
item
.
put
(
"inspectReport"
,
JSON
.
parse
(
item
.
get
(
"inspectReport"
).
toString
())));
re
.
put
(
"projectContraptionId"
,
projectContraption
.
getSequenceNbr
());
re
.
put
(
"tableData"
,
equList
);
re
.
put
(
"dataSourceClassify"
,
this
.
genDataSource
(
projectContraption
.
getDataSource
()));
return
re
;
}
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgOtherInfo.java
View file @
e4d60f82
...
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine
;
import
com.yeejoin.amos.boot.biz.common.annotation.Group
;
import
com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity
;
import
com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData
;
import
lombok.Data
;
...
...
@@ -20,6 +21,7 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"idx_biz_jg_other_info"
)
@Group
(
"idx_biz_jg_other_info"
)
public
class
IdxBizJgOtherInfo
extends
TzsBaseEntity
implements
IBaseChangeData
{
/**
...
...
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