|
|
@@ -119,6 +119,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
private TTaskMemberMapper tTaskMemberMapper;
|
|
|
@Autowired
|
|
|
private TOrderMidMapper tOrderMidMapper;
|
|
|
+ @Autowired
|
|
|
+ private OrderExamineMapper orderExamineMapper;
|
|
|
+ @Autowired
|
|
|
+ private NewOrderChangeMapper newOrderChangeMapper;
|
|
|
+
|
|
|
@Value(value = "${upload.path}")
|
|
|
private String uploadPath = null;
|
|
|
|
|
|
@@ -160,6 +165,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
t.setConsultantId(null);
|
|
|
t.setManagerId(taskReceiverId);
|
|
|
}
|
|
|
+
|
|
|
t.setReceiverName(a.getName());
|
|
|
tOrderTaskMapper.updateByPrimaryKey(t);
|
|
|
List<String> aids = new ArrayList<>();
|
|
|
@@ -167,9 +173,34 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_TASK_TO.getCode(),order, TokenManager.getAdminId(),0,taskId);
|
|
|
checkProjiectAllocation(t.getOrderNo());
|
|
|
+ pushTaskChange(TokenManager.getAdminId(),taskReceiverId,type,t.getOrderNo());
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param aid 操作者
|
|
|
+ * @param taskReceiverId 接收方
|
|
|
+ * @param type type – 0管理员派单 1经理转交 2经理派单 3咨询师转交 4回退
|
|
|
+ */
|
|
|
+ private void pushTaskChange(String aid, String taskReceiverId,Integer type,String orderNo) {
|
|
|
+ if (type==1||type==3){
|
|
|
+ orderExamineMapper.updateDimissionTransfer(aid,taskReceiverId,null);
|
|
|
+ }else if (type==2){
|
|
|
+ OrderExamine o=new OrderExamine();
|
|
|
+ o.setAid(taskReceiverId);
|
|
|
+ o.setOrderNo(orderNo);
|
|
|
+ o.setCreateTime(new Date());
|
|
|
+ o.setType(0);//咨询师经理
|
|
|
+ o.setStatus(0);//正常
|
|
|
+ orderExamineMapper.insertSelective(o);
|
|
|
+ }else if (type==4){
|
|
|
+ orderExamineMapper.updateBack(aid,taskReceiverId);
|
|
|
+ }
|
|
|
+ newOrderChangeMapper.updateTaskExamineName(aid,taskReceiverId,2);
|
|
|
+ newOrderChangeMapper.updateTaskExamineName(aid,taskReceiverId,3);
|
|
|
+ }
|
|
|
+
|
|
|
private void projectDistributionPushUserMid(TOrderNew tn) {
|
|
|
if (tn.getProcessStatus()==4){
|
|
|
UserMid um=new UserMid();
|