Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gk
Project
Project
Details
Activity
Releases
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
micro_app
gk
Commits
22ae2fad
Commit
22ae2fad
authored
Dec 09, 2021
by
chenlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加报名状态代码返回enrollStatusCode
parent
c3d2b3f5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
RoadUser.java
...in/java/com/dlbridge/jadp/plugins/cmpt/bean/RoadUser.java
+2
-0
RemoteService.java
...com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java
+6
-2
No files found.
src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/RoadUser.java
View file @
22ae2fad
...
@@ -17,6 +17,8 @@ public class RoadUser {
...
@@ -17,6 +17,8 @@ public class RoadUser {
private
String
enrollStatus
;
//报名状态
private
String
enrollStatus
;
//报名状态
private
int
enrollStatusCode
;
//报名状态代码
private
String
roadName
;
private
String
roadName
;
private
String
idNumber
;
// 身份证
private
String
idNumber
;
// 身份证
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java
View file @
22ae2fad
...
@@ -239,7 +239,7 @@ public class RemoteService {
...
@@ -239,7 +239,7 @@ public class RemoteService {
public
List
<
RoadUser
>
getEnrollUsers
(
Integer
cmptId
,
Integer
userId
)
{
public
List
<
RoadUser
>
getEnrollUsers
(
Integer
cmptId
,
Integer
userId
)
{
// 根据计时系统的赛事ID查询关联的报名系统赛事ID
// 根据计时系统的赛事ID查询关联的报名系统赛事ID
Integer
cid
=
cmptSettingService
.
getCommonEnrollCmptId
(
Integer
.
valueOf
(
cmptId
));
Integer
cid
=
cmptSettingService
.
getCommonEnrollCmptId
(
Integer
.
valueOf
(
cmptId
));
log
.
info
(
"请求的路径:"
+
geexekURL
+
"enrollUser/queryEnrollInfo/"
+
cid
+
"/"
+
userId
);
log
.
info
(
"请求的路径
1
:"
+
geexekURL
+
"enrollUser/queryEnrollInfo/"
+
cid
+
"/"
+
userId
);
if
(
cid
==
null
)
return
null
;
if
(
cid
==
null
)
return
null
;
ResponseEntity
<
String
>
forEntity
=
restTemplate
.
getForEntity
(
geexekURL
+
"enrollUser/queryEnrollInfo/"
+
cid
+
"/"
+
userId
,
String
.
class
);
ResponseEntity
<
String
>
forEntity
=
restTemplate
.
getForEntity
(
geexekURL
+
"enrollUser/queryEnrollInfo/"
+
cid
+
"/"
+
userId
,
String
.
class
);
...
@@ -267,6 +267,10 @@ public class RemoteService {
...
@@ -267,6 +267,10 @@ public class RemoteService {
String
userName
=
o
.
getString
(
"userName"
);
String
userName
=
o
.
getString
(
"userName"
);
String
roadName
=
o
.
getString
(
"roadName"
);
String
roadName
=
o
.
getString
(
"roadName"
);
String
audiStatus
=
o
.
getString
(
"audiStatus"
);
String
audiStatus
=
o
.
getString
(
"audiStatus"
);
// 增加报名状态代码返回 By Linc 2021/12/09
int
enrollStatusCode
=
o
.
getIntValue
(
"enrollStatusCode"
);
log
.
info
(
"=====增加报名状态代码返回enrollStatusCode==="
+
enrollStatusCode
);
user
.
setEnrollStatusCode
(
enrollStatusCode
);
user
.
setUserMapId
(
o
.
getIntValue
(
"userMapId"
));
user
.
setUserMapId
(
o
.
getIntValue
(
"userMapId"
));
user
.
setIdNumber
(
o
.
getString
(
"idNumber"
));
user
.
setIdNumber
(
o
.
getString
(
"idNumber"
));
user
.
setMobile
(
callPhone
).
setRoadName
(
roadName
).
setUserName
(
userName
);
user
.
setMobile
(
callPhone
).
setRoadName
(
roadName
).
setUserName
(
userName
);
...
@@ -281,7 +285,7 @@ public class RemoteService {
...
@@ -281,7 +285,7 @@ public class RemoteService {
}
}
// 奥森小程序增加头像地址返回 by Linc 2021/09/24
// 奥森小程序增加头像地址返回 by Linc 2021/09/24
String
imgUrl
=
o
.
getString
(
"cert"
);
String
imgUrl
=
o
.
getString
(
"cert"
);
log
.
info
(
imgUrl
+
":cert=== 奥森小程序增加头像地址返回===remark:"
+
o
.
getString
(
"remark"
));
//
log.info(imgUrl+":cert=== 奥森小程序增加头像地址返回===remark:"+o.getString("remark"));
// 如果cert字段里没有头像则再去解析自定义项中的头像
// 如果cert字段里没有头像则再去解析自定义项中的头像
if
(
StringUtils
.
isBlank
(
imgUrl
)){
if
(
StringUtils
.
isBlank
(
imgUrl
)){
String
remark
=
o
.
getString
(
"remark"
);
String
remark
=
o
.
getString
(
"remark"
);
...
...
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