diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml index 962b563..79a5a02 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml @@ -10,16 +10,25 @@ prfd.project_year,prfd.annual_payment_amount,prfd.have_amount, prfd.gov_own_finance_amount,prfd.gov_superior_finance_amount, prfd.bank_lending_amount,prfd.other_amount,prfd.approval_status,prfd.deleted, - (case when p.project_type is null then b.base_proj_type else p.project_type end) project_type, - (case when p.project_name is null then b.base_proj_name else p.project_name end) project_name, - (case when p.build_org_name is null then b.base_build_deprt else p.build_org_name end) build_org_name,prfd.project_code + (case when p.project_type is not null then p.project_type + when b.project_type is not null then b.base_proj_type + else ob.base_proj_type end) project_type, + (case when p.project_name is not null then p.project_name + when b.base_proj_name is not null then b.base_proj_name + else ob.base_proj_name end) project_name, + (case when p.build_org_name is null then b.build_org_name + when b.base_build_deprt is null then b.base_build_deprt + else ob.base_build_deprt end) build_org_name, + prfd.project_code from nd_project_renewal_fund_declaration prfd left join nd_project p on prfd.project_code = p.project_code and p.newest = true left join gov_biz_project_baseinfo b on prfd.project_code = b.base_proj_id and b.deleted = false + left join gov_operation_project_baseinfo ob on prfd.project_code = ob.base_proj_id and ob.deleted = false where prfd.deleted = false and (p.project_name like concat('%',#{param.projectName},'%') or - b.base_proj_name like concat('%',#{param.projectName},'%')) + b.base_proj_name like concat('%',#{param.projectName},'%') or + ob.base_proj_name like concat('%',#{param.projectName},'%')) and prfd.org_code = #{param.orgCode} @@ -29,7 +38,8 @@ and (p.project_type = #{param.projectType} or - b.base_proj_type = #{param.projectType}) + b.base_proj_type = #{param.projectType} or + ob.base_proj_type = #{param.projectType}) and prfd.project_year = #{param.year} @@ -39,7 +49,8 @@ and (p.status = #{param.status} or - b.base_proj_set_prog = #{param.status}) + b.base_proj_set_prog = #{param.status} or + ob.base_proj_set_prog = #{param.status}) and prfd.create_on >= #{param.startTime}