|
|
@@ -1649,7 +1649,7 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
|
|
|
<select id="selectProjectStatisticsListByPage" resultType="com.goafanti.order.bo.OutProjectStatistics">
|
|
|
select date_format( a.task_distribution_time, '%Y-%m-%d %H:%i:%S' ) distributionTime ,d.name province ,c.name depName,e.salesman_name salesmanName,
|
|
|
b.contract_no contractNo ,b.order_no orderNo ,e.buyer_name userName,bc.cname ,a.commodity_name pname,ta.name techName,td.name techDepName,
|
|
|
- a.status projectStatus,a.id,
|
|
|
+ a.project_status projectStatus,a.id,
|
|
|
<if test="status==1">
|
|
|
a.set_up_status setUpStatus , date_format( a.set_up_time , '%Y-%m-%d' ) setUpTime ,a.spot_check_status spotCheckStatus ,b.contact_mobile contactMobile ,
|
|
|
b.legal_person_tel legalPersonTel , a.certificate_number certificateNumber,a.declaration_batch declarationBatch,
|
|
|
@@ -1696,13 +1696,13 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
|
|
|
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) and a.task_status in (1,2,3)
|
|
|
+ where a.split_status in (0,2)
|
|
|
<!-- 筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 -->
|
|
|
<if test="screen ==0">
|
|
|
- and a.status in(0,1,2,3,5)
|
|
|
+ and a.project_status in(1,2,3)
|
|
|
</if>
|
|
|
<if test="screen ==2">
|
|
|
- and a.status in(4,6)
|
|
|
+ and a.project_status > 3
|
|
|
</if>
|
|
|
<if test="screen ==3">
|
|
|
and a.set_up_status =1
|
|
|
@@ -1790,13 +1790,13 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
|
|
|
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) and a.task_status in (1,2,3)
|
|
|
+ where a.split_status in (0,2)
|
|
|
<!-- 筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 -->
|
|
|
<if test="screen ==0">
|
|
|
- and a.status in(0,1,2,3,5)
|
|
|
+ and a.project_status in(1,2,3)
|
|
|
</if>
|
|
|
<if test="screen ==2">
|
|
|
- and a.status in(4,6)
|
|
|
+ and a.project_status > 3
|
|
|
</if>
|
|
|
<if test="screen ==3">
|
|
|
and a.set_up_status =1
|
|
|
@@ -1918,7 +1918,7 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
|
|
|
left join (select id,commodity_quantity cq from t_order_task where project_status > 3)wcs on a.id=wcs.id
|
|
|
left join (select id,commodity_quantity cq from t_order_task where if_publicity=1)gss on a.id=gss.id
|
|
|
</if>
|
|
|
- where b.order_dep is not null and a.split_status in(0,2) and a.task_status in (1,2,3)
|
|
|
+ where a.split_status in(0,2)
|
|
|
<if test="startDate != null and endDate != null">
|
|
|
and a.task_distribution_time between #{startDate} and #{endDate}
|
|
|
</if>
|
|
|
@@ -1950,7 +1950,7 @@ left join department de on x.department_id=de.id left join business_category bc
|
|
|
from t_order_task a left join t_order_new b on a.order_no =b.order_no left join t_task_mid ttm on a.id=ttm.tid
|
|
|
left join department dep on b.order_dep =dep.id left join admin ad on a.task_receiver =ad.id
|
|
|
left join business_project bp on a.commodity_id =bp.id
|
|
|
- where b.order_dep is not null and a.split_status in(0,2) and a.task_status in (1,2,3)
|
|
|
+ where a.split_status in(0,2)
|
|
|
<if test="startDate != null and endDate != null">
|
|
|
and a.task_distribution_time between #{startDate} and #{endDate}
|
|
|
</if>
|