完成【我的·工资结算记录】板块

ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml

@@ -80,19 +80,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="underwayPage" resultType="com.ruoyi.wgz.bo.res.WgzAppUnderwayRes">
         SELECT
+            a.entry_time,
+            a.leave_time,
             b.*,
             c.task_name,
             c.task_address,
             c.task_img,
-            (SELECT count(1) FROM bgt_project_recruit_apply WHERE recruit_id = a.id) as numberOfRegistered
+            c.create_time as taskCreateTime
         FROM
             bgt_project_recruit_apply as a
                 LEFT JOIN bgt_project_recruit as b on(a.recruit_id = b.id and b.del_flag = 0 )
                 LEFT JOIN fbs_project_task as c ON (b.task_id = c.id AND c.del_flag = 0)
-        WHERE
-            a.user_id = #{userId} AND
-            a.status IN ('3', '5')AND
+        <where>
+            <if test="page.userId!=null and dto.userId!=0 ">
+                a.user_id = #{dto.userId} AND
+            </if>
+            <choose>
+                <when test="page.type!=null and page.type!='' and page.type=='1'">
+                    a.status IN ('3', '5') AND
+                </when>
+                <when test="page.type!=null and page.type!='' and page.type=='2'">
+                    a.status IN ('6') AND
+                </when>
+            </choose>
             a.del_flag = 0
+        </where>
     </select>
 
 </mapper>