Browse Source

合同图片查看权限修改

anderx 3 years ago
parent
commit
983c3b9929

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

@@ -91,6 +91,12 @@ public class AFTConstants {
 
 	public static final String	CONSULTANT_MANAGER					= "咨询师管理员";
 
+
+
+	public static final String	CAOJIN_AID							= "734092ad-6564-4021-b7ab-aab5af3a1537";
+
+
+
 	public static final int		KEYWORDLENTH						= 16;
 
 	public static final int		IMPORTMAXLENTH						= 1000;					// 科技需求&科技成果批量导入最大数据量

+ 2 - 2
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -745,9 +745,9 @@
     d.name sname, date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
     a.plan ,a.next_plan nextPlan ,a.expected_effect expectedEffect,a.update_status updateStatus,a.assist_aid_name assistAidName,
     a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName,e.contract_no contractNo,
-    e.total_amount  totalAmout,tom.service_type serviceType ,tom.service_project serviceProject
+    e.total_amount  totalAmout
     from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
-    left join admin d on b.aid=d.id left join t_order_new e on a.order_no =e.order_no left join t_order_mid tom on a.order_no =tom.order_no
+    left join admin d on b.aid=d.id left join t_order_new e on a.order_no =e.order_no
     where 1=1
     <if test="publicType != null">
       and a.type= #{publicType}

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

@@ -296,7 +296,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						nb.setProcessState(nb.getProcessState()+1);
 					}else if (nb.getProcessState()==6){
 						TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
-						if (tOrderNew.getSalesmanId().equals("734092ad-6564-4021-b7ab-aab5af3a1537")){
+						if (tOrderNew.getSalesmanId().equals(AFTConstants.CAOJIN_AID)){
 							nb.setProcessState(8);
 						} else{
 							nb.setProcessState(7);

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

@@ -457,7 +457,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 			//特批逻辑处理
 			if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode()){
-				if (admin.getId().equals("734092ad-6564-4021-b7ab-aab5af3a1537")){
+				if (admin.getId().equals(AFTConstants.CAOJIN_AID)){
 					t.setApproval(ApprovalNewState.DSZDSH.getCode());
 				}else {
 					t.setApproval(ApprovalNewState.ZCDSH.getCode());
@@ -654,7 +654,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
-		String url=pushOrderService.processStatusConstant(tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getProcessStatus());
+		String url=pushOrderService.processStatusConstant(tOrder);
 		tOrder.setContractPictureUrl(url);
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
 			if (!tOrder.getSalesmanId().equals(TokenManager.getAdminId())){

+ 22 - 15
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -7,6 +7,8 @@ import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 
+import com.goafanti.order.bo.TOrderNewBo;
+import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.ProcessStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,27 +23,32 @@ public class PushOrderService {
 
     /**
      * 根据流程与角色判断是否可以查看订单合同
-     * @param url
-     * @param aid
-     * @param processStatus
      * @return  超级管理员、运营决策者、总裁、外包审核与可以查看;营销员与经理可以查看自己的订单;
      *         营销管理员、财务专员、咨询师管理员可以看到在自己手上的合同;其他只能获取到无权限查看的图片
      *
      */
-    public String processStatusConstant(String url,String aid,Integer processStatus){
+    public String processStatusConstant(TOrderNewBo t){
+        //tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getProcessStatus(),tOrder.getApproval()
         //流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
-        if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
-                TokenManager.hasRole(AFTConstants.CED) ||TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
-            return url;
+        if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ){
+            return t.getContractPictureUrl();
+        }else if(TokenManager.hasRole(AFTConstants.CED)){
+            if (t.getApproval()== ApprovalNewState.ZCDSH.getCode()){
+                return  t.getContractPictureUrl();
+            }else  if (t.getSalesmanId().equals(AFTConstants.CAOJIN_AID)){
+                return DEFAULTS_URL;
+            }else {
+                return  t.getContractPictureUrl();
+            }
         }else if (((TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)))&&
-                TokenManager.getAdminId().equals(aid)){
-            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;
+                TokenManager.getAdminId().equals(t.getSalesmanId())){
+            return  t.getContractPictureUrl();
+        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)&&t.getProcessStatus()== ProcessStatus.YPYXGLY.getCode()){
+            return  t.getContractPictureUrl();
+        }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&t.getProcessStatus()== ProcessStatus.YPCWZY.getCode()){
+            return  t.getContractPictureUrl();
+        }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode()){
+            return  t.getContractPictureUrl();
         }else{
             return DEFAULTS_URL;
         }

+ 2 - 21
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -60,12 +60,9 @@ public class OutPublicDtails  {
 	private Integer assist;
 	@Excel(name = "合同编号" )
 	private String contractNo;
-	@Excel(name = "订单总金额" )
+	@Excel(name = "订单总金额" ,scale = 6)
 	private BigDecimal totalAmout;
-	@Excel(name = "服务类型" )
-	private String serviceType;
-	@Excel(name = "服务项目" )
-	private String serviceProject;
+
 
 	public String getContractNo() {
 		return contractNo;
@@ -83,22 +80,6 @@ public class OutPublicDtails  {
 		this.totalAmout = totalAmout;
 	}
 
-	public String getServiceType() {
-		return serviceType;
-	}
-
-	public void setServiceType(String serviceType) {
-		this.serviceType = serviceType;
-	}
-
-	public String getServiceProject() {
-		return serviceProject;
-	}
-
-	public void setServiceProject(String serviceProject) {
-		this.serviceProject = serviceProject;
-	}
-
 	public String getAuditTimes() {
 		return auditTimes;
 	}