Преглед изворни кода

Merge branch 'test' of jishutao/kede-server into prod

anderx пре 4 година
родитељ
комит
2939148c34

+ 0 - 2
src/main/java/com/goafanti/common/controller/BaseApiController.java

@@ -80,10 +80,8 @@ public class BaseApiController extends BaseController {
 	/**
 	/**
 	 * 
 	 * 
 	 * @param res
 	 * @param res
-	 * @param path
 	 * @param isPrivate
 	 * @param isPrivate
 	 * @param req
 	 * @param req
-	 * @param sign
 	 * @return
 	 * @return
 	 */
 	 */
 	protected String handleFile(Result res, boolean isPrivate, HttpServletRequest req, String... fileName) {
 	protected String handleFile(Result res, boolean isPrivate, HttpServletRequest req, String... fileName) {

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

@@ -562,6 +562,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	@Override
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(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;
 		return tOrder;
 	}
 	}
 
 

+ 21 - 1
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -5,6 +5,7 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.enums.ProcessStatus;
 import groovy.util.logging.Log4j;
 import groovy.util.logging.Log4j;
 import groovy.util.logging.Log4j2;
 import groovy.util.logging.Log4j2;
 import org.apache.commons.collections4.bag.SynchronizedSortedBag;
 import org.apache.commons.collections4.bag.SynchronizedSortedBag;
@@ -25,7 +26,7 @@ public class PushOrderService {
             //暂时开放营销管理员可以查看
             //暂时开放营销管理员可以查看
             if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
             if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
                     TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE) || TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)
                     TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE) || TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)
-            || TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)) {
+            || TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)|| TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
                 return url;
                 return url;
             } else if (TokenManager.hasRole(AFTConstants.CED)) {
             } else if (TokenManager.hasRole(AFTConstants.CED)) {
                 if (approval == 1) {
                 if (approval == 1) {
@@ -75,5 +76,24 @@ public class PushOrderService {
         return null;
         return null;
     }
     }
 
 
+    public String processStatusConstant(String url,Integer processStatus,Integer approval){
+        //流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
+        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()){
+            return url;
+        }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&processStatus== ProcessStatus.YPCWZY.getCode()){
+            return url;
+        }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&processStatus== ProcessStatus.YPZXSGLY.getCode()){
+            return url;
+        }else{
+            return DEFAULTS_URL;
+        }
+    }
+
 
 
 }
 }