diff --git a/bonus-business/src/main/resources/mapper/DownloadMapper.xml b/bonus-business/src/main/resources/mapper/DownloadMapper.xml index ad3b790..ca3c6bc 100644 --- a/bonus-business/src/main/resources/mapper/DownloadMapper.xml +++ b/bonus-business/src/main/resources/mapper/DownloadMapper.xml @@ -270,7 +270,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (IFNULL(tmp.plan_skilled_worker_num, 0) + IFNULL(tmp.plan_auxiliary_worker_num, 0)) AS num2 FROM tb_monthly_plan tmp LEFT JOIN tb_plan_management tpmng ON tmp.plan_management_id = tpmng.plan_management_id - INNER JOIN tb_plan_major tpmaj ON tmp.plan_major_id = tpmaj.plan_major_id + INNER JOIN tb_plan_major tpmaj ON tmp.plan_category_id = tpmaj.plan_major_id LEFT JOIN tb_inspection_station tis ON tmp.inspection_station_id = tis.inspection_station_id AND tis.category = '0' WHERE tmp.monthly_plan = #{month} AND tmp.is_active = '1' @@ -291,7 +291,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (IFNULL(tmp.plan_skilled_worker_num, 0) + IFNULL(tmp.plan_auxiliary_worker_num, 0)) AS num2 FROM tb_monthly_plan tmp LEFT JOIN tb_plan_management tpmng ON tmp.plan_management_id = tpmng.plan_management_id - INNER JOIN tb_plan_major tpmaj ON tmp.plan_major_id = tpmaj.plan_major_id + INNER JOIN tb_plan_major tpmaj ON tmp.plan_category_id = tpmaj.plan_major_id LEFT JOIN tb_inspection_station tis ON tmp.inspection_station_id = tis.inspection_station_id AND tis.category = '0' WHERE tmp.monthly_plan = #{month} AND tmp.is_active = '1'