总包方

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

@@ -288,7 +288,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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 = bpr.task_id
+        left join fbs_project_task fpt on fpt.id = bpra.task_id
         <where>
             <if test="dto.username !=null and dto.username !='' ">
                 and wu.username like concat('%', #{dto.username}, '%')
@@ -303,7 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND bpra.status in ('5','6')
             </if>
         </where>
-        order by  bpra.create_time desc
+        order by  bpra.id desc
     </select>
 
 

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

@@ -82,7 +82,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bwa.id,
         bwa.username,
         bwa.project_name,
-        bwa.audit_status
+        bwa.audit_status,
+        bwa.employment_situation,
+        bwa.completion_situation,
+        bwa.task_situation
         from bgt_wage_application bwa
         <where>
             <if test="dto.reviewerId != null ">

ruoyi-system/src/main/resources/mapper/wgz/WgzAttendanceMapper.xml

@@ -52,12 +52,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by date order by date
     </select>
 
+    <select id="countDayByProjectId" resultType="com.ruoyi.zbf.domain.vo.ZbfDayAttendanceCountVO">
+        select count(1) as reportToDutyNum,
+            date
+        from wgz_attendance
+        where date between #{beginDate} and #{endDate}
+          and (clock_in_time is not null  or clock_out_time is not null)
+          and recruit_id in (select id from bgt_project_recruit where project_id = #{projectId} )
+        group by date order by date
+    </select>
+
 
     <select id="dayTotalNum" resultType="Integer">
         select count(1) from bgt_project_recruit_apply where entry_time &lt;= #{date} and ((leave_time is null and status = '5')or leave_time>=#{date})
         and recruit_id in (select id from bgt_project_recruit where task_id = #{taskId} )
     </select>
 
+    <select id="dayTotalNumByProjectId" resultType="Integer">
+        select count(1) from bgt_project_recruit_apply where entry_time &lt;= #{date} and ((leave_time is null and status = '5')or leave_time>=#{date})
+        and recruit_id in (select id from bgt_project_recruit where project_id = #{projectId} )
+    </select>
+
     <select id="monthTotalNum" resultType="Integer">
         select count(1)
         from bgt_project_recruit_apply

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

@@ -31,4 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
+    <select id="zbfSubSwitchList" resultType="com.ruoyi.zbf.domain.vo.ZbfProjectSectionListVO">
+        SELECT zps.id,zps.project_id,zps.section_name
+        FROM zbf_project_section zps
+            left JOIN zbf_project zp ON zps.project_id = zp.id
+        WHERE zp.user_id = #{dto.zbfUserId}
+    </select>
+
 </mapper>

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

@@ -19,5 +19,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </resultMap>
 
+    <select id="getFbsList" resultType="com.ruoyi.zbf.domain.vo.ZbfProjectSubcontractingApplyListVO">
+        select zpsa.id,
+               zpsa.project_id,
+               zpsa.section_id,
+               zpsa.sub_id,
+               zpsa.fbs_user_id,
+               zpsa.apply_status,
+               fu.username,
+               fu.phone,
+               fu.avatar_name
+        from zbf_project_subcontracting_apply zpsa left join fbs_user fu on zpsa.fbs_user_id = fu.user_id
+        where zpsa.sub_id = #{dto.subId}
+        <if test="dto.username != null and dto.username != ''">
+            and fu.username like concat('%', #{dto.username}, '%')
+        </if>
+    </select>
 
 </mapper>