|
@@ -1574,6 +1574,7 @@
|
|
|
FROM rural_project_records a
|
|
|
left join work_contract_info wci on a.contract_id = wci.id
|
|
|
left join project_report_data prd on prd.project_id = a.id
|
|
|
+ LEFT JOIN project_report_data_two prdt ON prdt.project_id = a.id
|
|
|
left join rural_project_report_record prr on prr.report_id = prd.id
|
|
|
left join sys_user u on u.id = a.create_by
|
|
|
left join sys_office o on o.id = a.office_id
|
|
@@ -1582,8 +1583,11 @@
|
|
|
left join sys_user su on su.id = w1.user_id
|
|
|
left join sys_office so on so.id = su.office_id
|
|
|
<where>
|
|
|
+ /*判定是否紧急项目【紧急项目 质量复核状态为5】【非紧急项目 签发状态为5】*/
|
|
|
+ IF( a.emergency_project = 0 or a.emergency_project is null , prdt.`status` = 5, prd.`status` = 5 )
|
|
|
and a.submit_money = 1
|
|
|
- and a.del_flag = 0 and project_type in (1,2) and prd.`status`=5
|
|
|
+ and a.del_flag = 0 and project_type in (1,2)
|
|
|
+# and prd.`status`=5
|
|
|
and a.id not in (select project_id FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch where f.filing_status in(2,3,5) )
|
|
|
and a.id not in (select project_id FROM project_flingbatch_relation where status in(2,3,5) )
|
|
|
<if test="projectName != null and projectName != ''">
|
|
@@ -1606,6 +1610,7 @@
|
|
|
FROM rural_project_records a
|
|
|
left join work_contract_info wci on a.contract_id = wci.id
|
|
|
left join project_report_data prd on prd.project_id = a.id
|
|
|
+ LEFT JOIN project_report_data_two prdt ON prdt.project_id = a.id
|
|
|
left join rural_project_report_record prr on prr.report_id = prd.id
|
|
|
left join sys_user u on u.id = a.create_by
|
|
|
left join sys_office o on o.id = a.office_id
|
|
@@ -1615,11 +1620,13 @@
|
|
|
left join sys_user sur on sur.id = a.create_by
|
|
|
left join sys_office so on so.id = su.office_id
|
|
|
<where>
|
|
|
+ /*判定是否紧急项目【紧急项目 质量复核状态为5】【非紧急项目 签发状态为5】*/
|
|
|
+ IF( a.emergency_project = 0 or a.emergency_project is null , prdt.`status` = 5, prd.`status` = 5 )
|
|
|
<if test="projectName != null and projectName != ''">
|
|
|
AND a.project_name like concat(concat('%',#{projectName}),'%')
|
|
|
</if>
|
|
|
and a.submit_money = 1
|
|
|
- and a.del_flag = 0 and a.project_type in (1,2) and prd.`status`=5
|
|
|
+ and a.del_flag = 0 and a.project_type in (1,2)
|
|
|
/*不捞取已经发起审批并审批状态为2、3、5的项目信息*/
|
|
|
and a.id not in (select project_id FROM project_flingbatch_relation where status in(2,3,5) )
|
|
|
<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
|