anderx 1 год назад
Родитель
Сommit
33c37be07c

+ 3 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -56,6 +56,9 @@ public class AFTConstants {
 	/** 运营管理 */
 	public static final String  OPERATION_MANAGER		            = "9989";
 
+	/** 运营管理 */
+	public static final String  OPERATION_GUARANTEE		            = "9988";
+
 	/**	湖南特批开票*/
 	public static final String  HN_APPROVED							= "9987";
 	/** 渠道总监 */

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

@@ -793,7 +793,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderLog tl=new TOrderLog();
 		tl.setAid(TokenManager.getAdminId());
 		tl.setOrderNo(orderNo);
-		tl.setProcess(OrderLogProcess.YXJLTT.getCode());
+		tl.setProcess(OrderLogProcess.YYBZSHTG.getCode());
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 		Integer noticeType=0;
 		if (type==0){

+ 13 - 3
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -47,9 +47,13 @@ public class PushOrderService {
             return  t.getContractPictureUrl();
         }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&(t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode())){
             return  t.getContractPictureUrl();
+        }else if (TokenManager.hasRole(AFTConstants.OPERATION_GUARANTEE)&&(
+                t.getProcessStatus()== ProcessStatus.YYBZSH.getCode()
+        )){
+            return  t.getContractPictureUrl();
         }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&(
                 t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()||t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode()
-                )){
+        )){
             return  t.getContractPictureUrl();
         }else if (TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
             return  t.getContractPictureUrl();
@@ -85,6 +89,7 @@ public class PushOrderService {
             flag=true;
         }else{
             //其他都是审核得时候可以看
+
             switch (processStatus) {
                 case 2:
                     if(TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
@@ -117,6 +122,11 @@ public class PushOrderService {
                     }
                     break;
                 case 8:
+                    if(TokenManager.hasRole(AFTConstants.OPERATION_GUARANTEE)){
+                        flag=true;
+                    }
+                    break;
+                case 9:
                     if(status==1){
                         Department department = tOrderNewMapper.selectDepByOrderNo(orderNo);
                         if (TokenManager.getAdminId().equals(department.getApprovalAid())){
@@ -127,14 +137,14 @@ public class PushOrderService {
                         flag=true;
                     }
                     break;
-                case 9:
+                case 10:
 
                     if((TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||(TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT))&&status!=2)||
                             (TokenManager.hasRole(AFTConstants.FINANCE)&&status==2)){
                         flag=true;
                     }
                     break;
-                case 10:
+                case 11:
                     if((TokenManager.hasRole(AFTConstants.VICE_CED))||(TokenManager.hasRole(AFTConstants.FINANCE)&&status==2)){
                         flag=true;
                     }

+ 1 - 1
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -484,7 +484,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		}
 		if (i == tOrderExamines.size()) {
 			//推送订单流程
-			addOrderLog(s,OrderLogProcess.CWFS.getCode(),type==0?"部门修改技术总监为空,系统自动通过":"部门修改财务复审为空,系统自动通过");
+			addOrderLog(s,OrderLogProcess.XMZJSH.getCode(),type==0?"部门修改技术总监为空,系统自动通过":"部门修改财务复审为空,系统自动通过");
 			StringBuilder str = new StringBuilder();
 			TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
 			TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);