总包方

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

@@ -306,6 +306,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by  bpra.id desc
     </select>
 
+    <select id="taskWgzListAll" resultType="com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO">
+        select  bpra.id,
+        bpra.entry_time,
+        bpra.leave_time,
+        bpra.recruit_id,
+        wu.user_id,
+        wu.phone,
+        wu.score,
+        wu.avatar_name,
+        wu.username,
+        wu.identity_card,
+        bpra.status,
+        wu.type_of_work,
+        fpt.task_name,
+        bpra.task_id
+        from bgt_project_recruit_apply bpra
+        left join wgz_user wu on bpra.user_id = wu.user_id
+        left join fbs_project_task fpt on fpt.id = bpra.task_id
+        where
+            fpt.sub_id = #{dto.subId} and fpt.user_id = #{dto.bgtUserId}
+
+            <if test="dto.username !=null and dto.username !='' ">
+                and wu.username like concat('%', #{dto.username}, '%')
+            </if>
+            <if test="dto.status != null">
+                AND bpra.status = #{dto.status}
+            </if>
+            <if test="dto.status == null">
+                AND bpra.status in ('5','6')
+            </if>
+        order by  bpra.id desc
+    </select>
+
 
     <select id="userAllRecruitment" resultType="com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo">
         SELECT

ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectMapper.xml

@@ -118,12 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="completeCount" resultType="integer">
-        SELECT zp.id,
-               unit_name,
-               project_name,
-               project_address,
-               project_img,
-               project_status
+        SELECT count(1)
         FROM zbf_project zp
         WHERE  zp.project_status = '2' and
             EXISTS (