This commit is contained in:
zt
2025-03-06 14:30:45 +08:00
parent d3add5b113
commit 4570788d5e
24 changed files with 359 additions and 154 deletions

View File

@ -30,12 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wu.type_of_work,
bpr.recruit_name,
fpt.task_name,
bpr.task_id,
wsr.score as hasScore
from bgt_project_recruit_apply bpra
left join wgz_user wu on bpra.user_id = wu.user_id
left join bgt_project_recruit bpr on bpr.id = bpra.recruit_id
left join fbs_project_task fpt on fpt.id = bpr.task_id
left join wgz_score_record wsr on bpra.user_id = wsr.user_id and bpra.id = wsr.recruit_id
left join wgz_score_record wsr on bpra.user_id = wsr.user_id and bpra.recruit_id = wsr.recruit_id
<where>
<if test="dto.username !=null and dto.username !='' ">
and wu.username like concat('%', #{dto.username}, '%')
@ -52,6 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</if>
<if test="dto.date != null">
AND (entry_time between #{dto.beginDate} and #{dto.endDate}) or (leave_time between #{dto.beginDate} and #{dto.endDate})
</if>
</where>
order by bpra.create_time desc,bpra.status asc
</select>

View File

@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="appQueryPageList" resultType="com.ruoyi.bgt.domain.vo.BgtProjectRecruitVO">
select bpr.id,bpr.recruit_name,bpr.recruit_address,bpr.recruit_amount,bpr.recruit_staff_num,
bpr.recruit_requirement,bpr.create_time,fpt.task_name,bpr.type_of_work
bpr.recruit_requirement,bpr.create_time,fpt.task_name,bpr.type_of_work,bpr.status
from bgt_project_recruit bpr left join fbs_project_task fpt on bpr.task_id = fpt.id
<where>
<if test="dto.userId != null ">

View File

@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="countByTaskId" resultType="com.ruoyi.bgt.domain.vo.BgtAttendanceCountVO">
select count(1) as reportToDutyNum,
date,
(select count(1) from bgt_project_recruit_apply where entry_time &lt;= date and (leave_time is null or leave_time>date)
(select count(1) from bgt_project_recruit_apply where entry_time &lt;= date and (leave_time is null or leave_time>=date)
and recruit_id in (select id from bgt_project_recruit where task_id = #{taskId} )) as totalNum
from wgz_attendance
where date between #{beginDate} and #{endDate}
@ -42,4 +42,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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="monthTotalNum" resultType="Integer">
select count(1)
from bgt_project_recruit_apply
where ((entry_time between #{beginDate} and #{endDate}) or (leave_time between #{beginDate} and #{endDate}))
and status in (5, 6)
and recruit_id in (select id from bgt_project_recruit where task_id = #{taskId})
</select>
</mapper>