|
@@ -2597,6 +2597,7 @@
|
|
FROM rural_project_records a
|
|
FROM rural_project_records a
|
|
left join work_contract_info wci on a.contract_id = wci.id
|
|
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 prd on prd.project_id = a.id
|
|
|
|
+ LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
|
|
left join sys_user u on u.id = a.create_by
|
|
left join sys_user u on u.id = a.create_by
|
|
left join sys_office o on o.id = a.office_id
|
|
left join sys_office o on o.id = a.office_id
|
|
LEFT JOIN sys_area area ON area.id = a.area_id
|
|
LEFT JOIN sys_area area ON area.id = a.area_id
|
|
@@ -2609,6 +2610,7 @@
|
|
and a.emergency_project = 1
|
|
and a.emergency_project = 1
|
|
and (a.record_state=6 or a.record_state is null)
|
|
and (a.record_state=6 or a.record_state is null)
|
|
and (prd.status = 5 or prd.status = 7)
|
|
and (prd.status = 5 or prd.status = 7)
|
|
|
|
+ and pmdr.id is null
|
|
and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
|
|
and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
|
|
</where>
|
|
</where>
|
|
</select>
|
|
</select>
|
|
@@ -2622,6 +2624,8 @@
|
|
FROM rural_project_records a
|
|
FROM rural_project_records a
|
|
left join work_contract_info wci on a.contract_id = wci.id
|
|
left join work_contract_info wci on a.contract_id = wci.id
|
|
left join project_report_data_two prd on prd.project_id = a.id
|
|
left join project_report_data_two prd on prd.project_id = a.id
|
|
|
|
+ LEFT JOIN project_report_data prd1 ON prd1.project_id = a.id
|
|
|
|
+ LEFT JOIN project_material_defect_record pmdr on prd1.id = pmdr.report_id
|
|
left join sys_user u on u.id = a.create_by
|
|
left join sys_user u on u.id = a.create_by
|
|
left join sys_office o on o.id = a.office_id
|
|
left join sys_office o on o.id = a.office_id
|
|
LEFT JOIN sys_area area ON area.id = a.area_id
|
|
LEFT JOIN sys_area area ON area.id = a.area_id
|
|
@@ -2634,6 +2638,7 @@
|
|
and (a.emergency_project = 0 or a.emergency_project is null)
|
|
and (a.emergency_project = 0 or a.emergency_project is null)
|
|
and (a.record_state=6 or a.record_state is null)
|
|
and (a.record_state=6 or a.record_state is null)
|
|
and prd.status = 5
|
|
and prd.status = 5
|
|
|
|
+ and pmdr.id is null
|
|
and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
|
|
and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
|
|
</where>
|
|
</where>
|
|
</select>
|
|
</select>
|