|
|
@@ -3,14 +3,11 @@ package com.goafanti.order.service.impl;
|
|
|
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.AdminMapper;
|
|
|
-import com.goafanti.common.model.Admin;
|
|
|
+
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
-import com.goafanti.order.enums.ChangeState;
|
|
|
+
|
|
|
import com.goafanti.order.enums.ProcessStatus;
|
|
|
-import groovy.util.logging.Log4j;
|
|
|
-import groovy.util.logging.Log4j2;
|
|
|
-import org.apache.commons.collections4.bag.SynchronizedSortedBag;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -119,7 +116,7 @@ public class PushOrderService {
|
|
|
* @param processStatus
|
|
|
* @return
|
|
|
*/
|
|
|
- public String changeProcessStatusConstant(String url,Integer processStatus){
|
|
|
+ public String changeProcessStatusConstant(String url,Integer processStatus,Integer status){
|
|
|
boolean flag=false;
|
|
|
//流程状态 0营销员 1营销管理员 2技术员 3技术经理 4技术总监 5财务专员(退单) 6财务总监 7总裁 8董事长 9 财务专员(非退单)
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
|
|
|
@@ -163,12 +160,15 @@ public class PushOrderService {
|
|
|
}
|
|
|
break;
|
|
|
case 7:
|
|
|
- if(TokenManager.hasRole(AFTConstants.CED)){
|
|
|
+
|
|
|
+ if((TokenManager.hasRole(AFTConstants.CED)&&status!=2)||
|
|
|
+ (TokenManager.hasRole(AFTConstants.FINANCE)&&status==2)){
|
|
|
flag=true;
|
|
|
}
|
|
|
break;
|
|
|
case 8:
|
|
|
- if(TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
|
|
|
+ if((TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)&&status!=2)||
|
|
|
+ (TokenManager.hasRole(AFTConstants.FINANCE)&&status==2)){
|
|
|
flag=true;
|
|
|
}
|
|
|
break;
|