diff --git a/ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml index 1adb5b4..82dd2fb 100644 --- a/ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml @@ -50,17 +50,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" COALESCE(wage.taskReceiveAmount, 0) as taskReceiveAmount FROM fbs_project_task fpt LEFT JOIN zbf_project zp ON fpt.project_id = zp.id - LEFT JOIN ( - SELECT task_id, COUNT(*) as applyNum + LEFT JOIN + (SELECT task_id, COUNT(*) as applyNum FROM fbs_project_task_apply - GROUP BY task_id - ) apply ON fpt.id = apply.task_id - LEFT JOIN ( - SELECT task_id, SUM(applicant_amount) as taskReceiveAmount + GROUP BY task_id) + apply ON fpt.id = apply.task_id + LEFT JOIN + (SELECT task_id, SUM(applicant_amount) as taskReceiveAmount FROM bgt_wage_application WHERE audit_status = '2' - GROUP BY task_id - ) wage ON fpt.id = wage.task_id + GROUP BY task_id) + wage ON fpt.id = wage.task_id AND NOT EXISTS ( diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml index f698887..a6f938b 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml @@ -29,9 +29,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"