|
|
@@ -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));
|
|
|
}
|
|
|
|
|
|
}
|