This commit is contained in:
zt
2025-02-24 19:13:17 +08:00
parent bb0d3d0146
commit fd6aa9a945
25 changed files with 316 additions and 106 deletions

View File

@ -33,13 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bptp.progress,
bptp.audit_status,
bptp.create_time,
fpt.task_staff_num,
fpt.task_name,
zp.project_name
bptp.task_staff_num,
bptp.task_name,
bptp.project_name
from bgt_project_task_progress bptp
left join fbs_project_task fpt on bptp.task_id = fpt.id
left join zbf_project zp on bptp.project_id = zp.id
where bptp.create_by = #{dto.createBy}
where bptp.uploader_id = #{dto.createBy}
<if test="dto.auditStatus != null and dto.auditStatus != '' ">
and bptp.audit_status = #{dto.auditStatus}
</if>

View File

@ -26,18 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="appQueryPageList" resultType="com.ruoyi.bgt.domain.vo.BgtWageApplicationVO">
select fpt.task_name,
fpt.task_staff_num,
fpt.task_address,
select bwa.task_name,
bwa.task_staff_num,
bwa.task_address,
bwa.applicant_amount,
bwa.create_time,
bwa.id,
bu.username,
zp.project_name
bwa.username,
bwa.project_name
from bgt_wage_application bwa
left join bgt_user bu on bwa.user_id = bu.user_id
left join zbf_project zp on zp.id = bwa.project_id
left join fbs_project_task fpt on fpt.id = bwa.task_id
<where>
<if test="dto.userId != null ">
and bwa.user_id = #{dto.userId}