新增文件预览列表修复了任务显示ossId但是无法现在的情况

新增项目编号索引

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

@@ -4,9 +4,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.oa.mapper.SysOaContractMapper">
 
-    <resultMap type="com.ruoyi.oa.domain.SysOaContract" id="SysOaContractResult">
+    <resultMap type="com.ruoyi.oa.domain.vo.SysOaContractVo" id="SysOaContractResult">
         <result property="contractId" column="contract_id"/>
-        <result property="processId" column="process_id"/>
         <result property="contractNum" column="contract_num"/>
         <result property="contractName" column="contract_name"/>
         <result property="firstName" column="first_name"/>
@@ -23,9 +22,86 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
+        <collection property="fileList" ofType="com.ruoyi.system.domain.SysOss" javaType="list">
+            <result property="ossId" column="oss_id"/>
+            <result property="fileName" column="file_name"/>
+            <result property="fileSuffix" column="file_suffix"/>
+            <result property="originalName" column="original_name"/>
+            <result property="url" column="url"/>
+            <result property="service" column="service"/>
+        </collection>
     </resultMap>
 
 
+    <select id="selectVoOnePlus" resultMap="SysOaContractResult">
+        select soc.contract_id,
+               soc.project_id,
+               soc.contract_num,
+               soc.contract_name,
+               soc.first_name,
+               soc.first_person,
+               soc.first_phone,
+               soc.second_name,
+               soc.second_person,
+               soc.second_phone,
+               soc.contract_price,
+               soc.sign_time,
+               soc.validity,
+               soc.contract_type,
+               soc.contract_status,
+               soc.accessory,
+               soc.remark,
+               soc.create_by,
+               soc.create_time,
+               soc.update_by,
+               soc.update_time,
+               so.oss_id,
+               file_name,
+               original_name,
+               file_suffix,
+               url,
+               service,
+               is_public,
+               owner_id
+        from sys_oa_contract soc
+                 left join sys_oss so on FIND_IN_SET(so.oss_id, soc.accessory)
+            ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="selectVoListPlus" resultMap="SysOaContractResult">
+        select soc.contract_id,
+               soc.project_id,
+               soc.contract_num,
+               soc.contract_name,
+               soc.first_name,
+               soc.first_person,
+               soc.first_phone,
+               soc.second_name,
+               soc.second_person,
+               soc.second_phone,
+               soc.contract_price,
+               soc.sign_time,
+               soc.validity,
+               soc.contract_type,
+               soc.contract_status,
+               soc.accessory,
+               soc.remark,
+               soc.create_by,
+               soc.create_time,
+               soc.update_by,
+               soc.update_time,
+               so.oss_id,
+               file_name,
+               original_name,
+               file_suffix,
+               url,
+               service,
+               is_public,
+               owner_id
+        from sys_oa_contract soc
+                 left join sys_oss so on FIND_IN_SET(so.oss_id, soc.accessory)
+            ${ew.getCustomSqlSegment}
+    </select>
+
+
 </mapper>