Commit bd11b008 authored by zhangsen's avatar zhangsen

API bug

parent fa47eed3
...@@ -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);
......
...@@ -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 `name`, IFNULL(`SBBM`, '') as `code`,
IFNULL(SBMC, '') as `code`, IFNULL(SBMC, '') as `name`,
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment