@@ -342,7 +342,7 @@
<if test="userType != null">
user_type = #{userType},
</if>
- <if test="examineName != null and examineName != ''">
+ <if test="examineName != null ">
examine_name = #{examineName},
<if test="tag != null">
@@ -1247,6 +1247,10 @@
select count(*)
from t_order_new a left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
left join department dep on a.order_dep=dep.id
+ <if test="specially == 4">
+ left join t_order_task e on a.order_no=e.order_no
+ left join (select order_no from new_order_change group by order_no)g on a.order_no=g.order_no
+ </if>
<if test="specially == 9">
left join t_order_task tot on a.order_no =tot.order_no
left join business_project bp on tot.commodity_id =bp.id
@@ -184,8 +184,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
}
t.setReceiverName(a.getName());
tOrderTaskMapper.update(t);
- //处理订单信息
- checkProjiectAllocation(t.getOrderNo());
+
projectDistributionAsyncService.pushProjectDistribution(taskId, taskReceiverId, type, t, tn, date, a);
return 1;
@@ -117,6 +117,8 @@ public class ProjectDistributionAsyncService {
details.setDutyDep(a.getDepartmentId());
tTaskMidMapper.updateByTid(details);
+ //处理订单信息
+ checkProjiectAllocation(t.getOrderNo());
pushTaskChange(TokenManager.getAdminId(), taskReceiverId, type, t.getOrderNo());
//派单后设置用户客户统计
if (type ==0){