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
5caca3b5
Commit
5caca3b5
authored
May 15, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(大编辑):自测联调修改
1.最新日期进行更新
parent
a8586f0a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
SingleEquipChangeProcess.java
...e/jg/biz/edit/process/equip/SingleEquipChangeProcess.java
+11
-1
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/SingleEquipChangeProcess.java
View file @
5caca3b5
...
@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
...
@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -34,31 +35,37 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
...
@@ -34,31 +35,37 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
IdxBizJgUseInfo
useInfoNew
=
BeanUtil
.
copyProperties
(
useInfoOld
,
IdxBizJgUseInfo
.
class
);
IdxBizJgUseInfo
useInfoNew
=
BeanUtil
.
copyProperties
(
useInfoOld
,
IdxBizJgUseInfo
.
class
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
useInfoNew
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
useInfoNew
);
useInfoNew
.
setSequenceNbr
(
useInfoOld
.
getSequenceNbr
());
useInfoNew
.
setSequenceNbr
(
useInfoOld
.
getSequenceNbr
());
useInfoNew
.
setRecDate
(
new
Date
());
IdxBizJgRegisterInfo
registerInfoOld
=
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgRegisterInfoService
().
getOne
(
new
LambdaQueryWrapper
<
IdxBizJgRegisterInfo
>().
eq
(
IdxBizJgRegisterInfo:
:
getRecord
,
record
));
IdxBizJgRegisterInfo
registerInfoOld
=
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgRegisterInfoService
().
getOne
(
new
LambdaQueryWrapper
<
IdxBizJgRegisterInfo
>().
eq
(
IdxBizJgRegisterInfo:
:
getRecord
,
record
));
IdxBizJgRegisterInfo
registerInfoNew
=
BeanUtil
.
copyProperties
(
registerInfoOld
,
IdxBizJgRegisterInfo
.
class
);
IdxBizJgRegisterInfo
registerInfoNew
=
BeanUtil
.
copyProperties
(
registerInfoOld
,
IdxBizJgRegisterInfo
.
class
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
registerInfoNew
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
registerInfoNew
);
registerInfoNew
.
setSequenceNbr
(
registerInfoOld
.
getSequenceNbr
());
registerInfoNew
.
setSequenceNbr
(
registerInfoOld
.
getSequenceNbr
());
registerInfoNew
.
setRecDate
(
new
Date
());
IdxBizJgFactoryInfo
factoryInfoOld
=
commonEquipDataProcessService
.
getJgFactoryInfoMapper
().
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgFactoryInfo
>().
eq
(
IdxBizJgFactoryInfo:
:
getRecord
,
record
));
IdxBizJgFactoryInfo
factoryInfoOld
=
commonEquipDataProcessService
.
getJgFactoryInfoMapper
().
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgFactoryInfo
>().
eq
(
IdxBizJgFactoryInfo:
:
getRecord
,
record
));
IdxBizJgFactoryInfo
factoryInfoNew
=
BeanUtil
.
copyProperties
(
factoryInfoOld
,
IdxBizJgFactoryInfo
.
class
);
IdxBizJgFactoryInfo
factoryInfoNew
=
BeanUtil
.
copyProperties
(
factoryInfoOld
,
IdxBizJgFactoryInfo
.
class
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
factoryInfoNew
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
factoryInfoNew
);
factoryInfoNew
.
setSequenceNbr
(
factoryInfoOld
.
getSequenceNbr
());
factoryInfoNew
.
setSequenceNbr
(
factoryInfoOld
.
getSequenceNbr
());
factoryInfoNew
.
setRecDate
(
new
Date
());
IdxBizJgDesignInfo
designInfoOld
=
commonEquipDataProcessService
.
getIdxBizJgDesignInfoMapper
().
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgDesignInfo
>().
eq
(
IdxBizJgDesignInfo:
:
getRecord
,
record
));
IdxBizJgDesignInfo
designInfoOld
=
commonEquipDataProcessService
.
getIdxBizJgDesignInfoMapper
().
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgDesignInfo
>().
eq
(
IdxBizJgDesignInfo:
:
getRecord
,
record
));
IdxBizJgDesignInfo
designInfoNew
=
BeanUtil
.
copyProperties
(
factoryInfoOld
,
IdxBizJgDesignInfo
.
class
);;
IdxBizJgDesignInfo
designInfoNew
=
BeanUtil
.
copyProperties
(
factoryInfoOld
,
IdxBizJgDesignInfo
.
class
);;
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
designInfoNew
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
designInfoNew
);
designInfoNew
.
setSequenceNbr
(
designInfoOld
.
getSequenceNbr
());
designInfoNew
.
setSequenceNbr
(
designInfoOld
.
getSequenceNbr
());
designInfoNew
.
setRecDate
(
new
Date
());
IdxBizJgOtherInfo
otherInfoOld
=
commonEquipDataProcessService
.
getIdxBizJgOtherInfoMapper
().
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgOtherInfo
>().
eq
(
IdxBizJgOtherInfo:
:
getRecord
,
record
));
IdxBizJgOtherInfo
otherInfoOld
=
commonEquipDataProcessService
.
getIdxBizJgOtherInfoMapper
().
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgOtherInfo
>().
eq
(
IdxBizJgOtherInfo:
:
getRecord
,
record
));
IdxBizJgOtherInfo
otherInfoNew
=
BeanUtil
.
copyProperties
(
factoryInfoOld
,
IdxBizJgOtherInfo
.
class
);
IdxBizJgOtherInfo
otherInfoNew
=
BeanUtil
.
copyProperties
(
factoryInfoOld
,
IdxBizJgOtherInfo
.
class
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
otherInfoNew
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
otherInfoNew
);
otherInfoNew
.
setSequenceNbr
(
otherInfoOld
.
getSequenceNbr
());
otherInfoNew
.
setSequenceNbr
(
otherInfoOld
.
getSequenceNbr
());
otherInfoNew
.
setRecDate
(
new
Date
());
IdxBizJgSupervisionInfo
idxBizJgSupervisionInfoOld
=
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgSupervisionInfoMapper
().
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgSupervisionInfo
>().
eq
(
IdxBizJgSupervisionInfo:
:
getRecord
,
record
));
IdxBizJgSupervisionInfo
idxBizJgSupervisionInfoOld
=
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgSupervisionInfoMapper
().
selectOne
(
new
LambdaQueryWrapper
<
IdxBizJgSupervisionInfo
>().
eq
(
IdxBizJgSupervisionInfo:
:
getRecord
,
record
));
IdxBizJgSupervisionInfo
idxBizJgSupervisionInfoNew
=
BeanUtil
.
copyProperties
(
factoryInfoOld
,
IdxBizJgSupervisionInfo
.
class
);
IdxBizJgSupervisionInfo
idxBizJgSupervisionInfoNew
=
BeanUtil
.
copyProperties
(
factoryInfoOld
,
IdxBizJgSupervisionInfo
.
class
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
idxBizJgSupervisionInfoNew
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
idxBizJgSupervisionInfoNew
);
idxBizJgSupervisionInfoNew
.
setSequenceNbr
(
idxBizJgSupervisionInfoOld
.
getSequenceNbr
());
idxBizJgSupervisionInfoNew
.
setSequenceNbr
(
idxBizJgSupervisionInfoOld
.
getSequenceNbr
());
idxBizJgSupervisionInfoNew
.
setRecDate
(
new
Date
());
String
jySeq
=
changeJson
.
getString
(
"jySeq"
);
String
jySeq
=
changeJson
.
getString
(
"jySeq"
);
String
maintenanceSeq
=
changeJson
.
getString
(
"maintenanceSeq"
);
String
maintenanceSeq
=
changeJson
.
getString
(
"maintenanceSeq"
);
...
@@ -68,15 +75,17 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
...
@@ -68,15 +75,17 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
IdxBizJgInspectionDetectionInfo
inspectionDetectionInfoNew
=
BeanUtil
.
copyProperties
(
inspectionDetectionInfoOld
,
IdxBizJgInspectionDetectionInfo
.
class
);
IdxBizJgInspectionDetectionInfo
inspectionDetectionInfoNew
=
BeanUtil
.
copyProperties
(
inspectionDetectionInfoOld
,
IdxBizJgInspectionDetectionInfo
.
class
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
idxBizJgSupervisionInfoNew
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
idxBizJgSupervisionInfoNew
);
inspectionDetectionInfoNew
.
setSequenceNbr
(
inspectionDetectionInfoOld
.
getSequenceNbr
());
inspectionDetectionInfoNew
.
setSequenceNbr
(
inspectionDetectionInfoOld
.
getSequenceNbr
());
inspectionDetectionInfoNew
.
setRecDate
(
new
Date
());
List
<
FieldChangeMeta
>
inspectionFieldChangeMetas
=
commonEquipDataProcessService
.
simpleTrackAndUpdate
(
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getInspectionDetectionInfoService
().
getBaseMapper
(),
inspectionDetectionInfoOld
,
inspectionDetectionInfoNew
,
useInfoNew
.
getRecord
(),
"SEQUENCE_NBR"
,
inspectionDetectionInfoOld
.
getSequenceNbr
());
List
<
FieldChangeMeta
>
inspectionFieldChangeMetas
=
commonEquipDataProcessService
.
simpleTrackAndUpdate
(
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getInspectionDetectionInfoService
().
getBaseMapper
(),
inspectionDetectionInfoOld
,
inspectionDetectionInfoNew
,
useInfoNew
.
getRecord
(),
"SEQUENCE_NBR"
,
inspectionDetectionInfoOld
.
getSequenceNbr
());
allChangeColumns
.
addAll
(
inspectionFieldChangeMetas
);
allChangeColumns
.
addAll
(
inspectionFieldChangeMetas
);
commonEquipDataProcessService
.
updateEsDataOfEquip
(
record
,
inspectionDetectionInfoNew
);
commonEquipDataProcessService
.
updateEsDataOfEquip
(
record
,
inspectionDetectionInfoNew
);
}
}
if
(
maintenanceSeq
!=
null
)
{
if
(
maintenanceSeq
!=
null
)
{
IdxBizJgMaintenanceRecordInfo
idxBizJgMaintenanceRecordInfoOld
=
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgMaintenanceRecordInfoService
().
getById
(
maintenanceSeq
);
IdxBizJgMaintenanceRecordInfo
idxBizJgMaintenanceRecordInfoOld
=
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgMaintenanceRecordInfoService
().
getById
(
maintenanceSeq
);
IdxBizJgMaintenanceRecordInfo
idxBizJgMaintenanceRecordInfoNew
=
BeanUtil
.
copyProperties
(
factory
InfoOld
,
IdxBizJgMaintenanceRecordInfo
.
class
);
IdxBizJgMaintenanceRecordInfo
idxBizJgMaintenanceRecordInfoNew
=
BeanUtil
.
copyProperties
(
idxBizJgMaintenanceRecord
InfoOld
,
IdxBizJgMaintenanceRecordInfo
.
class
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
idxBizJgMaintenanceRecordInfoNew
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
idxBizJgMaintenanceRecordInfoNew
);
idxBizJgMaintenanceRecordInfoNew
.
setSequenceNbr
(
idxBizJgMaintenanceRecordInfoOld
.
getSequenceNbr
());
idxBizJgMaintenanceRecordInfoNew
.
setSequenceNbr
(
idxBizJgMaintenanceRecordInfoOld
.
getSequenceNbr
());
idxBizJgMaintenanceRecordInfoNew
.
setRecDate
(
new
Date
());
List
<
FieldChangeMeta
>
idxBizJgMaintenanceFieldChangeMetas
=
commonEquipDataProcessService
.
simpleTrackAndUpdate
(
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgMaintenanceRecordInfoService
().
getBaseMapper
(),
idxBizJgMaintenanceRecordInfoOld
,
idxBizJgMaintenanceRecordInfoNew
,
useInfoNew
.
getRecord
(),
"SEQUENCE_NBR"
,
idxBizJgMaintenanceRecordInfoOld
.
getSequenceNbr
());
List
<
FieldChangeMeta
>
idxBizJgMaintenanceFieldChangeMetas
=
commonEquipDataProcessService
.
simpleTrackAndUpdate
(
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgMaintenanceRecordInfoService
().
getBaseMapper
(),
idxBizJgMaintenanceRecordInfoOld
,
idxBizJgMaintenanceRecordInfoNew
,
useInfoNew
.
getRecord
(),
"SEQUENCE_NBR"
,
idxBizJgMaintenanceRecordInfoOld
.
getSequenceNbr
());
allChangeColumns
.
addAll
(
idxBizJgMaintenanceFieldChangeMetas
);
allChangeColumns
.
addAll
(
idxBizJgMaintenanceFieldChangeMetas
);
}
}
...
@@ -85,6 +94,7 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
...
@@ -85,6 +94,7 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
IdxBizJgConstructionInfo
constructionInfoNew
=
BeanUtil
.
copyProperties
(
constructionInfoOld
,
IdxBizJgConstructionInfo
.
class
);
IdxBizJgConstructionInfo
constructionInfoNew
=
BeanUtil
.
copyProperties
(
constructionInfoOld
,
IdxBizJgConstructionInfo
.
class
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
constructionInfoNew
);
CommonEquipDataProcessService
.
castMap2Bean
(
changeJson
,
constructionInfoNew
);
constructionInfoNew
.
setSequenceNbr
(
constructionInfoOld
.
getSequenceNbr
());
constructionInfoNew
.
setSequenceNbr
(
constructionInfoOld
.
getSequenceNbr
());
constructionInfoNew
.
setRecDate
(
new
Date
());
List
<
FieldChangeMeta
>
constructionInfoFieldChangeMetas
=
commonEquipDataProcessService
.
simpleTrackAndUpdate
(
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgConstructionInfoService
().
getBaseMapper
(),
constructionInfoOld
,
constructionInfoNew
,
useInfoNew
.
getRecord
(),
"SEQUENCE_NBR"
,
constructionInfoOld
.
getSequenceNbr
());
List
<
FieldChangeMeta
>
constructionInfoFieldChangeMetas
=
commonEquipDataProcessService
.
simpleTrackAndUpdate
(
commonEquipDataProcessService
.
getJgUseRegistrationService
().
getIdxBizJgConstructionInfoService
().
getBaseMapper
(),
constructionInfoOld
,
constructionInfoNew
,
useInfoNew
.
getRecord
(),
"SEQUENCE_NBR"
,
constructionInfoOld
.
getSequenceNbr
());
allChangeColumns
.
addAll
(
constructionInfoFieldChangeMetas
);
allChangeColumns
.
addAll
(
constructionInfoFieldChangeMetas
);
}
}
...
...
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