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
2de41096
Commit
2de41096
authored
Jul 09, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(综合搜索):数据同步自测bug
1.管道的使用登记证编号
parent
8a45bb77
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
0 deletions
+19
-0
ProjectContraptionChangeDataDto.java
...ot/module/jg/api/dto/ProjectContraptionChangeDataDto.java
+3
-0
PieLineDataChangeServiceImpl.java
.../biz/edit/process/equip/PieLineDataChangeServiceImpl.java
+2
-0
SingleProjectEquipChangeProcess.java
...z/edit/process/equip/SingleProjectEquipChangeProcess.java
+14
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/ProjectContraptionChangeDataDto.java
View file @
2de41096
...
@@ -129,4 +129,7 @@ public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
...
@@ -129,4 +129,7 @@ public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
@FieldDisplayDefine
(
value
=
"属地监管部门"
)
@FieldDisplayDefine
(
value
=
"属地监管部门"
)
private
String
orgName
;
private
String
orgName
;
@FieldDisplayDefine
(
value
=
"使用登记编号"
)
private
String
useRegistrationCode
;
}
}
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/PieLineDataChangeServiceImpl.java
View file @
2de41096
...
@@ -94,6 +94,7 @@ public class PieLineDataChangeServiceImpl {
...
@@ -94,6 +94,7 @@ public class PieLineDataChangeServiceImpl {
updateWrapper
.
set
(
IdxBizJgProjectContraption:
:
getOtherAccessories
,
projectContraptionChangeDataDtoNew
.
getOtherAccessories
());
updateWrapper
.
set
(
IdxBizJgProjectContraption:
:
getOtherAccessories
,
projectContraptionChangeDataDtoNew
.
getOtherAccessories
());
updateWrapper
.
set
(
IdxBizJgProjectContraption:
:
getOrgCode
,
projectContraptionChangeDataDtoNew
.
getOrgCode
());
updateWrapper
.
set
(
IdxBizJgProjectContraption:
:
getOrgCode
,
projectContraptionChangeDataDtoNew
.
getOrgCode
());
updateWrapper
.
set
(
IdxBizJgProjectContraption:
:
getOrgName
,
projectContraptionChangeDataDtoNew
.
getOrgName
());
updateWrapper
.
set
(
IdxBizJgProjectContraption:
:
getOrgName
,
projectContraptionChangeDataDtoNew
.
getOrgName
());
updateWrapper
.
set
(
IdxBizJgProjectContraption:
:
getUseRegistrationCode
,
projectContraptionChangeDataDtoNew
.
getUseRegistrationCode
());
updateWrapper
.
set
(
IdxBizJgProjectContraption:
:
getProductQualificationCertificate
,
projectContraptionChangeDataDtoNew
.
getProductQualificationCertificate
());
updateWrapper
.
set
(
IdxBizJgProjectContraption:
:
getProductQualificationCertificate
,
projectContraptionChangeDataDtoNew
.
getProductQualificationCertificate
());
updateWrapper
.
set
(
BaseEntity:
:
getRecDate
,
new
Date
());
updateWrapper
.
set
(
BaseEntity:
:
getRecDate
,
new
Date
());
updateWrapper
.
eq
(
BaseEntity:
:
getSequenceNbr
,
projectContraptionChangeDataDtoNew
.
getProjectContraptionId
());
updateWrapper
.
eq
(
BaseEntity:
:
getSequenceNbr
,
projectContraptionChangeDataDtoNew
.
getProjectContraptionId
());
...
@@ -217,6 +218,7 @@ public class PieLineDataChangeServiceImpl {
...
@@ -217,6 +218,7 @@ public class PieLineDataChangeServiceImpl {
registerInfo
.
setSequenceNbr
(
null
);
registerInfo
.
setSequenceNbr
(
null
);
registerInfo
.
setEquCodeType
(
"2"
);
registerInfo
.
setEquCodeType
(
"2"
);
registerInfo
.
setRegisterState
(
this
.
getRegCode
());
registerInfo
.
setRegisterState
(
this
.
getRegCode
());
registerInfo
.
setUseOrgCode
(
projectContraptionChangeDataDto
.
getUseRegistrationCode
());
registerInfo
.
setEquList
(
projectContraptionChangeDataDto
.
getEquList
());
registerInfo
.
setEquList
(
projectContraptionChangeDataDto
.
getEquList
());
registerInfo
.
setEquCategory
(
projectContraptionChangeDataDto
.
getEquCategory
());
registerInfo
.
setEquCategory
(
projectContraptionChangeDataDto
.
getEquCategory
());
registerInfo
.
setEquDefine
(
projectContraptionChangeDataDto
.
getEquDefine
());
registerInfo
.
setEquDefine
(
projectContraptionChangeDataDto
.
getEquDefine
());
...
...
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/SingleProjectEquipChangeProcess.java
View file @
2de41096
...
@@ -8,6 +8,7 @@ import cn.hutool.core.text.CharSequenceUtil;
...
@@ -8,6 +8,7 @@ import cn.hutool.core.text.CharSequenceUtil;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.yeejoin.amos.boot.biz.common.bo.CompanyBo
;
import
com.yeejoin.amos.boot.biz.common.bo.CompanyBo
;
import
com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher
;
import
com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher
;
import
com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent
;
import
com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent
;
...
@@ -19,8 +20,10 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataCha
...
@@ -19,8 +20,10 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataCha
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.HandleResult
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.HandleResult
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.IEquipChangeDataProcessStrategy
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.IEquipChangeDataProcessStrategy
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.PieLineLevelTypeHandler
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.PieLineLevelTypeHandler
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.ObjectUtils
;
...
@@ -46,6 +49,7 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
...
@@ -46,6 +49,7 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
private
final
PieLineLevelTypeHandler
pieLineLevelTypeHandler
;
private
final
PieLineLevelTypeHandler
pieLineLevelTypeHandler
;
private
final
EsUpdateService
esUpdateService
;
private
final
EsUpdateService
esUpdateService
;
private
final
IdxBizJgRegisterInfoServiceImpl
idxBizJgRegisterInfoServiceImpl
;
@Override
@Override
...
@@ -99,6 +103,8 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
...
@@ -99,6 +103,8 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
}
else
{
// 实时更新
}
else
{
// 实时更新
// 基本信息-特殊管道的使用信息变化更新但是不记录变更流水
// 基本信息-特殊管道的使用信息变化更新但是不记录变更流水
this
.
updateUseInfo
(
pipelineNew
,
projectContraptionChangeDataDto
,
allChangeColumns
);
this
.
updateUseInfo
(
pipelineNew
,
projectContraptionChangeDataDto
,
allChangeColumns
);
// 更新管道的使用登记证编号
this
.
updateRegisterInfo
(
record
,
projectContraptionChangeDataDto
);
// 安装信息
// 安装信息
this
.
updateConstructionInfo
(
pipelineNew
,
projectContraptionChangeDataDto
,
allChangeColumns
);
this
.
updateConstructionInfo
(
pipelineNew
,
projectContraptionChangeDataDto
,
allChangeColumns
);
// 检验信息
// 检验信息
...
@@ -121,6 +127,14 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
...
@@ -121,6 +127,14 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
return
HandleResult
.
builder
().
fieldChangeMetas
(
allChangeColumns
).
pipelineChangeItemMap
(
pmap
).
build
();
return
HandleResult
.
builder
().
fieldChangeMetas
(
allChangeColumns
).
pipelineChangeItemMap
(
pmap
).
build
();
}
}
private
void
updateRegisterInfo
(
String
record
,
ProjectContraptionChangeDataDto
projectContraptionChangeDataDto
)
{
// 管道不记录使用信息变化,使用信息的变化已装置来体现
LambdaUpdateWrapper
<
IdxBizJgRegisterInfo
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
IdxBizJgRegisterInfo:
:
getRecord
,
record
);
updateWrapper
.
set
(
IdxBizJgRegisterInfo:
:
getUseOrgCode
,
projectContraptionChangeDataDto
.
getUseRegistrationCode
());
idxBizJgRegisterInfoServiceImpl
.
update
(
updateWrapper
);
}
private
void
buildTechParamChangeLog
(
String
record
,
PipelineChangeItemDto
pipelineNew
,
PipelineChangeItemDto
pipelineOld
,
ProjectContraptionChangeDataDto
projectContraptionChangeDataDto
,
List
<
FieldChangeMeta
>
allChangeColumns
)
{
private
void
buildTechParamChangeLog
(
String
record
,
PipelineChangeItemDto
pipelineNew
,
PipelineChangeItemDto
pipelineOld
,
ProjectContraptionChangeDataDto
projectContraptionChangeDataDto
,
List
<
FieldChangeMeta
>
allChangeColumns
)
{
TechParamsPipelineChangeFieldDto
paramsPipelineChangeFieldNew
=
new
TechParamsPipelineChangeFieldDto
();
TechParamsPipelineChangeFieldDto
paramsPipelineChangeFieldNew
=
new
TechParamsPipelineChangeFieldDto
();
...
...
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