|
|
@@ -253,6 +253,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
public int pushOrderChangeAudit(String changeId, String remarks, Integer status,Integer processState,Integer rejectState) {
|
|
|
NewOrderChangeBo nb=newOrderChangeMapper.selectByChangeId(changeId);
|
|
|
String orderNo=nb.getOrderNo();
|
|
|
+ Department dep = tOrderNewMapper.selectDepByOrderNo(orderNo);
|
|
|
if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
|
|
|
throw new BusinessException(new Error( "变更流程与您所操作流程不匹配","变更流程与您所操作流程不匹配"));
|
|
|
}
|
|
|
@@ -308,7 +309,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.CWZY.getCode()){
|
|
|
if (nb.getType()==OrderChangeType.ZS.getCode()){
|
|
|
- nb.setProcessState(OrderChangeProcess.ZC.getCode());
|
|
|
+ pushCED(nb, dep);
|
|
|
}if (nb.getType()==OrderChangeType.KJXY.getCode()){
|
|
|
nb.setStatus(4);
|
|
|
addOrderChangeLog(remarks, 2, orderNo, nb.getId());
|
|
|
@@ -318,13 +319,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.setProcessState(OrderChangeProcess.CWZJ.getCode());
|
|
|
}
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.CWZJ.getCode()){
|
|
|
- //财务总监审核,曹津不走总裁走董事长
|
|
|
- TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
|
- if (tOrderNew.getSalesmanId().equals(AFTConstants.CAOJIN_AID)) {
|
|
|
- nb.setProcessState(OrderChangeProcess.DSZ.getCode());
|
|
|
- }else {
|
|
|
- nb.setProcessState(OrderChangeProcess.ZC.getCode());
|
|
|
- }
|
|
|
+ pushCED(nb,dep);
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.ZC.getCode()){
|
|
|
if (nb.getType()==OrderChangeType.TDTK.getCode()) {
|
|
|
if (nb.getChangeAmount().compareTo(new BigDecimal("0.2")) < 0) {
|
|
|
@@ -384,6 +379,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ private void pushCED(NewOrderChangeBo nb, Department dep) {
|
|
|
+ TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
|
+ if (tOrderNew.getSalesmanId().equals(AFTConstants.CAOJIN_AID)) {
|
|
|
+ nb.setProcessState(OrderChangeProcess.DSZ.getCode());
|
|
|
+ }else {
|
|
|
+ if (dep.getProvince()==11){
|
|
|
+ nb.setProcessState(OrderChangeProcess.FZC.getCode());
|
|
|
+ }else {
|
|
|
+ nb.setProcessState(OrderChangeProcess.ZC.getCode());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
*
|
|
|
* @param nb
|
|
|
@@ -515,6 +523,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
+ case 10:
|
|
|
+ if(nb.getStatus()==2) {
|
|
|
+ alist.add(o.getFinanceId());
|
|
|
+ }else {
|
|
|
+ for (Admin admin : adminMapper.selectAdminByRoleType(AFTConstants.VICE_CED)) {
|
|
|
+ alist.add(admin.getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
}
|
|
|
//发送站内信息与邮件
|
|
|
pushGeneralSendNoticeAndEmail(alist, type, o, TokenManager.getAdminId(),0);
|
|
|
@@ -815,8 +832,25 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
|
|
|
- }else if (noc.getProcessState()== OrderChangeProcess.ZC.getCode()||noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
|
|
|
- if(noc.getStatus()==2){
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.ZC.getCode()
|
|
|
+ ||noc.getProcessState()== OrderChangeProcess.DSZ.getCode()
|
|
|
+ ||noc.getProcessState()== OrderChangeProcess.FZC.getCode()){
|
|
|
+ if(noc.getStatus()==1){
|
|
|
+ String roleType="";
|
|
|
+ if (noc.getProcessState()== OrderChangeProcess.ZC.getCode()){
|
|
|
+ roleType=AFTConstants.CED;
|
|
|
+ }else if(noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
|
|
|
+ roleType=AFTConstants.APPROVAL_DECISION;
|
|
|
+ }else if(noc.getProcessState()== OrderChangeProcess.FZC.getCode()){
|
|
|
+ roleType=AFTConstants.VICE_CED;
|
|
|
+ }
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ List<Admin> admins = adminMapper.getAdminRoleTypeList(roleType);
|
|
|
+ for (Admin a : admins) {
|
|
|
+ str=str.append(a.getName()).append(",");
|
|
|
+ }
|
|
|
+ if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
+ } else if(noc.getStatus()==2){
|
|
|
TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
|
noc.setExamineName(dep.getFinanceName());
|