|
@@ -1582,6 +1582,7 @@
|
|
|
left join sys_user su on su.id = w1.user_id
|
|
left join sys_user su on su.id = w1.user_id
|
|
|
left join sys_office so on so.id = su.office_id
|
|
left join sys_office so on so.id = su.office_id
|
|
|
<where>
|
|
<where>
|
|
|
|
|
+ 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 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) )
|
|
and a.id not in (select project_id FROM project_flingbatch_relation where status in(2,3,5) )
|
|
@@ -1617,7 +1618,7 @@
|
|
|
<if test="projectName != null and projectName != ''">
|
|
<if test="projectName != null and projectName != ''">
|
|
|
AND a.project_name like concat(concat('%',#{projectName}),'%')
|
|
AND a.project_name like concat(concat('%',#{projectName}),'%')
|
|
|
</if>
|
|
</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) and prd.`status`=5
|
|
|
/*不捞取已经发起审批并审批状态为2、3、5的项目信息*/
|
|
/*不捞取已经发起审批并审批状态为2、3、5的项目信息*/
|
|
|
and a.id not in (select project_id FROM project_flingbatch_relation where status in(2,3,5) )
|
|
and a.id not in (select project_id FROM project_flingbatch_relation where status in(2,3,5) )
|
[user3]