代码提交

src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchDao.xml

@@ -245,7 +245,7 @@
 		LEFT JOIN project_flingbatch_relation g on(a.id=g.filing_batch)
 		LEFT JOIN rural_project_records r on(g.project_id=r.id)
 		LEFT JOIN project_report_data d on(d.project_id=r.id)
-		WHERE g.project_id = #{projectId} and g.del_flag = '0'
+		WHERE g.project_id = #{projectId} and g.del_flag = '0' and a.del_flag = 0
 		order by g.sort asc,d.number asc,a.create_date desc
 	</select>
 
@@ -377,7 +377,7 @@
 		LEFT JOIN rural_project_records r on a.project_id=r.id
 		LEFT JOIN project_report_data prd on prd.project_id=r.id
 		LEFT JOIN sys_user su on r.create_by=su.id
-		WHERE a.project_id = #{projectId}
+		WHERE a.project_id = #{projectId} and a.del_flag = 0
 		order by a.sort asc,prd.number asc,a.create_date desc
 	</select>
 

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -481,7 +481,7 @@ END) as projectScale*/
 		(select id,status,project_id,filing_batch,audit_pass_date from
 		(
 		select id,create_date,status,project_id,filing_batch,audit_pass_date
-		from project_flingbatch_relation order by create_date desc
+		from project_flingbatch_relation WHERE use_start = 0 AND del_flag = '0' ORDER BY create_date DESC
 		)z
 		group by z.project_id
 		) pfp ON pfp.project_id = a.id
@@ -1390,7 +1390,7 @@ END) as projectScale*/
 		(select id,status,project_id,filing_batch,audit_pass_date from
 		(
 		select id,create_date,status,project_id,filing_batch,audit_pass_date
-		from project_flingbatch_relation order by create_date desc
+		from project_flingbatch_relation WHERE use_start = 0 AND del_flag = '0' ORDER BY create_date DESC
 		)z
 		group by z.project_id
 		) pfp ON pfp.project_id = a.id

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -828,7 +828,7 @@
 		(select id,status,project_id,filing_batch from
 		(
 		select id,create_date,status,project_id,filing_batch
-		from project_flingbatch_relation where del_flag = '0' order by create_date desc
+		from project_flingbatch_relation where use_start = 0 AND del_flag = '0' order by create_date desc
 		)z
 		group by z.project_id
 		) pfp ON pfp.project_id = a.id