Browse Source

订单开票审核负责人开发

anderx 3 years ago
parent
commit
a0f1145db8

+ 9 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -128,7 +128,15 @@ public interface AdminMapper {
 
     List<String> getaidFrequentContacts(String id);
 
-    List<String> listNameByDepAndName(@Param("depId")String depId,@Param("roleName")String roleName);
+    /**
+     * 获取属于某部门的角色
+     * @param depId
+     * @param roleType
+     * @return
+     */
+        List<String> listNameByDepAndName(@Param("depId")String depId,@Param("roleType")String roleType);
+
+    List<Admin> listAdminBydepIdAndRoleType(@Param("depId")String depId,@Param("roleType")String roleType);
 
     List<String> selectBySuperId(String aid);
 

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

@@ -1056,8 +1056,18 @@
     select a.id  from admin a left join user_role b on a.id =b.uid
                               left join `role` c on b.rid=c.id
     where department_id= #{depId}
-      and c.role_name= #{roleName}
+      and c.role_type= #{roleType}
   </select>
+
+
+  <select id="listAdminBydepIdAndRoleType" resultType="com.goafanti.common.model.Admin">
+    select a.id,a.name  from admin a left join user_role b on a.id =b.uid
+                              left join `role` c on b.rid=c.id
+    where department_id= #{depId}
+      and c.role_type= #{roleType}
+  </select>
+
+
   <select id="selectBySuperId" resultType="java.lang.String">
     select id from admin where superior_id= #{aid}
   </select>
@@ -1103,7 +1113,7 @@
     SELECT count(*) from admin where amb_id= #{ambId}
   </select>
   <select id="selectAdminByRoleType" parameterType="java.lang.String" resultType="com.goafanti.common.model.Admin">
-    SELECT a.id,a.name ,a.mobile ,a.email
+    SELECT a.id,a.name ,a.mobile ,a.email,a.department_id departmentId
     FROM admin a left join user_role b on a.id=b.uid
                  left join `role` c on b.rid =c.id
     where a.status='0'

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

@@ -386,7 +386,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			alist.add(o.getSalesmanId());
 			break;
 		case 1:
-			alist.addAll(adminMapper.listNameByDepAndName(a.getDepartmentId(), "营销管理员"));
+			alist.addAll(adminMapper.listNameByDepAndName(a.getDepartmentId(), AFTConstants.SALESMAN_ADMIN));
 			break;
 		case 2:
 			alist.addAll(tOrderTaskMapper.listNameByDepAndName(o.getOrderNo(),0));

+ 18 - 5
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -62,22 +62,35 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	}
 
 	private void pushOrderInvoiceExamine(TOrderInvoice o) {
+		List<Admin> admins =null;
+		StringBuffer str=new StringBuffer();
 		if (o.getType()==0){
 			if (o.getApproval()==0){
 				TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
 				OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
 				o.setExamineName(dep.getFinanceName());
 			}else {
-				StringBuffer str=new StringBuffer();
-				List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.FINANCE_ADMIN);
+				 admins = adminMapper.getAdminRoleTypeList(AFTConstants.HN_APPROVED);
 				for (Admin a : admins) {
 					str=str.append(a.getName()).append(",");
 				}
 				if (str.length()>0)o.setExamineName(str.substring(0,str.length()-1));
 			}
 		}else if (o.getType()==1){
+			TOrderNewBo t = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
+			if(o.getApproval()==0) {
+				admins = adminMapper.listAdminBydepIdAndRoleType(t.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
+			}else {
+				admins = adminMapper.listAdminBydepIdAndRoleType(t.getOrderDep(), AFTConstants.COMPANY_MANAGER);
+			}
 
 		}
+		if (!admins.isEmpty()){
+			for (Admin a : admins) {
+				str=str.append(a.getName()).append(",");
+			}
+			if (str.length()>0)o.setExamineName(str.substring(0,str.length()-1));
+		}
 	}
 
 	/**
@@ -115,9 +128,9 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 				}
 			}else if (o.getType()==1) {//省外
 				if(o.getApproval()==0) {
-					aids.addAll(adminMapper.listNameByDepAndName(t.getOrderDep(), "营销管理员"));
+					aids.addAll(adminMapper.listNameByDepAndName(t.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
 				}else {
-					aids.addAll(adminMapper.listNameByDepAndName(t.getOrderDep(), "公司管理"));
+					aids.addAll(adminMapper.listNameByDepAndName(t.getOrderDep(), AFTConstants.COMPANY_MANAGER));
 				}
 			}
 		}
@@ -302,7 +315,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			if (o.getType()==0) {
 				aids.add(departmentMapper.selectByPrimaryKey(ts.getOrderDep()).getFinanceId());
 			}else if(o.getType()==1) {
-				aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), "营销管理员"));
+				aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
 			}
 
 		}

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

@@ -488,7 +488,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			List<String> aids = new ArrayList<>();
 			Integer type;
 			AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-			aids.addAll(adminMapper.listNameByDepAndName(a.getDepartmentId(), "营销管理员"));
+			aids.addAll(adminMapper.listNameByDepAndName(a.getDepartmentId(), AFTConstants.SALESMAN_ADMIN));
 			type=NoticeStatus.ORDER_START.getCode();
 
 			TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());

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

@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
 import com.goafanti.order.bo.*;
@@ -132,7 +133,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 				t.setOrderStatus(1);
 				t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
 				addOrderLog(o.getOrderNo(),OrderLogProcess.WBBH.getCode(),o.getRemarks());
-				aids.addAll(adminMapper.listNameByDepAndName(adminMapper.getDeptNameByAid(t2.getSalesmanId()).getDepartmentId(), "营销管理员"));
+				aids.addAll(adminMapper.listNameByDepAndName(adminMapper.getDeptNameByAid(t2.getSalesmanId()).getDepartmentId(), AFTConstants.SALESMAN_ADMIN));
 				type=NoticeStatus.ORDER_OUTSOURCE_NO.getCode();
 			}
 			tOrderNewMapper.updateByPrimaryKeySelective(t);