|
|
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
+import com.goafanti.common.bo.OrderExamineBo;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.NewOrderChangeMapper;
|
|
|
import com.goafanti.common.dao.OrderChangeLogMapper;
|
|
|
@@ -116,9 +117,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
o.setStatus(0);//正常
|
|
|
orderExamineMapper.insertSelective(o);
|
|
|
}
|
|
|
- if (t.getConsultantId()!=null) {
|
|
|
+ if (t.getManagerId()!=null) {
|
|
|
OrderExamine o=new OrderExamine();
|
|
|
- o.setAid(t.getConsultantId());
|
|
|
+ o.setAid(t.getManagerId());
|
|
|
o.setOrderNo(orderNo);
|
|
|
o.setCreateTime(new Date());
|
|
|
o.setType(1);//咨询师经理
|
|
|
@@ -138,6 +139,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Override
|
|
|
public NewOrderChangeBo orderChangeDetailsById(Integer id) {
|
|
|
NewOrderChangeBo nb=newOrderChangeMapper.selectById(id);
|
|
|
+ List<OrderExamineBo> consultantExamine =orderExamineMapper.selectByOrderNo(nb.getOrderNo(),0);
|
|
|
+ List<OrderExamineBo> managerExamine=orderExamineMapper.selectByOrderNo(nb.getOrderNo(),1);
|
|
|
+ int isExamine=orderExamineMapper.selectByOrderNoAndAid(nb.getOrderNo(),TokenManager.getAdminId());
|
|
|
+ nb.setConsultantExamine(consultantExamine);
|
|
|
+ nb.setManagerExamine(managerExamine);
|
|
|
+ nb.setIsExamine(isExamine);
|
|
|
return nb;
|
|
|
}
|
|
|
@Override
|
|
|
@@ -164,19 +171,25 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
if(nb.getProcessState()==1){//营销管理通过则设置技术管理员通过表
|
|
|
nb.setProcessState(nb.getProcessState()+1);
|
|
|
- insertOrderExamine(orderNo);
|
|
|
+ if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) insertOrderExamine(orderNo);
|
|
|
+ if (orderExamineMapper.checkCountStatus(orderNo,0,0)<1) {
|
|
|
+ nb.setProcessState(nb.getProcessState()+1);
|
|
|
+ }
|
|
|
}else if(nb.getProcessState()==2){//咨询师
|
|
|
//找出当时人的审核改为通过
|
|
|
orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
|
|
|
//全部通过了则跳下个流程
|
|
|
- if (orderExamineMapper.checkCountStatus(orderNo,0)<1) {
|
|
|
+ if (orderExamineMapper.checkCountStatus(orderNo,0,0)<1) {
|
|
|
+ nb.setProcessState(nb.getProcessState()+1);
|
|
|
+ }
|
|
|
+ if (orderExamineMapper.checkCountStatus(orderNo,1,0)<1) {
|
|
|
nb.setProcessState(nb.getProcessState()+1);
|
|
|
}
|
|
|
}else if(nb.getProcessState()==3){//咨询师经理
|
|
|
//找出当时人的审核改为通过
|
|
|
orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
|
|
|
//全部通过了则跳下个流程
|
|
|
- if (orderExamineMapper.checkCountStatus(orderNo,1)<1) {
|
|
|
+ if (orderExamineMapper.checkCountStatus(orderNo,1,0)<1) {
|
|
|
nb.setProcessState(nb.getProcessState()+1);
|
|
|
}
|
|
|
}else if(nb.getProcessState()!=7&&nb.getProcessState()!=8) {
|