Explorar el Código

新增营销经理查看自己的合同与审核时的合同

anderx hace 3 años
padre
commit
876dcd023a

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1428,7 +1428,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
       g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.agreement_url agreementUrl,
       h.name NowFinance,h.contact_mobile NowFinanceMobile,a.additional_order additionalOrder,i.name as oldSalesmanName, i.contact_mobile oldSalesmanMobile,
-      a.service_content serviceContent,a.examine_name examineName, tht.knowledge_services knowledgeServices, tht.audit_services auditServices,
+      a.service_content serviceContent,a.examine_name examineName, tht.knowledge_services knowledgeServices, tht.audit_services auditServices,c.manager_id managerId,
       tht.add_deduction_services addDeductionServices, tht.knowledge_other knowledgeOther, tht.audit_other auditOther, tht.add_deduction_other addDeductionOther
     from t_order_new a left join `user` b on a.buyer_id=b.id left join admin i on a.old_salesman_id=i.id
          left join admin c on a.salesman_id=c.id left join department dep on a.order_dep=dep.id

+ 9 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -18,6 +18,7 @@ public class TOrderNewBo extends TOrderNew{
 	private String nickname;
 	private String salesmanName;
 	private String managerName;
+	private String managerId;
 	private String financeName;
 	private String consultantName;
 	private String dunSubject;
@@ -88,6 +89,14 @@ public class TOrderNewBo extends TOrderNew{
 	 */
 	private String addDeductionOther;
 
+	public String getManagerId() {
+		return managerId;
+	}
+
+	public void setManagerId(String managerId) {
+		this.managerId = managerId;
+	}
+
 	public String getManagerName() {
 		return managerName;
 	}

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

@@ -40,9 +40,18 @@ public class PushOrderService {
             }else {
                 return  t.getContractPictureUrl();
             }
-        }else if (((TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)))&&
+        }else if (TokenManager.hasRole(AFTConstants.SALESMAN)&&
                 TokenManager.getAdminId().equals(t.getSalesmanId())){
             return  t.getContractPictureUrl();
+        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)&&
+                TokenManager.getAdminId().equals(t.getSalesmanId())){
+            return  t.getContractPictureUrl();
+        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)&& !TokenManager.getAdminId().equals(t.getSalesmanId())){
+            if (TokenManager.getAdminId().equals(t.getManagerId())&&t.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
+                return  t.getContractPictureUrl();
+            }else {
+                return DEFAULTS_URL;
+            }
         }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()){