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
4a7f03f3
Commit
4a7f03f3
authored
Jun 20, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(使用登记):使用登记详情接口少返回字段
1.增加字段主键sequenceNbr、登记类型regType
parent
40b684cc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
CommonServiceImpl.java
...os/boot/module/jg/biz/service/impl/CommonServiceImpl.java
+2
-2
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+2
-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/service/impl/CommonServiceImpl.java
View file @
4a7f03f3
...
@@ -165,8 +165,8 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -165,8 +165,8 @@ public class CommonServiceImpl implements ICommonService {
// 业务通用发起——基本信息
// 业务通用发起——基本信息
private
static
final
String
basic
=
"basic"
;
private
static
final
String
basic
=
"basic"
;
private
static
final
String
useRegFormUpload
=
"useRegFormUpload"
;
private
static
final
String
useRegFormUpload
=
"useRegFormUpload"
;
p
rivate
static
final
String
HISTORY_EQU_TYPE
=
"historyEquType"
;
p
ublic
static
final
String
HISTORY_EQU_TYPE
=
"historyEquType"
;
p
rivate
static
final
String
SECOND
=
"second"
;
p
ublic
static
final
String
SECOND
=
"second"
;
// 业务通用发起——告知单详情
// 业务通用发起——告知单详情
public
static
final
String
notice
=
"notice"
;
public
static
final
String
notice
=
"notice"
;
// 业务通用发起——技术参数-改造变更登记使用
// 业务通用发起——技术参数-改造变更登记使用
...
...
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/JgUseRegistrationServiceImpl.java
View file @
4a7f03f3
...
@@ -2235,6 +2235,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -2235,6 +2235,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
lambda
.
eq
(
JgRegistrationHistory:
:
getIsDelete
,
false
);
lambda
.
eq
(
JgRegistrationHistory:
:
getIsDelete
,
false
);
JgRegistrationHistory
jgRegistrationHistory
=
jgRegistrationHistoryService
.
getBaseMapper
().
selectOne
(
lambda
);
JgRegistrationHistory
jgRegistrationHistory
=
jgRegistrationHistoryService
.
getBaseMapper
().
selectOne
(
lambda
);
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
jgRegistrationHistory
.
getChangeData
());
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
jgRegistrationHistory
.
getChangeData
());
jsonObject
.
put
(
"sequenceNbr"
,
jgUseRegistration
.
getSequenceNbr
());
jsonObject
.
put
(
"manageType"
,
jgUseRegistration
.
getManageType
());
jsonObject
.
put
(
"manageType"
,
jgUseRegistration
.
getManageType
());
jsonObject
.
put
(
"createUserId"
,
jgUseRegistration
.
getCreateUserId
());
jsonObject
.
put
(
"createUserId"
,
jgUseRegistration
.
getCreateUserId
());
jsonObject
.
put
(
"receiveOrgCode"
,
jgUseRegistration
.
getReceiveCompanyCode
()
+
"_"
+
jgUseRegistration
.
getReceiveOrgName
());
jsonObject
.
put
(
"receiveOrgCode"
,
jgUseRegistration
.
getReceiveCompanyCode
()
+
"_"
+
jgUseRegistration
.
getReceiveOrgName
());
...
@@ -2260,7 +2261,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -2260,7 +2261,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper
<
IdxBizJgRegisterInfo
>
wrapper
=
new
QueryWrapper
<
IdxBizJgRegisterInfo
>().
lambda
().
eq
(
IdxBizJgRegisterInfo:
:
getRecord
,
record
);
LambdaQueryWrapper
<
IdxBizJgRegisterInfo
>
wrapper
=
new
QueryWrapper
<
IdxBizJgRegisterInfo
>().
lambda
().
eq
(
IdxBizJgRegisterInfo:
:
getRecord
,
record
);
IdxBizJgRegisterInfo
idxBizJgRegisterInfo
=
idxBizJgRegisterInfoMapper
.
selectOne
(
wrapper
);
IdxBizJgRegisterInfo
idxBizJgRegisterInfo
=
idxBizJgRegisterInfoMapper
.
selectOne
(
wrapper
);
jsonObject
.
put
(
"carNumber"
,
idxBizJgRegisterInfo
.
getCarNumber
());
jsonObject
.
put
(
"carNumber"
,
idxBizJgRegisterInfo
.
getCarNumber
());
jsonObject
.
put
(
"regType"
,
jgUseRegistration
.
getRegType
());
}
else
{
}
else
{
List
<
Map
<
String
,
Object
>>
equipmentLists
=
(
List
<
Map
<
String
,
Object
>>)
jsonObject
.
get
(
"equipmentLists"
);
List
<
Map
<
String
,
Object
>>
equipmentLists
=
(
List
<
Map
<
String
,
Object
>>)
jsonObject
.
get
(
"equipmentLists"
);
List
<
String
>
records
=
equipmentLists
.
stream
().
map
(
v
->
(
String
)
v
.
get
(
"record"
)).
collect
(
toList
());
List
<
String
>
records
=
equipmentLists
.
stream
().
map
(
v
->
(
String
)
v
.
get
(
"record"
)).
collect
(
toList
());
...
@@ -2285,6 +2285,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -2285,6 +2285,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
}
}
}
}
}
jsonObject
.
put
(
"regType"
,
jgUseRegistration
.
getRegType
());
jsonObject
.
put
(
"useRegistrationCode"
,
jgUseRegistration
.
getUseRegistrationCode
());
jsonObject
.
put
(
"useRegistrationCode"
,
jgUseRegistration
.
getUseRegistrationCode
());
jsonObject
.
put
(
"useRegistrationFormUrl"
,
jgUseRegistration
.
getUseRegistrationFormUrl
());
jsonObject
.
put
(
"useRegistrationFormUrl"
,
jgUseRegistration
.
getUseRegistrationFormUrl
());
jsonObject
.
put
(
"useRegistrationFormFile"
,
JSONArray
.
parseArray
(
jgUseRegistration
.
getUseRegistrationFormFile
()));
jsonObject
.
put
(
"useRegistrationFormFile"
,
JSONArray
.
parseArray
(
jgUseRegistration
.
getUseRegistrationFormFile
()));
...
...
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