修复bug, 当一条记录对应多个执法记录时,查询报错

src/main/java/com/sooka/sponest/lawenforcement/record/mapper/LawenforcementRecordMapper.java

@@ -80,6 +80,8 @@ public interface LawenforcementRecordMapper {
      */
     LawenforcementRecordDetailVO getDetailById(String id);
 
+    List<LawenforcementRecordLog> getDetailLog(String id);
+
     /**
      * 新增任务数据
      *

src/main/resources/mapper/lawenforcement/LawenforcementRecordMapper.xml

@@ -61,6 +61,7 @@
     </resultMap>
 
     <resultMap id="detailMapResult" type="LawenforcementRecordDetailVO">
+        <result property="id" column="id"/>
         <result property="jobType" column="job_type"/>
         <result property="creatorName" column="creator_name"/>
         <result property="deptName" column="dept_name"/>
@@ -103,7 +104,8 @@
         <result property="recordStatus" column="record_status"/>
         <collection property="subitems" resultMap="subitemDetailResult"/>
         <collection property="persons" resultMap="personDetailResult"/>
-        <collection property="recordLogList" resultMap="recordLogDetailResult"/>
+        <collection property="recordLogList" column="id"
+                    select="com.sooka.sponest.lawenforcement.record.mapper.LawenforcementRecordMapper.getDetailLog"/>
     </resultMap>
 
     <resultMap id="subitemDetailResult" type="LawenforcementSubitemDetailVO">
@@ -138,8 +140,8 @@
     </resultMap>
 
     <resultMap id="recordLogDetailResult" type="LawenforcementRecordLog">
-        <result property="personCode" column="log_person_code"/>
-        <result property="deviceName" column="log_device_name"/>
+        <result property="personCode" column="person_code"/>
+        <result property="deviceName" column="device_name"/>
         <result property="deviceId" column="device_id"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
@@ -303,7 +305,7 @@
     </select>
 
     <select id="getDetailById" parameterType="string" resultMap="detailMapResult">
-        select lr.job_type,lr.creator_name,lr.dept_name,lr.area_id,lr.job_name,lr.check_type,
+        select lr.id, lr.job_type,lr.creator_name,lr.dept_name,lr.area_id,lr.job_name,lr.check_type,
                lr.check_object_type,lr.check_object_code,lr.check_object_name,lr.check_object_phone,
                lr.check_start_time,lr.check_end_time,lr.subitem_count,lr.remark,lr.verify,lr.unable_verify_reason,
                lr.scan_id,lr.scan_name,lr.scan_time,lr.verify_people_id,lr.verify_people_name,lr.verify_time,
@@ -315,18 +317,19 @@
                ls.measures_detail,ls.fill_time,ls.punish_result,ls.punish_content,ls.punish_time,ls.timeout,ls.random_result,
                ls.random_result_detail,ls.result_person_id as subitem_result_person_id,ls.is_proof_out,ls.remark as subitem_remark,
                lss.standard_name,lss.standard_code,lss.check_result,lss.check_result_type,lss.decision_reason,
-               lss.result_personId,lss.fill_time as standard_fill_time,lss.is_proof_out,lss.remark as standard_remark,
-               lrl.person_code as log_person_code,lrl.start_time,lrl.end_time,
-               lrl.device_name as log_device_name,lrl.device_id,lrl.device_name
+               lss.result_personId,lss.fill_time as standard_fill_time,lss.is_proof_out,lss.remark as standard_remark
         FROM lawenforcement_record lr
                  LEFT JOIN lawenforcement_person lp on lr.id = lp.record_id
                  LEFT JOIN lawenforcement_subitem ls on lr.id = ls.record_id
                  LEFT JOIN lawenforcement_standard lss on  ls.id = lss.subitem_id
-                 LEFT JOIN lawenforcement_record_log lrl on lr.id = lrl.record_id
-                 LEFT JOIN onest_monitor.centermonitor_t_camera crc on lrl.device_id = crc.camera_code
         WHERE lr.id = #{id}
     </select>
 
+    <select id="getDetailLog" parameterType="string" resultMap="recordLogDetailResult">
+        select * from lawenforcement_record_log
+        where record_id = #{id}
+    </select>
+
     <insert id="insertLawenforcementRecord" parameterType="LawenforcementRecord">
         insert into lawenforcement_record
         <trim prefix="(" suffix=")" suffixOverrides=",">