|
@@ -865,11 +865,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
|
|
|
|
|
- }else if (noc.getProcessState()== OrderChangeProcess.CWZY.getCode()){
|
|
|
|
|
|
|
+ }else if (Objects.equals(noc.getProcessState(), OrderChangeProcess.CWZY.getCode())){
|
|
|
TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
|
noc.setExamineName(dep.getFinanceName());
|
|
noc.setExamineName(dep.getFinanceName());
|
|
|
- }else if (noc.getProcessState()== OrderChangeProcess.CWZJ.getCode()){
|
|
|
|
|
|
|
+ }else if (Objects.equals(noc.getProcessState(), OrderChangeProcess.CWZJ.getCode())){
|
|
|
StringBuffer str=new StringBuffer();
|
|
StringBuffer str=new StringBuffer();
|
|
|
List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.FINANCE_ADMIN);
|
|
List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.FINANCE_ADMIN);
|
|
|
for (Admin a : admins) {
|
|
for (Admin a : admins) {
|
|
@@ -877,20 +877,20 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
|
|
|
|
|
- }else if (noc.getProcessState()== OrderChangeProcess.TPSH.getCode()
|
|
|
|
|
- ||noc.getProcessState()== OrderChangeProcess.DSZ.getCode()
|
|
|
|
|
- ||noc.getProcessState()== OrderChangeProcess.FZC.getCode()){
|
|
|
|
|
|
|
+ }else if (Objects.equals(noc.getProcessState(), OrderChangeProcess.TPSH.getCode())
|
|
|
|
|
+ || Objects.equals(noc.getProcessState(), OrderChangeProcess.DSZ.getCode())
|
|
|
|
|
+ || Objects.equals(noc.getProcessState(), OrderChangeProcess.FZC.getCode())){
|
|
|
if(noc.getStatus()==1){
|
|
if(noc.getStatus()==1){
|
|
|
- StringBuffer str=new StringBuffer();
|
|
|
|
|
- if (noc.getProcessState()== OrderChangeProcess.TPSH.getCode()){
|
|
|
|
|
|
|
+ StringBuilder str=new StringBuilder();
|
|
|
|
|
+ if (Objects.equals(noc.getProcessState(), OrderChangeProcess.TPSH.getCode())){
|
|
|
Department department = tOrderNewMapper.selectDepByOrderNo(noc.getOrderNo());
|
|
Department department = tOrderNewMapper.selectDepByOrderNo(noc.getOrderNo());
|
|
|
Admin a = adminMapper.selectByPrimaryKey(department.getApprovalAid());
|
|
Admin a = adminMapper.selectByPrimaryKey(department.getApprovalAid());
|
|
|
- str=str.append(a.getName()).append(",");
|
|
|
|
|
- }else if(noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
|
|
|
|
|
|
|
+ str.append(a.getName()).append(",");
|
|
|
|
|
+ }else if(Objects.equals(noc.getProcessState(), OrderChangeProcess.DSZ.getCode())){
|
|
|
List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.APPROVAL_DECISION);
|
|
List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.APPROVAL_DECISION);
|
|
|
for (Admin a : admins) {
|
|
for (Admin a : admins) {
|
|
|
- str=str.append(a.getName()).append(",");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ str.append(a.getName()).append(",");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
} else if(noc.getStatus()==2){
|
|
} else if(noc.getStatus()==2){
|