流程+任务分发+报销功能完成

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

@@ -23,8 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="procInsId" column="proc_ins_id"/>
         <result property="status" column="status_"/>
         <result property="completedTime" column="completed_time"/>
+        <result property="projectName" column="project_name"/>
+        <result property="address" column="address"/>
         <collection property="detailList" javaType="list" resultMap="SysOaClaimDetailResult"/>
-        <collection property="fileList" javaType="list" resultMap="SysOaClaimDetailResult"/>
+        <collection property="fileList" javaType="list" resultMap="SysOaFileResult"/>
     </resultMap>
 
     <resultMap type="com.ruoyi.oa.domain.SysOaClaimDetail" id="SysOaClaimDetailResult">
@@ -32,16 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="claimId" column="claim_id"/>
         <result property="claimType" column="claim_type"/>
         <result property="beginTime" column="begin_time"/>
-        <result property="endTime" column="end_time"/>
+        <result property="endTime" column="detail_end"/>
         <result property="lodgingAddress" column="lodging_address"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createBy" column="create_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
-        <result property="fileIds" column="file_ids"/>
-        <result property="cost" column="cost"/>
+        <result property="cost" column="detail_cost"/>
         <result property="bigCost" column="big_cost"/>
     </resultMap>
 
@@ -58,13 +54,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </resultMap>
 
-    <select id="selectSysOaClaimVoById" resultMap="SysOaClaimResult">
+    <select id="selectSysOaClaimVoById" resultMap="SysOaClaimResult" parameterType="Long">
         SELECT soc.claim_id,
                soc.user_id,
                soc.file_ids,
                soc.remark,
                soc.start_time,
                soc.end_time,
+               soc.address,
                soc.trip_days,
                soc.cost,
                soc.detail_number,
@@ -81,8 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                status,
                socd.claim_detail_id,
                claim_type,
-               begin_time,
-               socd.end_time,
+               socd.begin_time ,
+               socd.end_time as detail_end,
                socd.lodging_address,
                socd.create_time,
                socd.create_by,
@@ -91,11 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                socd.del_flag,
                socd.remark,
                socd.file_ids,
-               socd.cost,
-               socd.big_cost
+               socd.cost as detail_cost,
+               socd.big_cost,
+               sop.project_name
         FROM sys_oa_claim soc
-                 left join sys_oa_claim_detail socd on soc.claim_id = socd.claim_detail_id
+                 left join sys_oa_claim_detail socd on soc.claim_id = socd.claim_id
                  left JOIN sys_oa_file sof ON FIND_IN_SET(sof.file_id, soc.file_ids) > 0
+                left join sys_oa_project sop on soc.project_id = sop.project_id
+        where soc.claim_id = #{claimId}
     </select>
 
     <select id="selectPageVo" resultMap="SysOaClaimResult">
@@ -109,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                soc.cost,
                soc.detail_number,
                soc.project_id,
+               soc.address,
                soc.create_time,
                soc.create_by,
                soc.update_time,
@@ -116,11 +117,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                soc.del_flag,
                soc.proc_ins_id,
                soc.completed_time,
+               sop.project_name,
                IF(ahp.END_TIME_ IS NULL, 0, 1) AS status_
         FROM sys_oa_claim soc
                  left join ACT_HI_PROCINST ahp on soc.proc_ins_id = ahp.PROC_INST_ID_
+                    left join sys_oa_project sop on sop.project_id = soc.project_id
             ${ew.getCustomSqlSegment}
     </select>
 
+    <select id="selectSysOaClaimVoByProcInsId" resultMap="SysOaClaimResult" parameterType="String">
+        SELECT soc.claim_id,
+               soc.user_id,
+               soc.file_ids,
+               soc.remark,
+               soc.start_time,
+               soc.end_time,
+               soc.address,
+               soc.trip_days,
+               soc.cost,
+               soc.detail_number,
+               soc.project_id,
+               soc.create_time,
+               soc.create_by,
+               soc.update_time,
+               soc.update_by,
+               soc.del_flag,
+               soc.proc_ins_id,
+               soc.completed_time,
+               sof.file_id,
+               file_url,
+               status,
+               socd.claim_detail_id,
+               claim_type,
+               socd.begin_time ,
+               socd.end_time as detail_end,
+               socd.lodging_address,
+               socd.create_time,
+               socd.create_by,
+               socd.update_time,
+               socd.update_by,
+               socd.del_flag,
+               socd.remark,
+               socd.file_ids,
+               socd.cost as detail_cost,
+               socd.big_cost,
+               sop.project_name
+        FROM sys_oa_claim soc
+                 left join sys_oa_claim_detail socd on soc.claim_id = socd.claim_id
+                 left JOIN sys_oa_file sof ON FIND_IN_SET(sof.file_id, soc.file_ids) > 0
+                 left join sys_oa_project sop on soc.project_id = sop.project_id
+        where soc.proc_ins_id = #{procInsId}
+    </select>
+
 
 </mapper>