|
@@ -411,7 +411,7 @@ END) as projectScale*/
|
|
left join case_base cb on a.id = cb.project_id
|
|
left join case_base cb on a.id = cb.project_id
|
|
LEFT JOIN sys_area area ON area.id = a.area_id
|
|
LEFT JOIN sys_area area ON area.id = a.area_id
|
|
left join rural_project_records_reported rprr on rprr.id = a.id
|
|
left join rural_project_records_reported rprr on rprr.id = a.id
|
|
- LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
|
|
|
|
|
|
+ LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id and pfp.del_flag = 0
|
|
LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
|
|
LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
|
|
LEFT JOIN sys_user sua on a.create_by = sua.id
|
|
LEFT JOIN sys_user sua on a.create_by = sua.id
|
|
<if test="leaderNameStr !=null and leaderNameStr !=''">
|
|
<if test="leaderNameStr !=null and leaderNameStr !=''">
|