|
@@ -379,7 +379,16 @@
|
|
|
FROM rural_project_records a
|
|
|
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 project_flingbatch_relation pfp on pfp.project_id=a.id
|
|
|
+ /*LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id*/
|
|
|
+ left join
|
|
|
+ (select id,status,project_id,filing_batch from
|
|
|
+ (
|
|
|
+ select id,create_date,status,project_id,filing_batch
|
|
|
+ from project_flingbatch_relation order by create_date desc
|
|
|
+ )z
|
|
|
+ group by z.project_id desc
|
|
|
+ ) pfp ON pfp.project_id = a.id
|
|
|
+
|
|
|
LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
|
|
|
LEFT JOIN sys_user sua on a.create_by = sua.id
|
|
|
<if test="leaderNameStr !=null and leaderNameStr !=''">
|