|
|
@@ -99,6 +99,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
@Override
|
|
|
public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
|
|
|
TOrderNew ton=new TOrderNew();
|
|
|
@@ -268,9 +269,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if(nb.getType()==OrderChangeType.JBGGT.getCode()){
|
|
|
//仅合同图片修改:营销-营销总经理
|
|
|
if(nb.getProcessState()==OrderChangeProcess.YXGLY.getCode()){
|
|
|
- nb.setStatus(4);
|
|
|
- addOrderChangeLog(remarks, 2, orderNo, nb.getId());
|
|
|
- pushCompleteOrderChange(nb);
|
|
|
+ completeChange(remarks, nb);
|
|
|
return 1;
|
|
|
}
|
|
|
} else {
|
|
|
@@ -309,24 +308,22 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.CWZY.getCode()){
|
|
|
if (nb.getType()==OrderChangeType.ZS.getCode()){
|
|
|
- pushCED(nb, dep);
|
|
|
+ boolean flag=pushApproval(nb, dep,remarks);
|
|
|
+ if (flag) return 1;
|
|
|
}if (nb.getType()==OrderChangeType.KJXY.getCode()){
|
|
|
- nb.setStatus(4);
|
|
|
- addOrderChangeLog(remarks, 2, orderNo, nb.getId());
|
|
|
- pushCompleteOrderChange(nb);
|
|
|
+ completeChange(remarks, nb);
|
|
|
return 1;
|
|
|
}else {
|
|
|
nb.setProcessState(OrderChangeProcess.CWZJ.getCode());
|
|
|
}
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.CWZJ.getCode()){
|
|
|
- pushCED(nb,dep);
|
|
|
- }else if(nb.getProcessState()==OrderChangeProcess.ZC.getCode()) {
|
|
|
+ boolean flag=pushApproval(nb, dep,remarks);
|
|
|
+ if (flag) return 1;
|
|
|
+ }else if(nb.getProcessState()==OrderChangeProcess.TPSH.getCode()) {
|
|
|
if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()) {
|
|
|
nb.setStatus(2);
|
|
|
}else {
|
|
|
- nb.setStatus(4);
|
|
|
- addOrderChangeLog(remarks, 2, orderNo, nb.getId());
|
|
|
- pushCompleteOrderChange(nb);
|
|
|
+ completeChange(remarks, nb);
|
|
|
return 1;
|
|
|
}
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.FZC.getCode()){
|
|
|
@@ -340,9 +337,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}else if (nb.getType()==OrderChangeType.TDBTK.getCode()){
|
|
|
nb.setStatus(2);
|
|
|
}else {
|
|
|
- nb.setStatus(4);
|
|
|
- addOrderChangeLog(remarks, 2, orderNo, nb.getId());
|
|
|
- pushCompleteOrderChange(nb);
|
|
|
+ completeChange(remarks, nb);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -388,17 +383,28 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- private void pushCED(NewOrderChangeBo nb, Department dep) {
|
|
|
+ private void completeChange(String remarks, NewOrderChangeBo nb ) {
|
|
|
+ nb.setStatus(4);
|
|
|
+ addOrderChangeLog(remarks, 2, nb.getOrderNo(), nb.getId());
|
|
|
+
|
|
|
+ pushCompleteOrderChange(nb);
|
|
|
+ }
|
|
|
+
|
|
|
+ private boolean pushApproval(NewOrderChangeBo nb, Department dep,String remarks) {
|
|
|
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());
|
|
|
+ if (dep.getApproval()==1){
|
|
|
+ nb.setProcessState(OrderChangeProcess.TPSH.getCode());
|
|
|
}else {
|
|
|
- nb.setProcessState(OrderChangeProcess.ZC.getCode());
|
|
|
+ addOrderChangeLog("部门特批审核人未设置,跳过特批审核", 2, nb.getOrderNo(), nb.getId());
|
|
|
+ completeChange(remarks,nb);
|
|
|
+ return true;
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
+ return false;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -518,9 +524,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if(nb.getStatus()==2) {
|
|
|
alist.add(o.getFinanceId());
|
|
|
}else {
|
|
|
- for (Admin admin : adminMapper.selectAdminByRoleType(AFTConstants.CED)) {
|
|
|
- alist.add(admin.getId());
|
|
|
- }
|
|
|
+ alist.add(o.getApprovalAid());
|
|
|
}
|
|
|
break;
|
|
|
case 9:
|
|
|
@@ -841,22 +845,20 @@ 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()
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.TPSH.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) {
|
|
|
+ if (noc.getProcessState()== OrderChangeProcess.TPSH.getCode()){
|
|
|
+ Department department = tOrderNewMapper.selectDepByOrderNo(noc.getOrderNo());
|
|
|
+ Admin a = adminMapper.selectByPrimaryKey(department.getApprovalAid());
|
|
|
str=str.append(a.getName()).append(",");
|
|
|
+ }else if(noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
|
|
|
+ List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.APPROVAL_DECISION);
|
|
|
+ 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){
|