hanfucheng hai 7 meses
pai
achega
8cae6c57f3

+ 3 - 1
src/main/resources/mapper/lawenforcement/LawenforcementViewMapper.xml

@@ -237,12 +237,14 @@
             a.check_object_name checkObjectName,
             b.dept_name deptName,
             b.person_name personName,
-            FROM_UNIXTIME( a.check_start_time / 1000, '%Y-%m-%d %h:%m:%s' ) checkStartTime,
+            c.device_id deviceId,
+            c.start_time checkStartTime,
             case WHEN a.is_last = 0 then '否' WHEN a.is_last = 1 THEN '是' end isLast,
             case WHEN a.is_cross_dept = 0 then '否' WHEN a.is_cross_dept = 1 THEN '是' end isCrossDept
         FROM
             lawenforcement_record a
             left join lawenforcement_person b on a.id = b.record_id and b.main_person = '1'
+            left join lawenforcement_record_log c on a.id = c.record_id and b.person_code = c.person_code
         WHERE 1=1
         <choose>
             <when test="deviceId != null and deviceId != ''">