|
@@ -206,10 +206,10 @@
|
|
|
b.dict_label jobTypeLabel,
|
|
|
a.job_name jobName,
|
|
|
a.check_object_name checkObjectName,
|
|
|
- FROM_UNIXTIME( a.check_start_time / 1000, '%Y-%m-%d %h:%m:%s' ) checkStartTime,
|
|
|
- FROM_UNIXTIME( a.check_end_time / 1000, '%Y-%m-%d %h:%m:%s' ) checkEndTime,
|
|
|
+ FROM_UNIXTIME( a.check_start_time / 1000, '%Y-%m-%d %h:%i:%s' ) checkStartTime,
|
|
|
+ FROM_UNIXTIME( a.check_end_time / 1000, '%Y-%m-%d %h:%i:%s' ) checkEndTime,
|
|
|
a.scan_name scanName,
|
|
|
- FROM_UNIXTIME( a.scan_time / 1000, '%Y-%m-%d %h:%m:%s' ) scanTime,
|
|
|
+ FROM_UNIXTIME( a.scan_time / 1000, '%Y-%m-%d %h:%i:%s' ) scanTime,
|
|
|
case WHEN a.record_status = 'lawenforcement_type_4' or a.record_status ='lawenforcement_type_5' then '是' else '否' end isLast,
|
|
|
case WHEN a.is_cross_dept = 0 then '否' WHEN a.is_cross_dept = 1 THEN '是' end isCrossDept
|
|
|
FROM
|
|
@@ -242,7 +242,7 @@
|
|
|
b.person_name personName,
|
|
|
c.device_id deviceId,
|
|
|
c.device_name deviceName,
|
|
|
- SUBSTRING_INDEX( GROUP_CONCAT( DATE_FORMAT(c.start_time,'%Y-%m-%d %h:%m:%s') ORDER BY start_time asc ), ',', 1 ) checkStartTime,
|
|
|
+ SUBSTRING_INDEX( GROUP_CONCAT( DATE_FORMAT(c.start_time,'%Y-%m-%d %h:%i:%s') ORDER BY start_time asc ), ',', 1 ) checkStartTime,
|
|
|
case WHEN a.is_cross_dept = 0 then '否' WHEN a.is_cross_dept = 1 THEN '是' end isCrossDept
|
|
|
FROM
|
|
|
lawenforcement_record a
|