|
|
@@ -1576,7 +1576,7 @@
|
|
|
right join (select tid ,apply_count sqs,reject_count bhs,certificates_count xzs from t_task_mid
|
|
|
where apply_count > 0)tj on a.id=tj.tid
|
|
|
</if>
|
|
|
- where a.split_status in (0,2)
|
|
|
+ where a.split_status in (0,2) and b. delete_sign in (0,2)
|
|
|
<!-- 筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 -->
|
|
|
<if test="screen ==0">
|
|
|
and a.project_status in(1,2,3)
|
|
|
@@ -1645,9 +1645,20 @@
|
|
|
|
|
|
<select id="selectProjectStatisticsCount" resultType="java.lang.Integer">
|
|
|
select count(*)
|
|
|
- from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id left join district_glossory d on c.province=d.id
|
|
|
- left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id
|
|
|
- left join t_task_mid ttm on a.id=ttm.tid left join admin ta on a.task_receiver =ta.id left join department td on ta.department_id =td.id
|
|
|
+ from t_order_task a left join t_order_new b on a.order_no =b.order_no
|
|
|
+ <if test="province !=null">
|
|
|
+ left join department c on b.order_dep =c.id
|
|
|
+ </if>
|
|
|
+ <if test="userName !=null">
|
|
|
+ left join t_order_mid e on b.order_no =e.order_no
|
|
|
+ </if>
|
|
|
+ <if test="projectStatus !=null or projectType !=null">
|
|
|
+ left join business_project bp on a.commodity_id =bp.id
|
|
|
+ </if>
|
|
|
+ <if test="thchDepId !=null">
|
|
|
+ left join admin ta on a.task_receiver =ta.id
|
|
|
+ left join department td on ta.department_id =td.id
|
|
|
+ </if>
|
|
|
<if test="status==3 or status==4">
|
|
|
left join task_progress tp on a.id=tp.task_id
|
|
|
</if>
|
|
|
@@ -1670,7 +1681,7 @@
|
|
|
right join (select tid ,apply_count sqs,reject_count bhs,certificates_count xzs from t_task_mid
|
|
|
where apply_count > 0)tj on a.id=tj.tid
|
|
|
</if>
|
|
|
- where a.split_status in (0,2)
|
|
|
+ where a.split_status in (0,2) and b. delete_sign in (0,2)
|
|
|
<!-- 筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 -->
|
|
|
<if test="screen ==0">
|
|
|
and a.project_status in(1,2,3)
|