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
bd11b008
Commit
bd11b008
authored
Sep 01, 2023
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
API bug
parent
fa47eed3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
PersonQrCodeController.java
...t/module/jxiop/biz/controller/PersonQrCodeController.java
+1
-1
SjglZsjZsbtzMapper.xml
.../src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml
+3
-3
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonQrCodeController.java
View file @
bd11b008
...
@@ -318,7 +318,7 @@ public class PersonQrCodeController extends BaseController {
...
@@ -318,7 +318,7 @@ public class PersonQrCodeController extends BaseController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"评估大屏 - 三级弹窗左侧信息API"
,
notes
=
"评估大屏 - 三级弹窗左侧信息API"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"评估大屏 - 三级弹窗左侧信息API"
,
notes
=
"评估大屏 - 三级弹窗左侧信息API"
)
public
ResponseModel
<
Map
<
String
,
Object
>>
getDetailInfoByObjectId
(
@RequestParam
(
value
=
"objectId"
)
String
objectId
,
public
ResponseModel
<
Map
<
String
,
Object
>>
getDetailInfoByObjectId
(
@RequestParam
(
value
=
"objectId"
)
String
objectId
,
@RequestParam
(
value
=
"column"
)
String
column
,
@RequestParam
(
value
=
"column"
)
String
column
,
@RequestParam
(
value
=
"jobId"
)
String
jobId
)
{
@RequestParam
(
required
=
false
,
value
=
"jobId"
)
String
jobId
)
{
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
if
(
"V1"
.
equals
(
column
))
{
if
(
"V1"
.
equals
(
column
))
{
resultMap
=
personBasicServiceImpl
.
getPersonDetailInfoByObjectId
(
objectId
);
resultMap
=
personBasicServiceImpl
.
getPersonDetailInfoByObjectId
(
objectId
);
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml
View file @
bd11b008
...
@@ -201,8 +201,8 @@
...
@@ -201,8 +201,8 @@
<select
id=
"getEquipDetailInfoByObjectId"
resultType=
"java.util.Map"
>
<select
id=
"getEquipDetailInfoByObjectId"
resultType=
"java.util.Map"
>
SELECT
SELECT
IFNULL(`SBBM`, '') as `
nam
e`,
IFNULL(`SBBM`, '') as `
cod
e`,
IFNULL(SBMC, '') as `
cod
e`,
IFNULL(SBMC, '') as `
nam
e`,
IFNULL(GGXH, '') as typeCode,
IFNULL(GGXH, '') as typeCode,
IFNULL(SCCJ, '') as source,
IFNULL(SCCJ, '') as source,
'' as stationName,
'' as stationName,
...
@@ -222,7 +222,7 @@
...
@@ -222,7 +222,7 @@
when QRCODE_COLOR = 'yellow' then '超时'
when QRCODE_COLOR = 'yellow' then '超时'
else '正常' end as `status`,
else '正常' end as `status`,
IFNULL(QRCODE_COLOR, 'green') as qrCodeColor,
IFNULL(QRCODE_COLOR, 'green') as qrCodeColor,
ZFZR
as person,
IFNULL(ZFZR, '')
as person,
'' as phone,
'' as phone,
IFNULL(CREATE_TIME, '') as `recDate`
IFNULL(CREATE_TIME, '') as `recDate`
FROM
FROM
...
...
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