Browse Source

外包审核员查看

anderx 4 years ago
parent
commit
7ee304b676

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -562,6 +562,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
+		String url=pushOrderService.ShiroConstant(tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getApproval(),tOrder.getOrderDep());
+		tOrder.setContractPictureUrl(url);
+//		tOrder.setContractPictureUrl(pushOrderService.processStatusConstant(tOrder.getContractPictureUrl(),tOrder.getProcessStatus(),tOrder.getApproval()));
 		return tOrder;
 	}
 

+ 7 - 4
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -76,9 +76,12 @@ public class PushOrderService {
         return null;
     }
 
-    public String processStatusConstant(String url,String aid,Integer processStatus,Integer approval){
+    public String processStatusConstant(String url,Integer processStatus,Integer approval){
         //流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
-        if ((TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))
+        if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
+                TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE) ){
+            return url;
+        }else if ((TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))
                 &&processStatus== ProcessStatus.YPYXY.getCode()){
             return url;
         }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)&&processStatus== ProcessStatus.YPYXGLY.getCode()){
@@ -87,9 +90,9 @@ public class PushOrderService {
             return url;
         }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&processStatus== ProcessStatus.YPZXSGLY.getCode()){
             return url;
+        }else{
+            return DEFAULTS_URL;
         }
-
-        return null;
     }