新增车间计算记录与数据看板

ruoyi-oa/src/main/resources/mapper/oa/OaReportDetailMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.ruoyi.oa.mapper.OaReportDetailMapper">
 
     <resultMap type="com.ruoyi.oa.domain.OaReportDetail" id="OaReportDetailResult">
-        <result property="id" column="id"/>
+        <result property="detailId" column="detail_id"/>
         <result property="summaryId" column="summary_id"/>
         <result property="deviceCode" column="device_code"/>
         <result property="category" column="category"/>
@@ -19,6 +19,29 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
     </resultMap>
+    <select id="selectVoByIdPlus" parameterType="Long" resultType="com.ruoyi.oa.domain.vo.OaReportDetailVo">
+        select ord.detail_id,
+               summary_id,
+               device_code,
+               category,
+               device_description,
+               report_detail,
+               oss_ids,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               del_flag,
+               remark,
+               (
+                   SELECT GROUP_CONCAT(so.url SEPARATOR ',')
+                   FROM sys_oss so
+                   WHERE FIND_IN_SET(so.oss_id, ord.oss_ids) > 0
+               ) AS images
+        from oa_report_detail ord
+        where ord.detail_id = #{id}
+
+    </select>
 
 
 </mapper>